diff --git a/CarbonCalculation.cs b/CarbonCalculation.cs index 5ca6beb..61ccda8 100644 --- a/CarbonCalculation.cs +++ b/CarbonCalculation.cs @@ -154,6 +154,7 @@ namespace FarmMapsAPI.Carbon Crops = new List { new OrgManureApplied { Crop = cropYear.MiterraCropName, + CropRes = cropYear.CropRes, OrganicManures = cropYear.OrganicManures.Select(x => new OrganicManureType { Type = x.Type, Quantity = x.Quantity }).ToList(), CropYield = cropYear.CropYield } } @@ -175,7 +176,7 @@ namespace FarmMapsAPI.Carbon var crop = mappedCropData.SingleOrDefault(x => x.Year == crops.Year); if (crop == null) { - mappedCropData.Add(new HistoricalCropData { Year = crops.Year, Crops = new List { new OrgManureApplied { Crop = cropMapping.MiterraRothCCrop, OrganicManures = orgManure, CropYield = cropYear.CropYield } } }); + mappedCropData.Add(new HistoricalCropData { Year = crops.Year, Crops = new List { new OrgManureApplied { Crop = cropMapping.MiterraRothCCrop, OrganicManures = orgManure, CropYield = cropYear.CropYield, CropRes = cropYear.CropRes } } }); } else { @@ -184,7 +185,7 @@ namespace FarmMapsAPI.Carbon } else { - mappedCropData.Add(new HistoricalCropData { Year = crops.Year, Crops = new List { new OrgManureApplied { Crop = cropYear.CropCode, OrganicManures = null, CropYield = cropYear.CropYield } } }); + mappedCropData.Add(new HistoricalCropData { Year = crops.Year, Crops = new List { new OrgManureApplied { Crop = cropYear.CropCode, OrganicManures = null, CropYield = cropYear.CropYield, CropRes = cropYear.CropRes } } }); } } } diff --git a/Models/FarmMapsCarbonRequest.cs b/Models/FarmMapsCarbonRequest.cs index 3cf7517..2397d3b 100644 --- a/Models/FarmMapsCarbonRequest.cs +++ b/Models/FarmMapsCarbonRequest.cs @@ -85,10 +85,10 @@ namespace FarmMapsAPI.Carbon.Models public enum QualityFarmMaps { [EnumMember(Value = "Goed")] - Good, + Good = 1, [EnumMember(Value = "Matig")] - Average, + Average = 2, [EnumMember(Value = "Slecht")] - Bad + Bad = 3 } }