From 7f510c7c8e043d0dee34a3d3b6c5ca32b58b6c08 Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 29 Oct 2024 13:00:18 +0000 Subject: [PATCH 1/5] Updated project references #109 --- CarbonLib.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CarbonLib.csproj b/CarbonLib.csproj index f7082a7..8291a4f 100644 --- a/CarbonLib.csproj +++ b/CarbonLib.csproj @@ -8,11 +8,11 @@ false false false - 4.11.0 + 4.12.0 - + From 346b6eaf78e604a3c21e1ac05bd5be3862fd853d Mon Sep 17 00:00:00 2001 From: Francisco Salas Date: Thu, 14 Nov 2024 13:51:34 +0100 Subject: [PATCH 2/5] aw6373: read organic matter from eurofins if available --- CarbonCalculation24.cs | 8 ++++++++ Models/FarmMapsCarbonRequest.cs | 18 ++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/CarbonCalculation24.cs b/CarbonCalculation24.cs index b1ab325..b836c1c 100644 --- a/CarbonCalculation24.cs +++ b/CarbonCalculation24.cs @@ -217,7 +217,15 @@ namespace FarmMapsAPI.Carbon { string provinceCode = GetProvinceCode(dataTransformationSet, postalCode); var crpYield = cropYieldConfig.SingleOrDefault(x => x.CropName.ToLower() == cropCode.ToLower()); + if (crpYield == null) + { + return 0; + } var crpYieldProvince = crpYield.Yields.SingleOrDefault(x => x.ProvinceCode == provinceCode); + if (crpYieldProvince == null) + { + return 0; + } var cropYield = crpYieldProvince.YearData.SingleOrDefault(x => x.Year == year)?.YieldValue; return cropYield; } diff --git a/Models/FarmMapsCarbonRequest.cs b/Models/FarmMapsCarbonRequest.cs index 0e81046..f85fa83 100644 --- a/Models/FarmMapsCarbonRequest.cs +++ b/Models/FarmMapsCarbonRequest.cs @@ -21,6 +21,9 @@ namespace FarmMapsAPI.Carbon.Models //added public int CalculateUntil { get; set; } + + //fsa + public int CalculateFrom { get; set; } } public class CropFieldFarmMaps @@ -31,10 +34,11 @@ namespace FarmMapsAPI.Carbon.Models public double Area { get; set; } [Required] public string SoilType { get; set; } + public string SoilTypeDefault { get; set; } [Required] public SoilPropertyFarmMaps SoilProperty { get; set; } [Required] - public List HistoricalCropData { get; set; } + public List HistoricalCropData { get; set; } } public class HistoricalCropDataFarmMaps @@ -78,10 +82,20 @@ namespace FarmMapsAPI.Carbon.Models { public double? OM_Const { get; set; } public double? C_Const { get; set; } + public double? OM_ConstDefault { get; set; } public string OM_Choice { get; set; } public double? Clay_Content { get; set; } + public double? Clay_ContentDefault { get; set; } public bool Depth10 { get; set; } - public int? Depth { get; set; } + public int? Depth { get; set; } + [JsonIgnore] + public List OrganicMatters { get; set; } + } + + public class OrganicMatterFarmMaps + { + public int Year { get; set; } + public double OrganicMatter { get; set; } } public class GreenManureTypeFarmMaps From 9e63a86e1edf353301c900d3d8e39c5bc655338d Mon Sep 17 00:00:00 2001 From: Francisco Salas Date: Thu, 14 Nov 2024 15:21:37 +0100 Subject: [PATCH 3/5] aw6373: ignore property --- Models/FarmMapsCarbonRequest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Models/FarmMapsCarbonRequest.cs b/Models/FarmMapsCarbonRequest.cs index f85fa83..2e5d5ca 100644 --- a/Models/FarmMapsCarbonRequest.cs +++ b/Models/FarmMapsCarbonRequest.cs @@ -22,7 +22,7 @@ namespace FarmMapsAPI.Carbon.Models //added public int CalculateUntil { get; set; } - //fsa + [JsonIgnore] public int CalculateFrom { get; set; } } From 25ee9ff8193d68058d947c1edeace450b5428459 Mon Sep 17 00:00:00 2001 From: Francisco Salas Date: Thu, 14 Nov 2024 15:57:10 +0100 Subject: [PATCH 4/5] aw6373: init property --- Models/FarmMapsCarbonRequest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Models/FarmMapsCarbonRequest.cs b/Models/FarmMapsCarbonRequest.cs index 2e5d5ca..dc925ac 100644 --- a/Models/FarmMapsCarbonRequest.cs +++ b/Models/FarmMapsCarbonRequest.cs @@ -23,7 +23,7 @@ namespace FarmMapsAPI.Carbon.Models public int CalculateUntil { get; set; } [JsonIgnore] - public int CalculateFrom { get; set; } + public int CalculateFrom { get; set; } = 0; } public class CropFieldFarmMaps From eb2e80d312a488ce0a732d6e4922da62e5c71316 Mon Sep 17 00:00:00 2001 From: Francisco Salas Date: Sun, 17 Nov 2024 15:01:27 +0100 Subject: [PATCH 5/5] aw6383: cleanup --- CarbonLib.csproj | 62 ------------------------------------------------ 1 file changed, 62 deletions(-) diff --git a/CarbonLib.csproj b/CarbonLib.csproj index 8291a4f..f9ee223 100644 --- a/CarbonLib.csproj +++ b/CarbonLib.csproj @@ -17,66 +17,4 @@ - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - -