Merged develop into master

CarbonCalculation24.cs

@@ -217,7 +217,15 @@ namespace FarmMapsAPI.Carbon
         {
             string provinceCode = GetProvinceCode(dataTransformationSet, postalCode);
             var crpYield = cropYieldConfig.SingleOrDefault(x => x.CropName.ToLower() == cropCode.ToLower());
+            if (crpYield == null)
+            {
+                return 0;
+            }
             var crpYieldProvince = crpYield.Yields.SingleOrDefault(x => x.ProvinceCode == provinceCode);
+            if (crpYieldProvince == null)
+            {
+                return 0;
+            }
             var cropYield = crpYieldProvince.YearData.SingleOrDefault(x => x.Year == year)?.YieldValue;
             return cropYield;
         }

CarbonLib.csproj

@@ -8,75 +8,13 @@
 	  <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
 	  <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 	  <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-	  <Version>4.11.0</Version>
+	  <Version>4.12.0</Version>
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Base.Core.Common.Geometry" Version="4.11.0-prerelease.2103" />
+		<PackageReference Include="Base.Core.Common.Geometry" Version="4.12.0-prerelease.2104" />
 		<PackageReference Include="NetTopologySuite" Version="2.5.0" />
 		<PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="3.0.0" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <None Update="config\CropCoverMonth.json">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="config\CropProperties.json">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="config\CropSets.json">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="config\CropYield.json">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="config\CropYield.json.old">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="config\Farm_input_sets.json">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="config\GIS_Soil_Sets.json">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="config\KNMI_data.csv">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="config\ManCcont.json">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="config\Mapping\MappingCropsFarmmapsMiterraRothC.json">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="config\Mapping\MappingGreenManureFarmmapsMiterraRothC.json">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="config\ParametersRothC.json">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="config\PC4\PC4.cpg">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="config\PC4\PC4.dbf">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="config\PC4\PC4.prj">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="config\PC4\PC4.shp">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="config\PC4\PC4.shx">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="config\RegionSets.json">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="config\SetsForDataTransformation.json">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	  <None Update="config\YieldGreenManure.json">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	</ItemGroup>
 </Project>

Models/FarmMapsCarbonRequest.cs

@@ -21,6 +21,9 @@ namespace FarmMapsAPI.Carbon.Models
 
         //added
         public int CalculateUntil { get; set; }
+
+        [JsonIgnore]
+        public int CalculateFrom { get; set; } = 0;
     }
 
     public class CropFieldFarmMaps
@@ -31,10 +34,11 @@ namespace FarmMapsAPI.Carbon.Models
         public double Area { get; set; }
         [Required]
         public string SoilType { get; set; }
+        public string SoilTypeDefault { get; set; }
         [Required]
         public SoilPropertyFarmMaps SoilProperty { get; set; }
         [Required]
-        public List<HistoricalCropDataFarmMaps> HistoricalCropData { get; set; }        
+        public List<HistoricalCropDataFarmMaps> HistoricalCropData { get; set; }
     }
 
     public class HistoricalCropDataFarmMaps
@@ -78,10 +82,20 @@ namespace FarmMapsAPI.Carbon.Models
     {
         public double? OM_Const { get; set; }
         public double? C_Const { get; set; }
+        public double? OM_ConstDefault { get; set; }
         public string OM_Choice { get; set; }
         public double? Clay_Content { get; set; }
+        public double? Clay_ContentDefault { get; set; }
         public bool Depth10 { get; set; }
-        public int? Depth { get; set; }
+        public int? Depth { get; set; }        
+        [JsonIgnore]
+        public List<OrganicMatterFarmMaps> OrganicMatters { get; set; }
+    }
+
+    public class OrganicMatterFarmMaps
+    {
+        public int Year { get; set; }
+        public double OrganicMatter { get; set; }
     }
 
     public class GreenManureTypeFarmMaps