FarmMaps/CarbonLib
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

aw5832: fix om_choice
Some checks are pending
FarmMaps/CarbonLib/pipeline/head This commit looks good
Details
FarmMaps.Develop/CarbonLib/pipeline/head Build queued...
Details

Browse Source
This commit is contained in:
Francisco Salas
2024-01-25 11:17:04 +01:00
parent c73560db61
commit f12a1c5a82
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CarbonCalculation.cs
View File

@@ -139,7 +139,7 @@ namespace FarmMapsAPI.Carbon
Area = cropField.Area, Area = cropField.Area,
HistoricalCropData = mappedCropData, HistoricalCropData = mappedCropData,
SoilType = MapSoil(cropField.SoilType), SoilType = MapSoil(cropField.SoilType),
SoilProperty = new SoilProperty { Clay_Content = cropField.SoilProperty.Clay_Content, OM_Const = cropField.SoilProperty.OM_Const, Depth10 = cropField.SoilProperty.Depth10, Depth = cropField.SoilProperty.Depth, OM_Type = cropField.SoilProperty.OM_Type }, 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 GreenManures = greenManures
}); });
foreach (var crops in cropField.HistoricalCropData) foreach (var crops in cropField.HistoricalCropData)
@@ -240,6 +240,10 @@ namespace FarmMapsAPI.Carbon
var year = GetYears(farmInputSet, farmInput); var year = GetYears(farmInputSet, farmInput);
var carbon_organicmatter_factor = 0.54; var carbon_organicmatter_factor = 0.54;
if (farmInput.CropFields[0].SoilProperty.OM_Choice == "c")
{
carbon_organicmatter_factor = 1;
}
////////////////////////////////////////////// //////////////////////////////////////////////
// precalculations // precalculations

2
Models/CarbonRequest.cs
View File

@@ -36,7 +36,7 @@ namespace CarbonService.Models
public class SoilProperty public class SoilProperty
{ {
public double? OM_Const { get; set; } public double? OM_Const { get; set; }
public string OM_Type { get; set; } public string OM_Choice { get; set; }
public double? Clay_Content { get; set; } public double? Clay_Content { get; set; }
public bool? Depth10 { get; set; } public bool? Depth10 { get; set; }
public int? Depth { get; set; } public int? Depth { get; set; }

2
Models/FarmMapsCarbonRequest.cs
View File

@@ -76,7 +76,7 @@ namespace FarmMapsAPI.Carbon.Models
public class SoilPropertyFarmMaps public class SoilPropertyFarmMaps
{ {
public double? OM_Const { get; set; } public double? OM_Const { get; set; }
public string OM_Type { get; set; } public string OM_Choice { get; set; }
public double? Clay_Content { get; set; } public double? Clay_Content { get; set; }
public bool Depth10 { get; set; } public bool Depth10 { get; set; }
public int? Depth { get; set; } public int? Depth { get; set; }