diff --git a/CarbonCalculation.cs b/CarbonCalculation.cs index e4ad593..707d264 100644 --- a/CarbonCalculation.cs +++ b/CarbonCalculation.cs @@ -1645,11 +1645,11 @@ namespace FarmMapsAPI.Carbon sumCarbonCom += item.Value.SingleOrDefault(x => x.Key == "SOC_CarbonCompost")?.Value ?? 0; sumEmision += item.Value.SingleOrDefault(x => x.Key == "Emision")?.Value ?? 0; - sumBal += item.Value.SingleOrDefault(x => x.Key == "Balance")?.Value ?? 0; + sumBal += item.Value.SingleOrDefault(x => x.Key == "Balance")?.Value / 0.54 ?? 0; sumIni += item.Value.SingleOrDefault(x => x.Key == "Initial")?.Value ?? 0; sumInicc += item.Value.SingleOrDefault(x => x.Key == "IniCcontent")?.Value ?? 0; } - var farmArea = soc_Summary_Farm.SingleOrDefault(x => x.Year == farm.Key.Item2); //[farm.Key.Item2].SingleOrDefault(x => x.Key == "Total_crop_area")?.Value ?? 0; + var farmArea = soc_Summary_Farm.SingleOrDefault(x => x.Year == farm.Key.Item2); if (farmArea != null && farmArea.Total_crop_area > 0) { var resultCarbonMan = sumCarbonMan / farmArea.Total_crop_area; @@ -1751,37 +1751,6 @@ namespace FarmMapsAPI.Carbon return cropAreaField; } - /* private Dictionary> GetOrgManureApplied(CarbonRequest farmInput) - { - var orgManureApplied = new Dictionary>(); - foreach (var cropManure in farmInput.OrgManureApplied) - { - var valueList = new List(); - foreach (var manure in cropManure.OrganicManures) - { - valueList.Add(new ColumnValue(manure.Type, manure.Quantity)); - } - orgManureApplied.Add(cropManure.Crop, valueList); - } - return orgManureApplied; - } - - private Dictionary> GetOrgManureAppliedPerCropfieldYear(CarbonRequest farmInput) - { - var orgManureApplied = new Dictionary>(); - foreach (var cropManure in farmInput.OrgManureApplied) - { - var valueList = new List(); - foreach (var manure in cropManure.OrganicManures) - { - valueList.Add(new ColumnValue(manure.Type, manure.Quantity)); - } - orgManureApplied.Add(cropManure.Crop, valueList); - } - return orgManureApplied; - }*/ - - private Dictionary GetSoilBulkDensities(Dictionary soilPropertiesField, Dictionary> soilTypeData, Dictionary<(string, string), SoilPropertyType> soilPropSoilType) { var soilBulkDensities = new Dictionary();