[ci skip] Updated project references #55

++version

.gitignore

@@ -362,3 +362,4 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 
+upstreamProjects/

CarbonCalculation.cs

@@ -139,7 +139,7 @@ namespace FarmMapsAPI.Carbon
                     Area = cropField.Area,
                     HistoricalCropData = mappedCropData,
                     SoilType = MapSoil(cropField.SoilType),
-                    SoilProperty = new SoilProperty { Clay_Content = cropField.SoilProperty.Clay_Content, OM_Const = cropField.SoilProperty.OM_Const, Depth10 = cropField.SoilProperty.Depth10 },
+                    SoilProperty = new SoilProperty { Clay_Content = cropField.SoilProperty.Clay_Content, OM_Const = cropField.SoilProperty.OM_Const, Depth10 = cropField.SoilProperty.Depth10, Depth = cropField.SoilProperty.Depth, OM_Choice = cropField.SoilProperty.OM_Choice },
                     GreenManures = greenManures
                 });              
                 foreach (var crops in cropField.HistoricalCropData)
@@ -156,8 +156,9 @@ namespace FarmMapsAPI.Carbon
                                     Crop = cropYear.MiterraCropName,
                                     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 } }
+                                    cropYear.OrganicManures.Where(y=>y.Quantity > 0 && !string.IsNullOrEmpty(y.Type)).Select(x => new OrganicManureType { Type = x.Type, Quantity = x.Quantity.HasValue? x.Quantity.Value : 0 }).ToList(),
+                                    CropYield = cropYear.CropYield,
+                                    Irrigation = crops.Irrigations} }
                             });                            
                         }
                         else
@@ -170,9 +171,9 @@ namespace FarmMapsAPI.Carbon
                                 {
                                     foreach (var manure in cropYear.OrganicManures)
                                     {
-                                        if (!string.IsNullOrEmpty(manure.Type) && manure.Quantity > 0)
+                                        if (!string.IsNullOrEmpty(manure.Type) && manure.Quantity.HasValue && manure.Quantity > 0)
                                         {
-                                            orgManure.Add(new OrganicManureType { Type = manure.Type, Quantity = manure.Quantity });
+                                            orgManure.Add(new OrganicManureType { Type = manure.Type, Quantity = manure.Quantity.HasValue ? manure.Quantity.Value : 0 });
                                         }
                                     }
                                 }
@@ -238,6 +239,12 @@ namespace FarmMapsAPI.Carbon
 
             var year = GetYears(farmInputSet, farmInput);
 
+            var carbon_organicmatter_factor = 0.54;
+            if (farmInput.CropFields[0].SoilProperty.OM_Choice == "c")
+            {
+                carbon_organicmatter_factor = 1;
+            }
+            
             //////////////////////////////////////////////
             // precalculations
             //////////////////////////////////////////////
