From f12a1c5a8279a04937d3d7ea7607fb0465292376 Mon Sep 17 00:00:00 2001 From: Francisco Salas Date: Thu, 25 Jan 2024 11:17:04 +0100 Subject: [PATCH] aw5832: fix om_choice --- CarbonCalculation.cs | 6 +++++- Models/CarbonRequest.cs | 2 +- Models/FarmMapsCarbonRequest.cs | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CarbonCalculation.cs b/CarbonCalculation.cs index 5480c70..a549e38 100644 --- a/CarbonCalculation.cs +++ b/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, 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 }); foreach (var crops in cropField.HistoricalCropData) @@ -240,6 +240,10 @@ 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 diff --git a/Models/CarbonRequest.cs b/Models/CarbonRequest.cs index e721e6c..94f4faf 100644 --- a/Models/CarbonRequest.cs +++ b/Models/CarbonRequest.cs @@ -36,7 +36,7 @@ namespace CarbonService.Models public class SoilProperty { 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 bool? Depth10 { get; set; } public int? Depth { get; set; } diff --git a/Models/FarmMapsCarbonRequest.cs b/Models/FarmMapsCarbonRequest.cs index 1eaa5d9..ce19286 100644 --- a/Models/FarmMapsCarbonRequest.cs +++ b/Models/FarmMapsCarbonRequest.cs @@ -76,7 +76,7 @@ namespace FarmMapsAPI.Carbon.Models public class SoilPropertyFarmMaps { 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 bool Depth10 { get; set; } public int? Depth { get; set; }