Merged develop into master

aw6383: cleanup
aw6373: init property
2024-12-09 13:02:30 +01:00 · 2024-11-17 15:01:27 +01:00 · 2024-11-14 15:57:10 +01:00 · 2024-11-14 15:21:37 +01:00 · 2024-11-14 13:51:34 +01:00 · 2024-10-29 13:00:18 +00:00
30 changed files with 2163 additions and 42022 deletions
--- a/CarbonCalculation.cs
+++ b/CarbonCalculation.cs
--- a/CarbonCalculation24.cs
+++ b/CarbonCalculation24.cs
--- a/CarbonCalculation25.cs
+++ b/CarbonCalculation25.cs
@@ -0,0 +1,40 @@
+using CarbonLib;
+using CarbonService.Models;
+using FarmMapsAPI.Carbon.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FarmMapsAPI.Carbon
+{
+    public class CarbonCalculation25 : ICarbonCalculation
+    {
+        public CarbonCalculation25(string configPath)
+        {
+
+        }
+
+        public CarbonRequest MapFarmMapsToMiterra(FarmMapsCarbonRequest farmInput)
+        {
+            throw new NotImplementedException();
+        }
+
+        public string Validate(CarbonRequest farmInput)
+        {
+            throw new NotImplementedException();
+        }
+
+        public CarbonSummary Calculate(CarbonRequest farmInput)
+        {
+            var response = new CarbonSummary();
+            return response;
+        }
+
+        public double? GetCropYield(string cropCode, int year, int postalCode)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
--- a/CarbonLib.csproj
+++ b/CarbonLib.csproj
@@ -8,75 +8,13 @@
 	  <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
 	  <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 	  <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-	  <Version>4.8.0</Version>
+	  <Version>4.12.0</Version>
  </PropertyGroup>

 	<ItemGroup>
-		<PackageReference Include="Base.Core.Common.Geometry" Version="4.8.0-prerelease.2097" />
+		<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>
--- a/ICarbonCalculation.cs
+++ b/ICarbonCalculation.cs
@@ -0,0 +1,18 @@
+using CarbonService.Models;
+using FarmMapsAPI.Carbon.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FarmMapsAPI.Carbon
+{
+    public interface ICarbonCalculation
+    {
+        string Validate(CarbonRequest farmInput);
+        CarbonRequest MapFarmMapsToMiterra(FarmMapsCarbonRequest farmInput);
+        CarbonSummary Calculate(CarbonRequest farmInput);
+        double? GetCropYield(string cropCode, int year, int postalCode);
+    }
+}
--- a/Models/CarbonRequest.cs
+++ b/Models/CarbonRequest.cs
@@ -36,6 +36,7 @@ namespace CarbonService.Models
    public class SoilProperty
    {
        public double? OM_Const { get; set; }
+        public double? C_Const { get; set; }
        public string OM_Choice { get; set; }
        public double? Clay_Content { get; set; }
        public bool? Depth10 { get; set; }
--- a/Models/FarmMapsCarbonRequest.cs
+++ b/Models/FarmMapsCarbonRequest.cs
@@ -13,6 +13,7 @@ namespace FarmMapsAPI.Carbon.Models
 {
    public class FarmMapsCarbonRequest
    {
+        public int? ModelYear { get; set; }
        public string ScenarioName { get; set; }
        public int PostalCode { get; set; }

@@ -20,6 +21,9 @@ namespace FarmMapsAPI.Carbon.Models

        //added
        public int CalculateUntil { get; set; }
+
+        [JsonIgnore]
+        public int CalculateFrom { get; set; } = 0;
    }

    public class CropFieldFarmMaps
@@ -30,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
@@ -76,10 +81,21 @@ namespace FarmMapsAPI.Carbon.Models
    public class SoilPropertyFarmMaps
    {
        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
--- a/Models/SoilPropertyType.cs
+++ b/Models/SoilPropertyType.cs
@@ -8,6 +8,8 @@ namespace FarmMapsAPI.Carbon.Models
    {
        public double OM_Cont { get; set; }
        public double OM_Corr { get; set; }
+        public double C_Cont { get; set; }
+        public double C_Corr { get; set; }
        public double Bulk_Density { get; set; }
        public double Clay_Content { get; set; }
        public int? Depth { get; set; }
--- a/config/CropCoverMonth.json
+++ b/config/CropCoverMonth.json
@@ -1,206 +0,0 @@
-[
-  {
-    "CropName": "Perm_gras",
-    "CoverMonths": [ "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "M10", "M11", "M12" ]
-  },
-  {
-    "CropName": "Temp_gras",
-    "CoverMonths": [ "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "M10", "M11", "M12" ]
-  },
-  {
-    "CropName": "Nat_gras",
-    "CoverMonths": [ "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "M10", "M11", "M12" ]
-  },
-  {
-    "CropName": "Gras",
-    "CoverMonths": [ "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "M10", "M11", "M12" ]
-  },
-  {
-    "CropName": "Fodder_maize",
-    "CoverMonths": [ "M6", "M7", "M8", "M9" ]
-  },
-  {
-    "CropName": "Maize",
-    "CoverMonths": [ "M6", "M7", "M8", "M9" ]
-  },
-  {
-    "CropName": "Corn_cob_mix",
-    "CoverMonths": [ "M6", "M7", "M8", "M9" ]
-  },
-  {
-    "CropName": "Winter_wheat",
-    "CoverMonths": [ "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M12" ]
-  },
-  {
-    "CropName": "Summer_wheat",
-    "CoverMonths": [ "M5", "M6", "M7", "M8" ]
-  },
-  {
-    "CropName": "Summer_barley",
-    "CoverMonths": [ "M5", "M6", "M7", "M8" ]
-  },
-  {
-    "CropName": "winter_barley",
-    "CoverMonths": [ "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M12" ]
-  },
-  {
-    "CropName": "Sugarbeet",
-    "CoverMonths": [ "M6", "M7", "M8", "M9", "M10" ]
-  },
-  {
-    "CropName": "Cons_pot_clay",
-    "CoverMonths": [ "M5", "M6", "M7", "M8" ]
-  },
-  {
-    "CropName": "Pot_clay",
-    "CoverMonths": [ "M5", "M6", "M7", "M8" ]
-  },
-  {
-    "CropName": "Starch_pot",
-    "CoverMonths": [ "M5", "M6", "M7", "M8" ]
-  },
-  {
-    "CropName": "Cons_pot_sand",
-    "CoverMonths": [ "M5", "M6", "M7", "M8" ]
-  },
-  {
-    "CropName": "Pot_sand",
-    "CoverMonths": [ "M5", "M6", "M7", "M8" ]
-  },
-  {
-    "CropName": "Vegetables_root",
-    "CoverMonths": [ "M5", "M6", "M7", "M8", "M9", "M10" ]
-  },
-  {
-    "CropName": "Vegetables_leaf",
-    "CoverMonths": [ "M5", "M6", "M7", "M8", "M9", "M10" ]
-  },
-  {
-    "CropName": "Vegetables_cabbage",
-    "CoverMonths": [ "M6", "M7", "M8", "M9" ]
-  },
-  {
-    "CropName": "Vegetables_stem",
-    "CoverMonths": [ "M5", "M6", "M7", "M8", "M9", "M10" ]
-  },
-  {
-    "CropName": "Pumpkin",
-    "CoverMonths": [ "M6", "M7", "M8", "M9" ]
-  },
-  {
-    "CropName": "Chicory",
-    "CoverMonths": [ "M5", "M6", "M7", "M8", "M9", "M10" ]
-  },
-  {
-    "CropName": "Courgette",
-    "CoverMonths": [ "M5", "M6", "M7" ]
-  },
-  {
-    "CropName": "Other_veg",
-    "CoverMonths": [ "M5", "M6", "M7", "M8", "M9", "M10" ]
-  },
-  {
-    "CropName": "Grasseed",
-    "CoverMonths": [ "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "M10", "M11", "M12" ]
-  },
-  {
-    "CropName": "Onion",
-    "CoverMonths": [ "M5", "M6", "M7", "M8" ]
-  },
-  {
-    "CropName": "Bulbs",
-    "CoverMonths": [ "M4", "M5", "M6", "M7", "M8" ]
-  },
-  {
-    "CropName": "Fallow",
-    "CoverMonths": []
-  },
-  {
-    "CropName": "Nurseries",
-    "CoverMonths": [ "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "M10", "M11", "M12" ]
-  },
-  {
-    "CropName": "Pulses",
-    "CoverMonths": [ "M5", "M6", "M7" ]
-  },
-  {
-    "CropName": "Apples",
-    "CoverMonths": [ "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "M10", "M11", "M12" ]
-  },
-  {
-    "CropName": "Pears",
-    "CoverMonths": [ "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "M10", "M11", "M12" ]
-  },
-  {
-    "CropName": "Luzerne",
-    "CoverMonths": [ "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "M10", "M11", "M12" ]
-  },
-  {
-    "CropName": "Other_crops",
-    "CoverMonths": [ "M5", "M6", "M7", "M8" ]
-  },
-  {
-    "CropName": "Other_seeds",
-    "CoverMonths": [ "M5", "M6", "M7", "M8" ]
-  },
-  {
-    "CropName": "Triticale",
-    "CoverMonths": [ "M5", "M6", "M7", "M8" ]
-  },
-  {
-    "CropName": "Rapeseed",
-    "CoverMonths": [ "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M12" ]
-  },
-  {
-    "CropName": "Strawberry",
-    "CoverMonths": [ "M4", "M5", "M6", "M7", "M8", "M9", "M10" ]
-  },
-  {
-    "CropName": "Rye",
-    "CoverMonths": [ "M4", "M5", "M6", "M7" ]
-  },
-  {
-    "CropName": "Other_fruits",
-    "CoverMonths": [ "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "M10", "M11", "M12" ]
-  },
-  {
-    "CropName": "oats",
-    "CoverMonths": [ "M5", "M6", "M7", "M8" ]
-  },
-  {
-    "CropName": "Green_manure",
-    "CoverMonths": [ "M1", "M2", "M3", "M9", "M10", "M11", "M12" ]
-  },
-  {
-    "CropName": "Fibres",
-    "CoverMonths": [ "M5", "M6", "M7", "M8" ]
-  },
-  {
-    "CropName": "Sunflower",
-    "CoverMonths": [ "M5", "M6", "M7", "M8" ]
-  },
-  {
-    "CropName": "Fodder_beet",
-    "CoverMonths": [ "M6", "M7", "M8", "M9" ]
-  },
-  {
-    "CropName": "Other_cereals",
-    "CoverMonths": [ "M5", "M6", "M7", "M8" ]
-  },
-  {
-    "CropName": "Wine",
-    "CoverMonths": [ "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "M10", "M11", "M12" ]
-  },
-  {
-    "CropName": "Miscanthus",
-    "CoverMonths": [ "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "M10", "M11", "M12" ]
-  },
-  {
-    "CropName": "Switchgrass",
-    "CoverMonths": [ "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "M10", "M11", "M12" ]
-  },
-  {
-    "CropName": "Willow",
-    "CoverMonths": [ "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "M10", "M11", "M12" ]
-  }
-]
--- a/config/CropProperties.json
+++ b/config/CropProperties.json
@@ -1,359 +0,0 @@
-[
-  {
-    "Name": "Perm_gras",
-    "DM_content": 1.0,
-    "FracR": 0.0,
-    "C_input_CropRes": 5.1,
-    "HarvestIndex": 0.444
-  },
-  {
-    "Name": "Temp_gras",
-    "DM_content": 1.0,
-    "FracR": 0.0,
-    "C_input_CropRes": 3.4,
-    "HarvestIndex": 0.444
-  },
-  {
-    "Name": "Nat_gras",
-    "DM_content": 1.0,
-    "FracR": 0.0,
-    "C_input_CropRes": 5.1,
-    "HarvestIndex": 0.444
-  },
-  {
-    "Name": "Gras",
-    "DM_content": 1.0,
-    "FracR": 0.0,
-    "C_input_CropRes": 4.59,
-    "HarvestIndex": 0.444
-  },
-  {
-    "Name": "Fodder_maize",
-    "DM_content": 0.35,
-    "FracR": 0.0,
-    "C_input_CropRes": 1.1,
-    "HarvestIndex": 0.67
-  },
-  {
-    "Name": "Maize",
-    "DM_content": 0.85,
-    "FracR": 0.25,
-    "C_input_CropRes": 0.0,
-    "HarvestIndex": 0.46
-  },
-  {
-    "Name": "Corn_cob_mix",
-    "DM_content": 0.8,
-    "FracR": 0.25,
-    "C_input_CropRes": 0.0,
-    "HarvestIndex": 0.46
-  },
-  {
-    "Name": "Winter_wheat",
-    "DM_content": 0.85,
-    "FracR": 0.62,
-    "C_input_CropRes": 0.0,
-    "HarvestIndex": 0.46
-  },
-  {
-    "Name": "Summer_wheat",
-    "DM_content": 0.85,
-    "FracR": 0.62,
-    "C_input_CropRes": 0.0,
-    "HarvestIndex": 0.46
-  },
-  {
-    "Name": "Summer_barley",
-    "DM_content": 0.85,
-    "FracR": 0.43,
-    "C_input_CropRes": 0.0,
-    "HarvestIndex": 0.46
-  },
-  {
-    "Name": "winter_barley",
-    "DM_content": 0.85,
-    "FracR": 0.43,
-    "C_input_CropRes": 0.0,
-    "HarvestIndex": 0.46
-  },
-  {
-    "Name": "Sugarbeet",
-    "DM_content": 0.25,
-    "FracR": 0.0,
-    "C_input_CropRes": 2.732142857142857,
-    "HarvestIndex": 0.69
-  },
-  {
-    "Name": "Cons_pot_clay",
-    "DM_content": 0.24,
-    "FracR": 0.0,
-    "C_input_CropRes": 1.7897727272727275,
-    "HarvestIndex": 0.69
-  },
-  {
-    "Name": "Pot_clay",
-    "DM_content": 0.24,
-    "FracR": 0.0,
-    "C_input_CropRes": 1.953409090909091,
-    "HarvestIndex": 0.69
-  },
-  {
-    "Name": "Starch_pot",
-    "DM_content": 0.24,
-    "FracR": 0.0,
-    "C_input_CropRes": 1.6670454545454545,
-    "HarvestIndex": 0.69
-  },
-  {
-    "Name": "Cons_pot_sand",
-    "DM_content": 0.24,
-    "FracR": 0.0,
-    "C_input_CropRes": 1.7897727272727275,
-    "HarvestIndex": 0.69
-  },
-  {
-    "Name": "Pot_sand",
-    "DM_content": 0.24,
-    "FracR": 0.0,
-    "C_input_CropRes": 1.953409090909091,
-    "HarvestIndex": 0.69
-  },
-  {
-    "Name": "Vegetables_root",
-    "DM_content": 0.099,
-    "FracR": 0.0,
-    "C_input_CropRes": 1.61648275862069,
-    "HarvestIndex": 0.627333333333333
-  },
-  {
-    "Name": "Vegetables_leaf",
-    "DM_content": 0.04575,
-    "FracR": 0.0,
-    "C_input_CropRes": 0.704347826086956,
-    "HarvestIndex": 0.56125
-  },
-  {
-    "Name": "Vegetables_cabbage",
-    "DM_content": 0.0837058823529412,
-    "FracR": 0.0,
-    "C_input_CropRes": 2.75625,
-    "HarvestIndex": 0.472941176470588
-  },
-  {
-    "Name": "Vegetables_stem",
-    "DM_content": 0.0752,
-    "FracR": 0.0,
-    "C_input_CropRes": 0.704347826086956,
-    "HarvestIndex": 0.602
-  },
-  {
-    "Name": "Pumpkin",
-    "DM_content": 0.183,
-    "FracR": 0.0,
-    "C_input_CropRes": 0.704347826086956,
-    "HarvestIndex": 0.56
-  },
-  {
-    "Name": "Chicory",
-    "DM_content": 0.233,
-    "FracR": 0.0,
-    "C_input_CropRes": 1.40869565217391,
-    "HarvestIndex": 0.6
-  },
-  {
-    "Name": "Courgette",
-    "DM_content": 0.048,
-    "FracR": 0.0,
-    "C_input_CropRes": 0.704347826086956,
-    "HarvestIndex": 0.40
-  },
-  {
-    "Name": "Other_veg",
-    "DM_content": 0.10967,
-    "FracR": 0.0,
-    "C_input_CropRes": 1.22840281644892,
-    "HarvestIndex": 0.54622
-  },
-  {
-    "Name": "Grasseed",
-    "DM_content": 0.85,
-    "FracR": 0.0,
-    "C_input_CropRes": 2.7155172413793105,
-    "HarvestIndex": 0.2
-  },
-  {
-    "Name": "Onion",
-    "DM_content": 0.25,
-    "FracR": 0.0,
-    "C_input_CropRes": 0.5625,
-    "HarvestIndex": 1.0
-  },
-  {
-    "Name": "Bulbs",
-    "DM_content": 0.25,
-    "FracR": 0.0,
-    "C_input_CropRes": 0.7575000000000001,
-    "HarvestIndex": 1.0
-  },
-  {
-    "Name": "Fallow",
-    "DM_content": 0.0,
-    "FracR": 0.0,
-    "C_input_CropRes": 0.0,
-    "HarvestIndex": 0.0
-  },
-  {
-    "Name": "Nurseries",
-    "DM_content": 0.25,
-    "FracR": 0.0,
-    "C_input_CropRes": 1.505,
-    "HarvestIndex": 0.85
-  },
-  {
-    "Name": "Pulses",
-    "DM_content": 0.85,
-    "FracR": 0.0,
-    "C_input_CropRes": 2.0454545454545454,
-    "HarvestIndex": 0.69
-  },
-  {
-    "Name": "Apples",
-    "DM_content": 0.14,
-    "FracR": 0.0,
-    "C_input_CropRes": 2.6,
-    "HarvestIndex": 1.0
-  },
-  {
-    "Name": "Pears",
-    "DM_content": 0.14,
-    "FracR": 0.0,
-    "C_input_CropRes": 2.6,
-    "HarvestIndex": 1.0
-  },
-  {
-    "Name": "Luzerne",
-    "DM_content": 0.25,
-    "FracR": 0.0,
-    "C_input_CropRes": 1.779,
-    "HarvestIndex": 0.5
-  },
-  {
-    "Name": "Other_crops",
-    "DM_content": 0.7,
-    "FracR": 0.0,
-    "C_input_CropRes": 2.0359063662409858,
-    "HarvestIndex": 0.5
-  },
-  {
-    "Name": "Other_seeds",
-    "DM_content": 0.85,
-    "FracR": 0.0,
-    "C_input_CropRes": 2.7155172413793105,
-    "HarvestIndex": 0.5
-  },
-  {
-    "Name": "Triticale",
-    "DM_content": 0.85,
-    "FracR": 0.5,
-    "C_input_CropRes": 2.2790322580645164,
-    "HarvestIndex": 0.46
-  },
-  {
-    "Name": "Rapeseed",
-    "DM_content": 0.85,
-    "FracR": 0.5,
-    "C_input_CropRes": 0.0,
-    "HarvestIndex": 0.69
-  },
-  {
-    "Name": "Strawberry",
-    "DM_content": 0.15,
-    "FracR": 0.0,
-    "C_input_CropRes": 2.0,
-    "HarvestIndex": 0.5
-  },
-  {
-    "Name": "Rye",
-    "DM_content": 0.85,
-    "FracR": 0.5,
-    "C_input_CropRes": 0.0,
-    "HarvestIndex": 0.46
-  },
-  {
-    "Name": "Other_fruits",
-    "DM_content": 0.15,
-    "FracR": 0.0,
-    "C_input_CropRes": 2.6,
-    "HarvestIndex": 1.0
-  },
-  {
-    "Name": "oats",
-    "DM_content": 0.85,
-    "FracR": 0.5,
-    "C_input_CropRes": 0.0,
-    "HarvestIndex": 0.46
-  },
-  {
-    "Name": "Green_manure",
-    "DM_content": 0.25,
-    "FracR": 0.0,
-    "C_input_CropRes": 3.7,
-    "HarvestIndex": 0.3
-  },
-  {
-    "Name": "Fibres",
-    "DM_content": 0.85,
-    "FracR": 0.0,
-    "C_input_CropRes": 0.13636363636363635,
-    "HarvestIndex": 0.92
-  },
-  {
-    "Name": "Sunflower",
-    "DM_content": 0.85,
-    "FracR": 0.0,
-    "C_input_CropRes": 0.0,
-    "HarvestIndex": 0.46
-  },
-  {
-    "Name": "Fodder_beet",
-    "DM_content": 0.25,
-    "FracR": 0.0,
-    "C_input_CropRes": 2.732142857142857,
-    "HarvestIndex": 0.69
-  },
-  {
-    "Name": "Other_cereals",
-    "DM_content": 0.85,
-    "FracR": 0.5,
-    "C_input_CropRes": 2.0359063662409853,
-    "HarvestIndex": 0.46
-  },
-  {
-    "Name": "Wine",
-    "DM_content": 0.15,
-    "FracR": 0.0,
-    "C_input_CropRes": 2.6,
-    "HarvestIndex": 0.7
-  },
-  {
-    "Name": "Miscanthus",
-    "DM_content": 1.0,
-    "FracR": 0.0,
-    "C_input_CropRes": 5.1,
-    "HarvestIndex": 0.444
-  },
-  {
-    "Name": "Switchgrass",
-    "DM_content": 1.0,
-    "FracR": 0.0,
-    "C_input_CropRes": 5.1,
-    "HarvestIndex": 0.444
-  },
-  {
-    "Name": "Willow",
-    "DM_content": 1.0,
-    "FracR": 0.0,
-    "C_input_CropRes": 2.6,
-    "HarvestIndex": 0.85
-  }
-]
--- a/config/CropSets.json
+++ b/config/CropSets.json
@@ -1,78 +0,0 @@
-{
-  "StrawCrops": [
-    {
-      "StrawCrop": "Maize",
-      "DM_Content": 0.7
-    },
-    {
-      "StrawCrop": "Corn_cob_mix",
-      "DM_Content": 0.7
-    },
-    {
-      "StrawCrop": "Winter_wheat",
-      "DM_Content": 0.85
-    },
-    {
-      "StrawCrop": "Summer_wheat",
-      "DM_Content": 0.85
-    },
-    {
-      "StrawCrop": "Summer_barley",
-      "DM_Content": 0.85
-    },
-    {
-      "StrawCrop": "winter_barley",
-      "DM_Content": 0.85
-    },
-    {
-      "StrawCrop": "Rapeseed",
-      "DM_Content": 0.6
-    },
-    {
-      "StrawCrop": "Rye",
-      "DM_Content": 0.85
-    },
-    {
-      "StrawCrop": "oats",
-      "DM_Content": 0.85
-    },
-    {
-      "StrawCrop": "Sunflower",
-      "DM_Content": 0.6
-    },
-    {
-      "StrawCrop": "Other_cereals",
-      "DM_Content": 0.85
-    }
-  ],
-  "GreenManureType": [
-    "Bladrammenas",
-    "GeleMosterd",
-    "Voederwikke",
-    "Afrikaantjes",
-    "JapanseHaver",
-    "ItaliaansRaaigras",
-    "Mengsel3soorten",
-    "Mengsel12soorten",
-    "EngelsRaaigras",
-    "Facelia",
-    "Grasland",
-    "Overig",
-    "Rietzwenkgras"
-  ],
-  "Perennial": [
-    "Nurseries",
-    "Apples",
-    "Pears",
-    "Other_fruits",
-    "Wine",
-    "Miscanthus",
-    "Switchgrass",
-    "Willow"
-  ],
-  "Grass_nat": [
-    "Perm_gras",
-    "Nat_gras",
-    "Gras"
-  ]
-}
--- a/config/CropYield.json
+++ b/config/CropYield.json
--- a/config/CropYield.json.old
+++ b/config/CropYield.json.old
--- a/config/Farm_input_sets.json
+++ b/config/Farm_input_sets.json
@@ -1,72 +0,0 @@
-{
-  "ManureSources_liv": [
-    {
-      "ManureSource_liv": "WMGRAAS",
-      "Description": "Weidemest graasdieren"
-    },
-    {
-      "ManureSource_liv": "DMGRAAS",
-      "Description": "Drijfmest graasdieren"
-    },
-    {
-      "ManureSource_liv": "VMGRAAS",
-      "Description": "Vaste mest graasdieren"
-    },
-    {
-      "ManureSource_liv": "DMSTAL",
-      "Description": "Drijfmest staldieren"
-    },
-    {
-      "ManureSource_liv": "VMSTAL",
-      "Description": "Vaste mest staldieren"
-    },
-    {
-      "ManureSource_liv": "FRACDUN",
-      "Description": "Dunne Fractie"
-    },
-    {
-      "ManureSource_liv": "FRACDIK",
-      "Description": "Dikke Fractie"
-    },
-    {
-      "ManureSource_liv": "KMVERV",
-      "Description": "Kunstmestvervangers"
-    },
-    {
-      "ManureSource_liv": "DIGEST",
-      "Description": "Digestaat"
-    },
-    {
-      "ManureSource_liv": "CHAMPOST",
-      "Description": "Champost"
-    },
-    {
-      "ManureSource_liv": "SCHA_GEIT",
-      "Description": "Schapen/geitenmest"
-    },
-    {
-      "ManureSource_liv": "VMPIG",
-      "Description": "Vaste varkensmest"
-    },
-    {
-      "ManureSource_liv": "DM_ZEUG",
-      "Description": "Zeugendrijfmest"
-    },
-    {
-      "ManureSource_liv": "OVERIG",
-      "Description": "Overig"
-    }
-  ],
-  "composts": [
-    {
-      "compost": "COMPOST",
-      "Description": "compost"
-    }
-  ],
-  "CarbonSource": [
-    "CarbonManure",
-    "CarbonResidues",
-    "CarbonGreenManure",
-    "CarbonCompost"
-  ]
-}
--- a/config/GIS_Soil_Sets.json
+++ b/config/GIS_Soil_Sets.json
@@ -1,7 +0,0 @@
-{
-  "SoilType": [ "Moerig", "Veen", "Klei", "Zand", "Loss" ],
-  "MineralSoils": [ "Klei", "Zand" ],
-  "Months": [ "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "M10", "M11", "M12", "Total", "Average" ],
-  "AllMonths": [ "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "M10", "M11", "M12" ],
-  "ClimateVar": [ "Evapotranspiration", "Precipitation", "Temperature" ]
-}
--- a/config/KNMI_data.csv
+++ b/config/KNMI_data.csv
--- a/config/ManCcont.json
+++ b/config/ManCcont.json
@@ -1,62 +0,0 @@
-[
-  {
-    "ManCcont": "WMGRAAS",
-    "Value": 0.0356
-  },
-  {
-    "ManCcont": "DMGRAAS",
-    "Value": 0.0356
-  },
-  {
-    "ManCcont": "VMGRAAS",
-    "Value": 0.077385
-  },
-  {
-    "ManCcont": "DMSTAL",
-    "Value": 0.03955
-  },
-  {
-    "ManCcont": "VMSTAL",
-    "Value": 0.209715
-  },
-  {
-    "ManCcont": "COMPOST",
-    "Value": 0.10535
-  },
-  {
-    "ManCcont": "FRACDUN",
-    "Value": 0.01715
-  },
-  {
-    "ManCcont": "FRACDIK",
-    "Value": 0.0759
-  },
-  {
-    "ManCcont": "KMVERV",
-    "Value": 0.010585
-  },
-  {
-    "ManCcont": "DIGEST",
-    "Value": 0.01652
-  },
-  {
-    "ManCcont": "CHAMPOST",
-    "Value": 0.1050
-  },
-  {
-    "ManCcont": "SCHA_GEIT",
-    "Value": 0.09225
-  },
-  {
-    "ManCcont": "VMPIG",
-    "Value": 0.0765
-  },
-  {
-    "ManCcont": "DM_ZEUG",
-    "Value": 0.0125
-  },
-  {
-    "ManCcont": "OVERIG",
-    "Value": 0.01652
-  }
-]
--- a/config/Mapping/MappingCropsFarmmapsMiterraRothC.json
+++ b/config/Mapping/MappingCropsFarmmapsMiterraRothC.json
--- a/config/Mapping/MappingCropsFarmmapsMiterraRothC.json.bak
+++ b/config/Mapping/MappingCropsFarmmapsMiterraRothC.json.bak
--- a/config/Mapping/MappingGreenManureFarmmapsMiterraRothC.json
+++ b/config/Mapping/MappingGreenManureFarmmapsMiterraRothC.json
@@ -1,303 +0,0 @@
-[
-	{
-		"CropCode": "1020101",
-		"CropName": "Wintertarwe",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": ""
-	},
-	{
-		"CropCode": "1020102",
-		"CropName": "Wintergerst",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": ""
-	},
-	{
-		"CropCode": "1020103",
-		"CropName": "Winterrogge",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": ""
-	},
-	{
-		"CropCode": "1020201",
-		"CropName": "Zomertarwe",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": ""
-	},
-	{
-		"CropCode": "1020202",
-		"CropName": "Zomergerst",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": ""
-	},
-	{
-		"CropCode": "1020203",
-		"CropName": "Zomerrogge",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": ""
-	},
-	{
-		"CropCode": "1030301",
-		"CropName": "Alexandrijnse klaver",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Voederwikke"
-	},
-	{
-		"CropCode": "1030302",
-		"CropName": "Bastaard klaver",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Voederwikke"
-	},
-	{
-		"CropCode": "1030303",
-		"CropName": "Hopklaver",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Voederwikke"
-	},
-	{
-		"CropCode": "1030304",
-		"CropName": "Inkarnaatklaver",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Voederwikke"
-	},
-	{
-		"CropCode": "1030305",
-		"CropName": "Perzische klaver",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Voederwikke"
-	},
-	{
-		"CropCode": "1030306",
-		"CropName": "Rode klaver",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Voederwikke"
-	},
-	{
-		"CropCode": "1030307",
-		"CropName": "Rolklaver",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Voederwikke"
-	},
-	{
-		"CropCode": "1030308",
-		"CropName": "Witte honingklaver",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Voederwikke"
-	},
-	{
-		"CropCode": "1030309",
-		"CropName": "Witte klaver",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Voederwikke"
-	},
-	{
-		"CropCode": "1030401",
-		"CropName": "Blauwe Lupine",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Voederwikke"
-	},
-	{
-		"CropCode": "1030402",
-		"CropName": "Gele Lupine",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Voederwikke"
-	},
-	{
-		"CropCode": "1030403",
-		"CropName": "Witte Lupine",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Voederwikke"
-	},
-	{
-		"CropCode": "1030501",
-		"CropName": "Voederwikke",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Voederwikke"
-	},
-	{
-		"CropCode": "1030502",
-		"CropName": "Bonte wikke",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Voederwikke"
-	},
-	{
-		"CropCode": "1030602",
-		"CropName": "Hanekam",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Overig"
-	},
-	{
-		"CropCode": "1040101",
-		"CropName": "Stoppelknol",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Overig"
-	},
-	{
-		"CropCode": "1040102",
-		"CropName": "Bladrammenas",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Bladrammenas"
-	},
-	{
-		"CropCode": "1040103",
-		"CropName": "Bruine mosterd",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "GeleMosterd"
-	},
-	{
-		"CropCode": "1040104",
-		"CropName": "Gele mosterd",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "GeleMosterd"
-	},
-	{
-		"CropCode": "1040105",
-		"CropName": "Zwarte mosterd",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "GeleMosterd"
-	},
-	{
-		"CropCode": "1040108",
-		"CropName": "Bladkool",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Overig"
-	},
-	{
-		"CropCode": "1040109",
-		"CropName": "Mergkool",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Overig"
-	},
-	{
-		"CropCode": "1040110",
-		"CropName": "Ethiopische mosterd",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "GeleMosterd"
-	},
-	{
-		"CropCode": "1040111",
-		"CropName": "Serepta mosterd",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "GeleMosterd"
-	},
-	{
-		"CropCode": "1040112",
-		"CropName": "Zwaardherik",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Overig"
-	},
-	{
-		"CropCode": "1050101",
-		"CropName": "Engels raaigras",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "EngelsRaaigras"
-	},
-	{
-		"CropCode": "1050102",
-		"CropName": "Frans raaigras",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "ItaliaansRaaigras"
-	},
-	{
-		"CropCode": "1050103",
-		"CropName": "Gekruist raaigras",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "ItaliaansRaaigras"
-	},
-	{
-		"CropCode": "1050104",
-		"CropName": "Italiaans raaigras",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "ItaliaansRaaigras"
-	},
-	{
-		"CropCode": "1050105",
-		"CropName": "Trosraaigras",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "ItaliaansRaaigras"
-	},
-	{
-		"CropCode": "1050106",
-		"CropName": "Westerwolds raaigras",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "ItaliaansRaaigras"
-	},
-	{
-		"CropCode": "1050201",
-		"CropName": "Roodzwenkgras",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Rietzwenkgras"
-	},
-	{
-		"CropCode": "1050408",
-		"CropName": "Sudangras",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Rietzwenkgras"
-	},
-	{
-		"CropCode": "1080107",
-		"CropName": "Facelia",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Facelia"
-	},
-	{
-		"CropCode": "1080108",
-		"CropName": "Spurrie",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Overig"
-	},
-	{
-		"CropCode": "1080109",
-		"CropName": "Afrikaantjes",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Afrikaantjes"
-	},
-	{
-		"CropCode": "1080110",
-		"CropName": "Raketblad",
-		"PurposeCode": "118",
-		"PurposeName": "Groenbemesting",
-		"MiterraRothCCrop": "Overig"
-	}
-]
--- a/config/Mapping/MappingGreenManureFarmmapsMiterraRothC.json.bak
+++ b/config/Mapping/MappingGreenManureFarmmapsMiterraRothC.json.bak
@@ -1,303 +0,0 @@
-[
-  {
-    "CropCode": "1020101",
-    "CropName": "Wintertarwe",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "WinterGroen_Graan"
-  },
-  {
-    "CropCode": "1020102",
-    "CropName": "Wintergerst",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "WinterGroen_Graan"
-  },
-  {
-    "CropCode": "1020103",
-    "CropName": "Winterrogge",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Winterrogge"
-  },
-  {
-    "CropCode": "1020201",
-    "CropName": "Zomertarwe",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "WinterGroen_Graan"
-  },
-  {
-    "CropCode": "1020202",
-    "CropName": "Zomergerst",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "WinterGroen_Graan"
-  },
-  {
-    "CropCode": "1020203",
-    "CropName": "Zomerrogge",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Winterrogge"
-  },
-  {
-    "CropCode": "1030301",
-    "CropName": "Alexandrijnse klaver",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1030302",
-    "CropName": "Bastaard klaver",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1030303",
-    "CropName": "Hopklaver",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1030304",
-    "CropName": "Inkarnaatklaver",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1030305",
-    "CropName": "Perzische klaver",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1030306",
-    "CropName": "Rode klaver",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1030307",
-    "CropName": "Rolklaver",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1030308",
-    "CropName": "Witte honingklaver",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1030309",
-    "CropName": "Witte klaver",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1030401",
-    "CropName": "Blauwe Lupine",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1030402",
-    "CropName": "Gele Lupine",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1030403",
-    "CropName": "Witte Lupine",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1030501",
-    "CropName": "Voederwikke",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1030502",
-    "CropName": "Bonte wikke",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1030602",
-    "CropName": "Hanekam",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1040101",
-    "CropName": "Stoppelknol",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1040102",
-    "CropName": "Bladrammenas",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Bladrammenas"
-  },
-  {
-    "CropCode": "1040103",
-    "CropName": "Bruine mosterd",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Gele mosterd"
-  },
-  {
-    "CropCode": "1040104",
-    "CropName": "Gele mosterd",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Gele mosterd"
-  },
-  {
-    "CropCode": "1040105",
-    "CropName": "Zwarte mosterd",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Gele mosterd"
-  },
-  {
-    "CropCode": "1040108",
-    "CropName": "Bladkool",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Bladkool"
-  },
-  {
-    "CropCode": "1040109",
-    "CropName": "Mergkool",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1040110",
-    "CropName": "Ethiopische mosterd",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Gele mosterd"
-  },
-  {
-    "CropCode": "1040111",
-    "CropName": "Serepta mosterd",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Gele mosterd"
-  },
-  {
-    "CropCode": "1040112",
-    "CropName": "Zwaardherik",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Zwaardherik"
-  },
-  {
-    "CropCode": "1050101",
-    "CropName": "Engels raaigras",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Italiaans raaigras"
-  },
-  {
-    "CropCode": "1050102",
-    "CropName": "Frans raaigras",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Italiaans raaigras"
-  },
-  {
-    "CropCode": "1050103",
-    "CropName": "Gekruist raaigras",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Italiaans raaigras"
-  },
-  {
-    "CropCode": "1050104",
-    "CropName": "Italiaans raaigras",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Italiaans raaigras"
-  },
-  {
-    "CropCode": "1050105",
-    "CropName": "Trosraaigras",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Italiaans raaigras"
-  },
-  {
-    "CropCode": "1050106",
-    "CropName": "Westerwolds raaigras",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Italiaans raaigras"
-  },
-  {
-    "CropCode": "1050201",
-    "CropName": "Roodzwenkgras",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Wintergroen_Gras"
-  },
-  {
-    "CropCode": "1050408",
-    "CropName": "Sudangras",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Wintergroen_Gras"
-  },
-  {
-    "CropCode": "1080107",
-    "CropName": "Facelia",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1080108",
-    "CropName": "Spurrie",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1080109",
-    "CropName": "Afrikaantjes",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  },
-  {
-    "CropCode": "1080110",
-    "CropName": "Raketblad",
-    "PurposeCode": "118",
-    "PurposeName": "Groenbemesting",
-    "MiterraRothCCrop": "Groenbemester"
-  }
-]
--- a/config/PC4/PC4.cpg
+++ b/config/PC4/PC4.cpg
@@ -1 +0,0 @@
-UTF-8
--- a/config/PC4/PC4.dbf
+++ b/config/PC4/PC4.dbf
--- a/config/PC4/PC4.prj
+++ b/config/PC4/PC4.prj
@@ -1 +0,0 @@
-PROJCS["RD_New",GEOGCS["GCS_Amersfoort",DATUM["D_Amersfoort",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Double_Stereographic"],PARAMETER["False_Easting",155000.0],PARAMETER["False_Northing",463000.0],PARAMETER["Central_Meridian",5.38763888888889],PARAMETER["Scale_Factor",0.9999079],PARAMETER["Latitude_Of_Origin",52.15616055555555],UNIT["Meter",1.0]]
--- a/config/PC4/PC4.shp
+++ b/config/PC4/PC4.shp
--- a/config/PC4/PC4.shx
+++ b/config/PC4/PC4.shx
--- a/config/ParametersRothC.json
+++ b/config/ParametersRothC.json
@@ -1,10 +0,0 @@
-{
-  "LayerDepth": 25.0,
-  "kDPM": 10.0,
-  "kRPM": 0.3,
-  "kBIO": 0.66,
-  "kHUM": 0.02,
-  "StubbleFraction": 0.45,
-  "CarbonBiomass": 0.45,
-  "FracBelowGroundCinput": 0.25
-}
--- a/config/RegionSets.json
+++ b/config/RegionSets.json
--- a/config/SetsForDataTransformation.json
+++ b/config/SetsForDataTransformation.json
--- a/config/YieldGreenManure.json
+++ b/config/YieldGreenManure.json
@@ -1,116 +0,0 @@
-[
-  {
-    "ManureName": "Bladrammenas",
-    "GoodQuality": 3.573099415204678,
-    "AverageQuality": 2.5011695906432747,
-    "BadQuality": 1.786549707602339
-  },
-  {
-    "ManureName": "GeleMosterd",
-    "GoodQuality": 2.05696405648267,
-    "AverageQuality": 1.4398748395378689,
-    "BadQuality": 1.028482028241335
-  },
-  {
-    "ManureName": "Voederwikke",
-    "GoodQuality": 1.2933673469387754,
-    "AverageQuality": 0.9053571428571427,
-    "BadQuality": 0.6466836734693877
-  },
-  {
-    "ManureName": "Afrikaantjes",
-    "GoodQuality": 2.8392857142857153,
-    "AverageQuality": 1.9875000000000005,
-    "BadQuality": 1.4196428571428577
-  },
-  {
-    "ManureName": "JapanseHaver",
-    "GoodQuality": 2.5844583333333335,
-    "AverageQuality": 1.8091208333333333,
-    "BadQuality": 1.2922291666666668
-  },
-  {
-    "ManureName": "ItaliaansRaaigras",
-    "GoodQuality": 3.1635153508771934,
-    "AverageQuality": 2.2144607456140353,
-    "BadQuality": 1.5817576754385967
-  },
-  {
-    "ManureName": "Rogge",
-    "GoodQuality": 2.5,
-    "AverageQuality": 1.75,
-    "BadQuality": 1.25
-  },
-  {
-    "ManureName": "Graan",
-    "GoodQuality": 2.2,
-    "AverageQuality": 1.54,
-    "BadQuality": 1.1
-  },
-  {
-    "ManureName": "Haver",
-    "GoodQuality": 2.6,
-    "AverageQuality": 1.82,
-    "BadQuality": 1.3
-  },
-  {
-    "ManureName": "Gerst",
-    "GoodQuality": 2.55,
-    "AverageQuality": 1.785,
-    "BadQuality": 1.275
-  },
-  {
-    "ManureName": "Mengsel_groenbraak",
-    "GoodQuality": 2.8,
-    "AverageQuality": 1.96,
-    "BadQuality": 1.4
-  },
-  {
-    "ManureName": "Mengsel_natuurbraak",
-    "GoodQuality": 3.0,
-    "AverageQuality": 2.1,
-    "BadQuality": 1.5
-  },
-  {
-    "ManureName": "Mengsel_Nbron",
-    "GoodQuality": 2.8,
-    "AverageQuality": 1.96,
-    "BadQuality": 1.4
-  },
-  {
-    "ManureName": "Mengsel_Nvang",
-    "GoodQuality": 2.8,
-    "AverageQuality": 1.96,
-    "BadQuality": 1.4
-  },
-  {
-    "ManureName": "EngelsRaaigras",
-    "GoodQuality": 3.1635153508771934,
-    "AverageQuality": 2.2144607456140353,
-    "BadQuality": 1.5817576754385967
-  },
-  {
-    "ManureName": "Facelia",
-    "GoodQuality": 0.2925,
-    "AverageQuality": 0.20475,
-    "BadQuality": 0.14625
-  },
-  {
-    "ManureName": "Grasland",
-    "GoodQuality": 3.418421052631579,
-    "AverageQuality": 2.3928947368421056,
-    "BadQuality": 1.7092105263157895
-  },
-  {
-    "ManureName": "Overig",
-    "GoodQuality": 6.728475765306122,
-    "AverageQuality": 4.709933035714285,
-    "BadQuality": 3.364237882653061
-  },
-  {
-    "ManureName": "Rietzwenkgras",
-    "GoodQuality": 3.1635153508771934,
-    "AverageQuality": 2.2144607456140353,
-    "BadQuality": 1.5817576754385967
-  }
-]
Author	SHA1	Message	Date
Francisco Salas	f12e735dd6	Merged develop into master All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-12-09 13:02:30 +01:00
Francisco Salas	eb2e80d312	aw6383: cleanup All checks were successful FarmMaps.Develop/CarbonLib/pipeline/head This commit looks good Details	2024-11-17 15:01:27 +01:00
Francisco Salas	25ee9ff819	aw6373: init property All checks were successful FarmMaps.Develop/CarbonLib/pipeline/head This commit looks good Details	2024-11-14 15:57:10 +01:00
Francisco Salas	9e63a86e1e	aw6373: ignore property All checks were successful FarmMaps.Develop/CarbonLib/pipeline/head This commit looks good Details	2024-11-14 15:21:37 +01:00
Francisco Salas	346b6eaf78	aw6373: read organic matter from eurofins if available All checks were successful FarmMaps.Develop/CarbonLib/pipeline/head This commit looks good Details	2024-11-14 13:51:34 +01:00
jenkins	7f510c7c8e	Updated project references #109 All checks were successful FarmMaps.Develop/CarbonLib/pipeline/head This commit looks good Details	2024-10-29 13:00:18 +00:00
jenkins	d1dff49fea	[ci skip] Updated project references #87 Some checks reported errors FarmMaps/CarbonLib/pipeline/head Something is wrong with the build of this commit Details	2024-10-23 07:21:15 +00:00
jenkins	c0f855d505	Updated project references #86 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-10-23 06:51:24 +00:00
jenkins	ef07bdef0b	[ci skip] Updated project references #85 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-10-23 06:26:38 +00:00
jenkins	7658cf9c66	Updated project references #84 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-10-23 06:05:16 +00:00
Mark van der Wal	bfee63f562	Merged develop into master All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-10-23 00:08:41 +02:00
Francisco Salas	4416146ff4	aw6374: each year new calculation model; fix OM -> Carbon switch, calculation based on carbon All checks were successful FarmMaps.Develop/CarbonLib/pipeline/head This commit looks good Details	2024-10-15 08:52:36 +02:00
jenkins	06b7b252f5	[ci skip] Updated project references #105 All checks were successful FarmMaps.Develop/CarbonLib/pipeline/head This commit looks good Details	2024-10-10 10:10:04 +00:00
jenkins	5369cbc59f	Updated project references #104 All checks were successful FarmMaps.Develop/CarbonLib/pipeline/head This commit looks good Details	2024-10-10 10:00:31 +00:00
jenkins	9189592655	Updated project references #101 All checks were successful FarmMaps.Develop/CarbonLib/pipeline/head This commit looks good Details	2024-10-09 14:39:08 +00:00
jenkins	e2cb0649b5	[ci skip] Updated project references #82 Some checks reported errors FarmMaps/CarbonLib/pipeline/head Something is wrong with the build of this commit Details	2024-09-24 21:07:08 +00:00
jenkins	74e30a0c80	Updated project references #81 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-09-24 20:36:33 +00:00
jenkins	d973289d4c	[ci skip] Updated project references #80 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-09-24 20:06:16 +00:00
jenkins	23b6a0d620	Updated project references #79 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-09-24 19:44:31 +00:00
jenkins	65e4ed4755	Updated project references #77 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-09-24 19:22:11 +00:00
jenkins	d1a8976785	[ci skip] Updated project references #76 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-09-24 18:52:24 +00:00
jenkins	c6b7133d94	Updated project references #75 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-09-24 18:27:01 +00:00
jenkins	efa893dd47	Updated project references #99 All checks were successful FarmMaps.Develop/CarbonLib/pipeline/head This commit looks good Details	2024-09-18 10:02:03 +00:00
jenkins	2c3041f27c	Updated project references #98 All checks were successful FarmMaps.Develop/CarbonLib/pipeline/head This commit looks good Details	2024-09-18 09:55:11 +00:00
Francisco Salas	f480970ab7	Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/CarbonLib into develop All checks were successful FarmMaps.Develop/CarbonLib/pipeline/head This commit looks good Details	2024-09-02 09:29:13 +02:00
Francisco Salas	9e11b5e845	aw6355: undo this new solution...	2024-09-02 09:28:40 +02:00
jenkins	3fab1b48a0	[ci skip] Updated project references #96 Some checks reported errors FarmMaps.Develop/CarbonLib/pipeline/head Something is wrong with the build of this commit Details	2024-09-02 06:20:30 +00:00
Francisco Salas	c89607ebbc	aw6355: new solution organic matter/carbon factor All checks were successful FarmMaps.Develop/CarbonLib/pipeline/head This commit looks good Details	2024-09-02 08:19:47 +02:00
jenkins	d20fe7d3c4	[ci skip] Updated project references #95 Some checks reported errors FarmMaps.Develop/CarbonLib/pipeline/head Something is wrong with the build of this commit Details	2024-08-27 12:53:00 +00:00
Francisco Salas	666cc07979	aw6355: fix organic matter/carbon factor (0.54) All checks were successful FarmMaps.Develop/CarbonLib/pipeline/head This commit looks good Details	2024-08-27 14:52:09 +02:00
jenkins	6a1ab4dc8a	[ci skip] Updated project references #74 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-08-26 14:18:19 +00:00
jenkins	cd3a991157	Updated project references #73 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-08-26 13:46:57 +00:00
jenkins	075d5a6081	[ci skip] Updated project references #72 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-08-26 13:16:34 +00:00
jenkins	f78deaca8a	Updated project references #71 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-08-26 12:51:17 +00:00
jenkins	1255865fb4	Updated project references #69 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-08-26 08:33:24 +00:00
jenkins	76a7adba55	[ci skip] Updated project references #68 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-08-26 08:07:22 +00:00
jenkins	0dafbf3250	Updated project references #67 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-08-26 07:51:41 +00:00
jenkins	0d1aecc6f5	[ci skip] Updated project references #66 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-07-22 16:15:08 +00:00
jenkins	d001c802f0	Updated project references #65 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-07-22 15:46:16 +00:00
jenkins	dc91e08072	[ci skip] Updated project references #64 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-07-22 15:17:27 +00:00
jenkins	815f95ca0c	Updated project references #63 All checks were successful FarmMaps/CarbonLib/pipeline/head This commit looks good Details	2024-07-22 15:01:58 +00:00
				`@@ -1 +0,0 @@`
				`PROJCS["RD_New",GEOGCS["GCS_Amersfoort",DATUM["D_Amersfoort",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Double_Stereographic"],PARAMETER["False_Easting",155000.0],PARAMETER["False_Northing",463000.0],PARAMETER["Central_Meridian",5.38763888888889],PARAMETER["Scale_Factor",0.9999079],PARAMETER["Latitude_Of_Origin",52.15616055555555],UNIT["Meter",1.0]]`