@@ -265,6 +272,13 @@ 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;
+                if (item.Value.Depth.HasValue && item.Value.Depth.Value == 10)
+                {
+                    soilPropertyDepth10 = true;
+                }
+                // Different corrections for depth (10, 25, 30 cm)
+                // depth of 10cm has same result as previous checkbox (sample taken at 10cm)
+                parameterSet.LayerDepth = item.Value.Depth.HasValue? item.Value.Depth.Value : parameterSet.LayerDepth;
                 if (initialSoil == "Temp_gras" && soilPropertyDepth10)
                 {
                     oM_corr_SoilType.Add((item.Key, soilOfItem), item.Value.OM_Cont * 0.97);
@@ -539,7 +553,7 @@ namespace FarmMapsAPI.Carbon
                                 newValue = 0.024 * item.Value + 0.228;
                                 valueList.Add(new ColumnValue(item.Key, newValue));
                                 break;
-                            case "Corn_Cob_mix":
+                            case "Corn_cob_mix":
                                 newValue = 0.024 * item.Value + 0.228;
                                 valueList.Add(new ColumnValue(item.Key, newValue));
                                 break;
@@ -640,11 +654,7 @@ namespace FarmMapsAPI.Carbon
                     foreach (var crop in cropArea.Value)
                     {
                         var cInputCropRes = cropPropertyConfig.SingleOrDefault(s => s.Name.ToLower() == crop.Key.ToLower())?.C_input_CropRes ?? 0.0;
-                        if (cInputCropRes > 0)
-                        {
-                            carbonInputs.AddValue((cropArea.Key.Item1, cropArea.Key.Item2, crop.Key), "CarbonResidues", cInputCropRes);
-
-                        }
+                        carbonInputs.AddValue((cropArea.Key.Item1, cropArea.Key.Item2, crop.Key), "CarbonResidues", cInputCropRes);
 
                         if (cropSet.StrawCrops.Any(x => x.StrawCrop.ToLower() == crop.Key.ToLower()))
                         {
@@ -778,8 +788,18 @@ namespace FarmMapsAPI.Carbon
                             {
                                 smdMaxValue = smdMax[climateItem.Key] / 1.8;
                             }
-
-                            var result = climateItem.Value[i].Precipitation - climateItem.Value[i].Evapotranspiration;
+                            //fsa todo: add precipitation
+                            var irrigation = 0;
+                            var irrigations = farmInput.CropFields[0].HistoricalCropData.SingleOrDefault(x => x.Year == loopYear).Crops[0].Irrigation;
+                            if (!string.IsNullOrEmpty(irrigations))
+                            {
+                                var irrigationArray = irrigations.Split(',');
+                                if (irrigationArray.Length > i)
+                                {
+                                    irrigation = string.IsNullOrEmpty(irrigationArray[i]) ? 0 : Convert.ToInt16(irrigationArray[i]);
+                                }
+                            }
+                            var result = climateItem.Value[i].Precipitation - climateItem.Value[i].Evapotranspiration + irrigation;
                             result = result < 0 ? result : 0;
                             result = result < smdMaxValue ? smdMaxValue : result;
                             valueList.Add(new ColumnValue("M1", result));
@@ -799,7 +819,17 @@ namespace FarmMapsAPI.Carbon
                                 smdMaxValue = smdMax[climateItem.Key] / 1.8;
                             }
 
-                            var result = climateItem.Value[i].Precipitation - climateItem.Value[i].Evapotranspiration + valueList.SingleOrDefault(x => x.Key == $"M{i}").Value;
+                            var irrigation = 0;
+                            var irrigations = farmInput.CropFields[0].HistoricalCropData.SingleOrDefault(x => x.Year == loopYear).Crops[0].Irrigation;
+                            if (!string.IsNullOrEmpty(irrigations))
+                            {
+                                var irrigationArray = irrigations.Split(',');
+                                if (irrigationArray.Length > i)
+                                {
+                                    irrigation = string.IsNullOrEmpty(irrigationArray[i]) ? 0 : Convert.ToInt16(irrigationArray[i]);
+                                }
+                            }
+                            var result = climateItem.Value[i].Precipitation - climateItem.Value[i].Evapotranspiration + valueList.SingleOrDefault(x => x.Key == $"M{i}").Value + irrigation;
                             result = result < 0 ? result : 0;
                             result = result < smdMaxValue ? smdMaxValue : result;
                             valueList.Add(new ColumnValue($"M{i + 1}", result));
@@ -874,7 +904,7 @@ namespace FarmMapsAPI.Carbon
                     foreach (var field in cropAreaField1.Where(x => x.Key.Item2 == loopYear))
                     {
                         var valueList = new List<ColumnValue>();
-                        var result = parameterSet.LayerDepth * bulkDens[field.Key.Item1] * oM_Corr[field.Key.Item1] * 0.54;
+                        var result = parameterSet.LayerDepth * bulkDens[field.Key.Item1] * oM_Corr[field.Key.Item1] * carbon_organicmatter_factor;// 0.54;
                         foreach (var crop in field.Value)
                         {
                             valueList.Add(new ColumnValue(crop.Key, result));
@@ -1683,7 +1713,7 @@ namespace FarmMapsAPI.Carbon
                 var iniValue = item.Value.SingleOrDefault(x => x.Key == "IniCcontent")?.Value ?? 0;
                 var balanceValue = item.Value.SingleOrDefault(x => x.Key == "Balance")?.Value ?? 0;
 
-                var resultOmIni = iniValue / 0.54;
+                var resultOmIni = iniValue / carbon_organicmatter_factor;// 0.54;
                 var resultCo2 = balanceValue * (44.0 / 12.0);
 
                 item.Value.Add(new ColumnValue("OM_ini", resultOmIni));
@@ -1702,7 +1732,7 @@ namespace FarmMapsAPI.Carbon
                     var greenManure = item.SOC_CarbonGreenManure;
                     var compost = item.SOC_CarbonCompost;
 
-                    item.OM_ini = iniValue / 0.54;
+                    item.OM_ini = iniValue / carbon_organicmatter_factor;// 0.54;
                     item.CO2seq = balanceValue * (44.0 / 12.0);
 
                     var emision = -1 * (manure + residues + greenManure + compost - balanceValue);
@@ -1756,7 +1786,7 @@ namespace FarmMapsAPI.Carbon
                     var resultBal = sumBal / farmArea.Total_crop_area;
                     var resultIni = sumIni / farmArea.Total_crop_area;
                     var resultiniCc = sumInicc / farmArea.Total_crop_area;
-                    var resultOm_Ini = resultiniCc / 0.54;
+                    var resultOm_Ini = resultiniCc / carbon_organicmatter_factor;// 0.54;
                     var resultCo2 = resultBal * (44.0 / 12.0);
                     var resultCo2Tot = resultCo2 * farmArea.Total_crop_area;
 
@@ -1803,7 +1833,7 @@ namespace FarmMapsAPI.Carbon
             var soilPropertiesField = new Dictionary<string, SoilPropertyType>();
             foreach (var field in farmInput.CropFields)
             {
-                soilPropertiesField.Add(field.Name, new SoilPropertyType { OM_Cont = field.SoilProperty.OM_Const.Value, Clay_Content = field.SoilProperty.Clay_Content.Value, OM_Corr = field.SoilProperty.OM_Const.Value <= 20 ? field.SoilProperty.OM_Const.Value : 0, Depth10 = field.SoilProperty.Depth10.Value });
+                soilPropertiesField.Add(field.Name, new SoilPropertyType { OM_Cont = field.SoilProperty.OM_Const.Value, Clay_Content = field.SoilProperty.Clay_Content.Value, OM_Corr = field.SoilProperty.OM_Const.Value <= 20 ? field.SoilProperty.OM_Const.Value : 0, Depth10 = field.SoilProperty.Depth10.Value, Depth = field.SoilProperty.Depth });
             }
 
             return soilPropertiesField;
@@ -1913,7 +1943,7 @@ namespace FarmMapsAPI.Carbon
                 var monthClimateList = new List<ClimateVariable>();
                 foreach (var month in gisSoilSet.AllMonths)
                 {
-                    var climateYear = loopYear > 2020 || loopYear < 2011 ? 2012 : loopYear;
+                    var climateYear = loopYear > 2050 || loopYear < 2011 ? 2012 : loopYear;
                     var monthData = climate.Single(x => x.Key.Item1 == farmZone && x.Key.Item2 == month && x.Key.Item3 == climateYear).Value;
                     var newMonthData = new ClimateVariable(monthData.Temperature, monthData.Precipitation, monthData.Evapotranspiration * 1.25);
                     monthClimateList.Add(newMonthData);

CarbonLib.csproj

@@ -1,21 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>net6</TargetFramework>
 	  <AssemblyName>CarbonLib</AssemblyName>
 	  <PackageId>CarbonLib</PackageId>
 	  <RuntimeIdentifiers>win10-x64;ubuntu.16.04-x64</RuntimeIdentifiers>
 	  <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
 	  <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 	  <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-	  <Version>1.3.0</Version>
+	  <Version>4.4.9</Version>
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Base.Core.Common" Version="1.3.0.13" />
-		<PackageReference Include="Base.Core.Common.Geometry" Version="1.7.0" />
-		<PackageReference Include="NetTopologySuite" Version="2.0.0" />
-		<PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="2.0.4" />
+		<PackageReference Include="Base.Core.Common.Geometry" Version="4.4.5" />
+		<PackageReference Include="NetTopologySuite" Version="2.5.0" />
+		<PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="3.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

Jenkinsfile

@@ -1,42 +1,30 @@
+@Library('farmmaps-shared-library') _
+
 pipeline {
-  agent any
-  environment {
-     APP_VERSION_PREFIX=sh(script: ' cat *.csproj| xmlstarlet sel -t -m "/Project/PropertyGroup/Version" -v . -n|awk -v def="1.0.0" "{print} END { if(NR==0) {print def} }"', returnStdout: true).trim()
-     APP_NAME=sh(script: ' cat *.csproj| xmlstarlet sel -t -m "/Project/PropertyGroup/AssemblyName" -v . -n|awk -v def="App" "{print tolower(\\$0)} END { if(NR==0) {print def} }"', returnStdout: true).trim()
-     APP_VERSION="${APP_VERSION_PREFIX}"
+  agent any;
+  options {
+    copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
+    disableConcurrentBuilds();
+  }
+  triggers {
+    upstream(
+      upstreamProjects: '/FarmMaps/Base.Core.Common.Geometry/master',
+      threshold: hudson.model.Result.SUCCESS
+    )
   }
   stages {
-    stage('Dotnet Restore') {
+    stage('BaseBuildAll') {
       steps {
-        sh '''dotnet restore CarbonLib.csproj'''
-      }
-    }
-    stage('Dotnet Build') {
-      steps {
-        sh '''dotnet build CarbonLib.csproj'''
-      }
-    }
-	stage('Dotnet Package') {
-      steps {
-        sh '''rm -rf nuget
-              dotnet pack -c release -o nuget -p:PackageVersion=${APP_VERSION} CarbonLib.csproj'''
-      }
-    }
-	stage('Dotnet Publish') {
-      steps {
-		sh '''dotnet nuget push nuget/*.nupkg -k 0c3e3afc-935b-3db1-b023-e0d4799e674d -s https://repository.akkerweb.nl/repository/nuget-hosted/'''
+        stepBaseBuildAll();
       }
     }
   }
   post {
+    success {
+      postSuccess();
+    }
     always {
-      emailext (
-        body: '${DEFAULT_CONTENT}',
-        mimeType: 'text/html',
-        replyTo: '${DEFAULT_REPLYTO}',
-        subject: '${DEFAULT_SUBJECT}',
-        to: emailextrecipients([[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']])
-      )
+      postAlways();
     }
   }
 }

Jenkinsfile.develop

@@ -1,42 +1,30 @@
+@Library('farmmaps-shared-library') _
+
 pipeline {
-  agent any
-  environment {
-     APP_VERSION_PREFIX=sh(script: ' cat *.csproj| xmlstarlet sel -t -m "/Project/PropertyGroup/Version" -v . -n|awk -v def="1.0.0" "{print} END { if(NR==0) {print def} }"', returnStdout: true).trim()
-     APP_NAME=sh(script: ' cat *.csproj| xmlstarlet sel -t -m "/Project/PropertyGroup/AssemblyName" -v . -n|awk -v def="App" "{print tolower(\\$0)} END { if(NR==0) {print def} }"', returnStdout: true).trim()
-     APP_VERSION="${APP_VERSION_PREFIX + '-prerelease.' + env.BUILD_NUMBER}"
+  agent any;
+  options {
+    copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
+    disableConcurrentBuilds();
+  }
+  triggers {
+    upstream(
+      upstreamProjects: '/FarmMaps.Develop/Base.Core.Common.Geometry/develop',
+      threshold: hudson.model.Result.SUCCESS
+    )
   }
   stages {
-    stage('Dotnet Restore') {
+    stage('BaseBuildAll') {
       steps {
-        sh '''dotnet restore CarbonLib.csproj'''
-      }
-    }
-    stage('Dotnet Build'){
-      steps {
-        sh '''dotnet build CarbonLib.csproj'''
-      }
-    }
-	  stage('Dotnet Package') {
-      steps {
-        sh '''rm -rf nuget
-              dotnet pack -c debug -o nuget -p:PackageVersion=${APP_VERSION} CarbonLib.csproj'''
-      }
-     }
-	stage('Dotnet Publish') {
-      steps {
-        sh '''dotnet nuget push nuget/*.nupkg -k 0c3e3afc-935b-3db1-b023-e0d4799e674d -s https://repository.akkerweb.nl/repository/nuget-hosted/'''
+        stepBaseBuildAll();
       }
     }
   }
   post {
+    success {
+      postSuccess();
+    }
     always {
-      emailext (
-        body: '${DEFAULT_CONTENT}',
-        mimeType: 'text/html',
-        replyTo: '${DEFAULT_REPLYTO}',
-        subject: '${DEFAULT_SUBJECT}',
-        to: emailextrecipients([[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']])
-      )
+      postAlways();
     }
   }
 }

Models/CarbonRequest.cs

@@ -36,8 +36,10 @@ namespace CarbonService.Models
     public class SoilProperty
     {
         public double? OM_Const { get; set; }
+        public string OM_Choice { get; set; }
         public double? Clay_Content { get; set; }
         public bool? Depth10 { get; set; }
+        public int? Depth { get; set; }
     }
 
     public class OrgManureApplied
@@ -49,6 +51,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

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()
         {
@@ -69,14 +70,16 @@ namespace FarmMapsAPI.Carbon.Models
         [Required]
         public string Type { get; set; }
         [Required]
-        public double Quantity { get; set; }
+        public double? Quantity { get; set; }
     }
 
     public class SoilPropertyFarmMaps
     {
         public double? OM_Const { get; set; }
+        public string OM_Choice { get; set; }
         public double? Clay_Content { get; set; }
         public bool Depth10 { get; set; }
+        public int? Depth { get; set; }
     }
 
     public class GreenManureTypeFarmMaps

Models/SoilPropertyType.cs

@@ -10,7 +10,7 @@ namespace FarmMapsAPI.Carbon.Models
         public double OM_Corr { get; set; }
         public double Bulk_Density { get; set; }
         public double Clay_Content { get; set; }
-        public double Depth { get; set; }
+        public int? Depth { get; set; }
         public bool Depth10 { get; set; }
     }
 

README.md

@@ -1,2 +1,3 @@
 # CarbonLib
+#