From 51dee60e764c4507dd0d29e8740853b42d64ea80 Mon Sep 17 00:00:00 2001
From: Francisco Salas <francisco.salas@akkerweb.nl>
Date: Thu, 19 Oct 2023 11:33:33 +0200
Subject: [PATCH] aw5600: added fields to interface

---
 CarbonCalculation.cs            | 12 +++++++-----
 CarbonLib.csproj                |  2 +-
 Models/CarbonRequest.cs         |  4 +++-
 Models/FarmMapsCarbonRequest.cs |  1 +
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CarbonCalculation.cs b/CarbonCalculation.cs
index ce84d9f..94e88d2 100644
--- a/CarbonCalculation.cs
+++ b/CarbonCalculation.cs
@@ -141,9 +141,9 @@ namespace FarmMapsAPI.Carbon
                     SoilType = MapSoil(cropField.SoilType),
                     SoilProperty = new SoilProperty { Clay_Content = cropField.SoilProperty.Clay_Content, OM_Const = cropField.SoilProperty.OM_Const, Depth10 = cropField.SoilProperty.Depth10 },
                     GreenManures = greenManures
-                });                
+                });              
                 foreach (var crops in cropField.HistoricalCropData)
-                {
+                {                    
                     foreach (var cropYear in crops.Crops)
                     {
                         if (!string.IsNullOrEmpty(cropYear.MiterraCropName))
@@ -157,8 +157,9 @@ namespace FarmMapsAPI.Carbon
                                     CropRes = cropYear.CropRes,
                                     OrganicManures =
                                     cropYear.OrganicManures.Where(y=>y.Quantity > 0 && !string.IsNullOrEmpty(y.Type)).Select(x => new OrganicManureType { Type = x.Type, Quantity = x.Quantity }).ToList(),
-                                    CropYield = cropYear.CropYield } }
-                            });
+                                    CropYield = cropYear.CropYield,
+                                    Irrigation = crops.Irrigations} }
+                            });                            
                         }
                         else
                         {
@@ -265,6 +266,7 @@ namespace FarmMapsAPI.Carbon
                 var initialSoilKey = historicalCropdata.Keys.FirstOrDefault(x => x.Item1 == item.Key && x.Item2 == year.First());
                 var initialSoil = historicalCropdata[initialSoilKey].FirstOrDefault();
                 var soilPropertyDepth10 = item.Value.Depth10;
+                //FSA todo: different corrections for depth10 (10, 25, 30 cm)
                 if (initialSoil == "Temp_gras" && soilPropertyDepth10)
                 {
                     oM_corr_SoilType.Add((item.Key, soilOfItem), item.Value.OM_Cont * 0.97);
@@ -778,7 +780,7 @@ namespace FarmMapsAPI.Carbon
                             {
                                 smdMaxValue = smdMax[climateItem.Key] / 1.8;
                             }
-
+//fsa todo: add precipitation
                             var result = climateItem.Value[i].Precipitation - climateItem.Value[i].Evapotranspiration;
                             result = result < 0 ? result : 0;
                             result = result < smdMaxValue ? smdMaxValue : result;
diff --git a/CarbonLib.csproj b/CarbonLib.csproj
index e9c8846..1d8fcba 100644
--- a/CarbonLib.csproj
+++ b/CarbonLib.csproj
@@ -8,7 +8,7 @@
 	  <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
 	  <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 	  <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-	  <Version>2.2.0</Version>
+	  <Version>2.3.0</Version>
   </PropertyGroup>
 
 	<ItemGroup>
diff --git a/Models/CarbonRequest.cs b/Models/CarbonRequest.cs
index 5ab21ad..7b4b5ec 100644
--- a/Models/CarbonRequest.cs
+++ b/Models/CarbonRequest.cs
@@ -30,7 +30,7 @@ namespace CarbonService.Models
         public SoilProperty SoilProperty { get; set; }
         [Required]
         public List<HistoricalCropData> HistoricalCropData { get; set; }
-        public List<GreenManure> GreenManures { get; set; }
+        public List<GreenManure> GreenManures { get; set; }        
     }
 
     public class SoilProperty
@@ -38,6 +38,7 @@ namespace CarbonService.Models
         public double? OM_Const { get; set; }
         public double? Clay_Content { get; set; }
         public bool? Depth10 { get; set; }
+        public int? Depth { get; set; }
     }
 
     public class OrgManureApplied
@@ -49,6 +50,7 @@ namespace CarbonService.Models
         public List<OrganicManureType> OrganicManures { get; set; }
         public double? CropYield { get { return (int?)yield; } set { yield = value; } }
         public bool CropRes { get; set; }
+        public string Irrigation { get; set; }
     }
 
     public class OrganicManureType
diff --git a/Models/FarmMapsCarbonRequest.cs b/Models/FarmMapsCarbonRequest.cs
index 59cd896..4cd8578 100644
--- a/Models/FarmMapsCarbonRequest.cs
+++ b/Models/FarmMapsCarbonRequest.cs
@@ -44,6 +44,7 @@ namespace FarmMapsAPI.Carbon.Models
         public List<CropData> Crops { get; set; }
         public List<GreenManureTypeFarmMaps> GreenManures { get; set; }
         public bool Rotation { get; set; }
+        public string Irrigations { get; set; }
 
         public HistoricalCropDataFarmMaps DeepCopy()
         {