From 7dc5bb1b50dff7fb01d43c10668675b1a52d9831 Mon Sep 17 00:00:00 2001
From: Francisco Salas <francisco.salas@akkerweb.nl>
Date: Mon, 15 Nov 2021 15:48:56 +0100
Subject: [PATCH] return crop name; scenario name

---
 CarbonCalculation.cs            | 13 ++++++++++---
 CarbonLib.csproj                |  2 +-
 Models/CarbonSummary.cs         |  2 ++
 Models/FarmMapsCarbonRequest.cs |  1 +
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CarbonCalculation.cs b/CarbonCalculation.cs
index 3c8a52f..71d54de 100644
--- a/CarbonCalculation.cs
+++ b/CarbonCalculation.cs
@@ -224,7 +224,7 @@ namespace FarmMapsAPI.Carbon
         }
 
         public CarbonSummary Calculate(CarbonRequest farmInput)
-        {            
+        {
             var knmiFile = Helper.GetPlatformIndependentDirectoryPath(Path.Combine(configPath, "KNMI_data.csv"));
 
             // soilTypeData (external input)
@@ -685,7 +685,7 @@ namespace FarmMapsAPI.Carbon
                     }
                     tempModFactor.Add(climateVar.Key, valueList);
                 }
-
+                
                 // CoverModFactor
                 // input sheet
                 var coverModFactor = new Dictionary<string, List<ColumnValue>>();
@@ -1328,7 +1328,7 @@ namespace FarmMapsAPI.Carbon
                 // DPMss
                 // RPMss
                 // IOMss
-
+                
                 var dpmSs = new Dictionary<(string, int), List<ColumnValue>>();
                 var rpmSs = new Dictionary<(string, int), List<ColumnValue>>();
                 var iomSs = new Dictionary<(string, int), List<ColumnValue>>();
@@ -1561,6 +1561,13 @@ namespace FarmMapsAPI.Carbon
                 }
             }
 
+            foreach (var item in socIni)
+            {
+                var crpField = cropFieldSummary.Single(x => x.Name == item.Key.Item1);
+                var summary = crpField.Summary.Single(x => x.Year == item.Key.Item2);
+                summary.Crop = item.Value[0].Key;
+            }
+
             foreach (var item in soc_Summary)
             {
                 var balanceValue = item.Value.SingleOrDefault(x => x.Key == "Balance")?.Value ?? 0;
diff --git a/CarbonLib.csproj b/CarbonLib.csproj
index a33c314..9f0dca2 100644
--- a/CarbonLib.csproj
+++ b/CarbonLib.csproj
@@ -8,7 +8,7 @@
 	  <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
 	  <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 	  <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-	  <Version>1.0.0</Version>
+	  <Version>1.1.0</Version>
   </PropertyGroup>
 
 	<ItemGroup>
diff --git a/Models/CarbonSummary.cs b/Models/CarbonSummary.cs
index 5d9cac7..6c3333c 100644
--- a/Models/CarbonSummary.cs
+++ b/Models/CarbonSummary.cs
@@ -23,6 +23,8 @@ namespace FarmMapsAPI.Carbon.Models
 
     public class YearSummary
     {
+        [JsonProperty("crop")]
+        public string Crop { get; set; }
         [JsonProperty("year")]
         public int Year { get; set; }
         [JsonProperty("bulk_Density")]
diff --git a/Models/FarmMapsCarbonRequest.cs b/Models/FarmMapsCarbonRequest.cs
index 2397d3b..b9cb853 100644
--- a/Models/FarmMapsCarbonRequest.cs
+++ b/Models/FarmMapsCarbonRequest.cs
@@ -13,6 +13,7 @@ namespace FarmMapsAPI.Carbon.Models
 {
     public class FarmMapsCarbonRequest
     {
+        public string ScenarioName { get; set; }
         public int PostalCode { get; set; }
 
         public List<CropFieldFarmMaps> CropFields { get; set; }