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

add factor to farm balance summary
All checks were successful
FarmMaps.Develop/CarbonLib/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Francisco Salas
2021-06-24 07:50:08 +02:00
parent f97f076679
commit f684bf72b2
1 changed files with 2 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
CarbonCalculation.cs
View File

@@ -1645,11 +1645,11 @@ namespace FarmMapsAPI.Carbon
sumCarbonCom += item.Value.SingleOrDefault(x => x.Key == "SOC_CarbonCompost")?.Value ?? 0; sumCarbonCom += item.Value.SingleOrDefault(x => x.Key == "SOC_CarbonCompost")?.Value ?? 0;
sumEmision += item.Value.SingleOrDefault(x => x.Key == "Emision")?.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; sumIni += item.Value.SingleOrDefault(x => x.Key == "Initial")?.Value ?? 0;
sumInicc += item.Value.SingleOrDefault(x => x.Key == "IniCcontent")?.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) if (farmArea != null && farmArea.Total_crop_area > 0)
{ {
var resultCarbonMan = sumCarbonMan / farmArea.Total_crop_area; var resultCarbonMan = sumCarbonMan / farmArea.Total_crop_area;
@@ -1751,37 +1751,6 @@ namespace FarmMapsAPI.Carbon
return cropAreaField; return cropAreaField;
} }
/* private Dictionary<string, List<ColumnValue>> GetOrgManureApplied(CarbonRequest farmInput)
{
var orgManureApplied = new Dictionary<string, List<ColumnValue>>();
foreach (var cropManure in farmInput.OrgManureApplied)
{
var valueList = new List<ColumnValue>();
foreach (var manure in cropManure.OrganicManures)
{
valueList.Add(new ColumnValue(manure.Type, manure.Quantity));
}
orgManureApplied.Add(cropManure.Crop, valueList);
}
return orgManureApplied;
}
private Dictionary<string, List<ColumnValue>> GetOrgManureAppliedPerCropfieldYear(CarbonRequest farmInput)
{
var orgManureApplied = new Dictionary<string, List<ColumnValue>>();
foreach (var cropManure in farmInput.OrgManureApplied)
{
var valueList = new List<ColumnValue>();
foreach (var manure in cropManure.OrganicManures)
{
valueList.Add(new ColumnValue(manure.Type, manure.Quantity));
}
orgManureApplied.Add(cropManure.Crop, valueList);
}
return orgManureApplied;
}*/
private Dictionary<string, SoilBulkDensityType> GetSoilBulkDensities(Dictionary<string, SoilPropertyType> soilPropertiesField, Dictionary<string, List<string>> soilTypeData, Dictionary<(string, string), SoilPropertyType> soilPropSoilType) private Dictionary<string, SoilBulkDensityType> GetSoilBulkDensities(Dictionary<string, SoilPropertyType> soilPropertiesField, Dictionary<string, List<string>> soilTypeData, Dictionary<(string, string), SoilPropertyType> soilPropSoilType)
{ {
var soilBulkDensities = new Dictionary<string, SoilBulkDensityType>(); var soilBulkDensities = new Dictionary<string, SoilBulkDensityType>();