From c80020d1225cbb376cb6ba36253338a7cb35847a Mon Sep 17 00:00:00 2001 From: Mark van der Wal Date: Wed, 8 Apr 2020 20:53:08 +0200 Subject: [PATCH] refactored herbicide --- FarmmapsHerbicide/HerbicideApplication.cs | 146 +++++++++++++++- FarmmapsHerbicide/HerbicideService.cs | 183 +-------------------- FarmmapsHerbicide/Models/HerbicideAgent.cs | 2 +- FarmmapsHerbicide/Program.cs | 1 - FarmmapsNbs/NbsApplication.cs | 2 +- 5 files changed, 150 insertions(+), 184 deletions(-) diff --git a/FarmmapsHerbicide/HerbicideApplication.cs b/FarmmapsHerbicide/HerbicideApplication.cs index 68296c7..7347f0d 100644 --- a/FarmmapsHerbicide/HerbicideApplication.cs +++ b/FarmmapsHerbicide/HerbicideApplication.cs @@ -1,8 +1,14 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; using System.Threading.Tasks; using FarmmapsApi; +using FarmmapsApi.Models; using FarmmapsApi.Services; -using FarmmapsApiSamples; +using FarmmapsHerbicide.Models; using Microsoft.Extensions.Logging; +using static FarmmapsApiSamples.Constants; namespace FarmmapsHerbicide { @@ -14,6 +20,8 @@ namespace FarmmapsHerbicide private readonly FarmmapsApiService _farmmapsApiService; private readonly HerbicideService _herbicideService; private readonly GeneralService _generalService; + + private HerbicideAgent _liberatorTarweAgent; public HerbicideApplication(ILogger logger, FarmmapsApiService farmmapsApiService, GeneralService generalService, HerbicideService herbicideService) @@ -22,10 +30,146 @@ namespace FarmmapsHerbicide _farmmapsApiService = farmmapsApiService; _generalService = generalService; _herbicideService = herbicideService; + + _liberatorTarweAgent = new HerbicideAgent() + { + Middel = "Liberator", + Grondsoort = "Klei", + ExtraProductType = "OS", + ActieveStofGehalte = "diflu100+flufenacet400", + MinDosis = 0.33f, + MaxDosis = 0.6f, + A = 0.007f, + B = 0.25f, + C = 1.05f, + D = 97f, + E = 3f, + P = 1f, + Gewas = "Tarwe", + Opmerking = "Org. stof arme grond", + TankMix = string.Empty + }; } public async Task RunAsync() { + if (!Directory.Exists(DownloadFolder)) + Directory.CreateDirectory(DownloadFolder); + + // !! this call is needed the first time an api is called with a fresh clientid and secret !! + await _farmmapsApiService.GetCurrentUserCodeAsync(); + var roots = await _farmmapsApiService.GetCurrentUserRootsAsync(); + + await SingleLutumTiffFlow(roots); + await MultiVanDenBorneShapeFlow(roots); + } + + private async Task SingleLutumTiffFlow(List roots) + { + var myDrive = roots.SingleOrDefault(r => r.Name == "My drive"); + if (myDrive == null) + { + _logger.LogError("Could not find a needed root item"); + return; + } + + var uploadedRoot = roots.SingleOrDefault(r => r.Name == "Uploaded"); + if (uploadedRoot == null) + { + _logger.LogError("Could not find a needed root item"); + return; + } + + _logger.LogInformation("Creating cropfield"); + var cropfieldItem = await _generalService.CreateCropfieldItemAsync(myDrive.Code, "Cropfield VRA Herbicide LUTUM", 2020, + @"{""type"":""Polygon"",""coordinates"":[[[4.617786844284247,52.22533706956424],[4.618642601314543,52.225938364585989],[4.6192153806397,52.22563988897754],[4.619192414656403,52.2256242822442],[4.620306732153958,52.225031745661528],[4.620542019225217,52.22519855319158],[4.621157509147853,52.22487436515405],[4.623387917230182,52.22367660757213],[4.624563444939009,52.22304740241544],[4.624562779355982,52.223046635247019],[4.624534908813479,52.22302596787506],[4.627873021330343,52.221240670658399],[4.627504935938338,52.220104419135129],[4.627324878706837,52.22020569669098],[4.627320696113512,52.22020660117888],[4.626707169518044,52.22053923770041],[4.624700376420229,52.221619047547488],[4.623471571183885,52.22227447969577],[4.623471511010673,52.22227500174403],[4.623468838689317,52.22228052566992],[4.617786844284247,52.22533706956424]]]}"); + + _logger.LogInformation("Uploading data"); + var filePath = Path.Combine("Data", "Lutum.tiff"); + var inputItem = await _generalService.UploadDataAsync(uploadedRoot, GEOTIFF_PROCESSED_ITEMTYPE, filePath, "Lutum.tiff"); + if(inputItem == null) + { + _logger.LogError($"Failed to upload data"); + return; + } + + _logger.LogInformation("Calculating appliance map"); + var applianceMapItem = await _herbicideService.CalculateApplicationMapAsync(cropfieldItem, _liberatorTarweAgent, inputItem); + if (applianceMapItem == null) + { + return; + } + + _logger.LogInformation("Downloading appliance map"); + await _farmmapsApiService.DownloadItemAsync(applianceMapItem.Code, Path.Combine(DownloadFolder, + $"{applianceMapItem.Name}_{Guid.NewGuid():N}.zip")); + } + + private async Task MultiVanDenBorneShapeFlow(List roots) + { + var myDrive = roots.SingleOrDefault(r => r.Name == "My drive"); + if (myDrive == null) + { + _logger.LogError("Could not find a needed root item"); + return; + } + + var uploadedRoot = roots.SingleOrDefault(r => r.Name == "Uploaded"); + if (uploadedRoot == null) + { + _logger.LogError("Could not find a needed root item"); + return; + } + + _logger.LogInformation("Creating cropfield"); + var cropfieldItem = await _generalService.CreateCropfieldItemAsync(myDrive.Code, "Cropfield VRA Herbicide van den borne", 2020, + @"{ ""type"": ""Polygon"", ""coordinates"": [ [ [ 5.833813406930386, 52.662044400144573 ], [ 5.835448040282574, 52.662663232992713 ], [ 5.836017878606523, 52.662878934715643 ], [ 5.836051608552347, 52.66284538659815 ], [ 5.836752490453029, 52.662168665385018 ], [ 5.837926180228544, 52.662604908046319 ], [ 5.839506445610824, 52.661074514977884 ], [ 5.839509138399547, 52.661071906335934 ], [ 5.83609382583743, 52.659780657270744 ], [ 5.834864415345847, 52.661000863063798 ], [ 5.833813406930386, 52.662044400144573 ] ] ] }"); + + // upload data + _logger.LogInformation("Uploading lutum data"); + var inputItem = await _generalService.UploadZipWithShapeAsync(uploadedRoot, + Path.Combine("Data", "vd_born_lutum.zip"), "Lutum"); + if(inputItem == null) + { + _logger.LogError($"Failed to upload lutum data"); + return; + } + + _logger.LogInformation("Uploading organic matter data"); + var inputExtraItem = await _generalService.UploadZipWithShapeAsync(uploadedRoot, + Path.Combine("Data", "vd_born_om.zip"), "OS"); + if(inputExtraItem == null) + { + _logger.LogError($"Failed to upload organic matter data"); + return; + } + + // transform shape to geotiff as nbstask only supports tiff input item + var tiffInputItem = await _generalService.ShapeToGeotiff(inputItem); + if (tiffInputItem == null) + { + _logger.LogError($"Failed to convert shape to tiff for inputItem"); + return; + } + + var tiffInputExtraItem = await _generalService.ShapeToGeotiff(inputExtraItem); + if (tiffInputExtraItem == null) + { + _logger.LogError($"Failed to convert shape to tiff for inputExtraItem"); + return; + } + + // create appliance map + _logger.LogInformation("Calculating appliance map"); + var applianceMapItem = await _herbicideService.CalculateApplicationMapAsync(cropfieldItem, _liberatorTarweAgent, tiffInputItem, tiffInputExtraItem); + if (applianceMapItem == null) + { + return; + } + + _logger.LogInformation("Downloading appliance map"); + await _farmmapsApiService.DownloadItemAsync(applianceMapItem.Code, Path.Combine(DownloadFolder, + $"{applianceMapItem.Name}_{Guid.NewGuid():N}.zip")); } } } \ No newline at end of file diff --git a/FarmmapsHerbicide/HerbicideService.cs b/FarmmapsHerbicide/HerbicideService.cs index b9999ba..2314a1b 100644 --- a/FarmmapsHerbicide/HerbicideService.cs +++ b/FarmmapsHerbicide/HerbicideService.cs @@ -1,18 +1,14 @@ using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Threading.Tasks; using FarmmapsApi.Models; using FarmmapsApi.Services; -using FarmmapsApiSamples.Models; +using FarmmapsHerbicide.Models; using Microsoft.Extensions.Logging; using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using static FarmmapsApi.Extensions; using static FarmmapsApiSamples.Constants; -namespace FarmmapsApiSamples +namespace FarmmapsHerbicide { public class HerbicideService { @@ -20,188 +16,15 @@ namespace FarmmapsApiSamples private readonly FarmmapsApiService _farmmapsApiService; private readonly GeneralService _generalService; - private HerbicideAgent liberatorTarweAgent; - private readonly string _downloadFolder = "Downloads"; - public HerbicideService(ILogger logger, FarmmapsApiService farmmapsApiService, GeneralService generalService) { _logger = logger; _farmmapsApiService = farmmapsApiService; _generalService = generalService; - - liberatorTarweAgent = new HerbicideAgent() - { - Middel = "Liberator", - Grondsoort = "Klei", - ExtraProductType = "OS", - ActieveStofGehalte = "diflu100+flufenacet400", - MinDosis = 0.33f, - MaxDosis = 0.6f, - A = 0.007f, - B = 0.25f, - C = 1.05f, - D = 97f, - E = 3f, - P = 1f, - Gewas = "Tarwe", - Opmerking = "Org. stof arme grond", - TankMix = string.Empty - }; } - public async Task TestFlow(List roots) - { - if (!Directory.Exists(_downloadFolder)) - Directory.CreateDirectory(_downloadFolder); - -// await SingleLutumTiffFlow(roots); - await MultiVanDenBorneShapeFlow(roots); - } - - private async Task SingleLutumTiffFlow(List roots) - { - var myDrive = roots.SingleOrDefault(r => r.Name == "My drive"); - if (myDrive == null) - { - _logger.LogError("Could not find a needed root item"); - return; - } - - var uploadedRoot = roots.SingleOrDefault(r => r.Name == "Uploaded"); - if (uploadedRoot == null) - { - _logger.LogError("Could not find a needed root item"); - return; - } - - _logger.LogInformation("Creating cropfield"); - var cropfieldItem = await CreateCropfieldSingleLutumItemAsync(myDrive.Code); - - _logger.LogInformation("Uploading data"); - var filePath = Path.Combine("Data", "Herbicide", "Lutum.tiff"); - var inputItem = await _generalService.UploadDataAsync(uploadedRoot, GEOTIFF_PROCESSED_ITEMTYPE, filePath, "Lutum.tiff"); - if(inputItem == null) - { - _logger.LogError($"Failed to upload data"); - return; - } - - _logger.LogInformation("Calculating appliance map"); - var applianceMapItem = await CalculateApplianceMapAsync(cropfieldItem, liberatorTarweAgent, inputItem); - if (applianceMapItem == null) - { - return; - } - - _logger.LogInformation("Downloading appliance map"); - await _farmmapsApiService.DownloadItemAsync(applianceMapItem.Code, Path.Combine(_downloadFolder, - $"{applianceMapItem.Name}_{Guid.NewGuid():N}.zip")); - } - - private async Task MultiVanDenBorneShapeFlow(List roots) - { - var myDrive = roots.SingleOrDefault(r => r.Name == "My drive"); - if (myDrive == null) - { - _logger.LogError("Could not find a needed root item"); - return; - } - - var uploadedRoot = roots.SingleOrDefault(r => r.Name == "Uploaded"); - if (uploadedRoot == null) - { - _logger.LogError("Could not find a needed root item"); - return; - } - - _logger.LogInformation("Creating cropfield"); - var cropfieldItem = await CreateCropfieldVanDenBorneAsync(myDrive.Code); - - // upload data - _logger.LogInformation("Uploading lutum data"); - var inputItem = await _generalService.UploadZipWithShapeAsync(uploadedRoot, - Path.Combine("Data", "Herbicide", "vd_born_lutum.zip"), "Lutum"); - if(inputItem == null) - { - _logger.LogError($"Failed to upload lutum data"); - return; - } - - _logger.LogInformation("Uploading organic matter data"); - var inputExtraItem = await _generalService.UploadZipWithShapeAsync(uploadedRoot, - Path.Combine("Data", "Herbicide", "vd_born_om.zip"), "OS"); - if(inputExtraItem == null) - { - _logger.LogError($"Failed to upload organic matter data"); - return; - } - - // transform shape to geotiff as nbstask only supports tiff input item - var tiffInputItem = await _generalService.ShapeToGeotiff(inputItem); - if (tiffInputItem == null) - { - _logger.LogError($"Failed to convert shape to tiff for inputItem"); - return; - } - - var tiffInputExtraItem = await _generalService.ShapeToGeotiff(inputExtraItem); - if (tiffInputExtraItem == null) - { - _logger.LogError($"Failed to convert shape to tiff for inputExtraItem"); - return; - } - - // create appliance map - _logger.LogInformation("Calculating appliance map"); - var applianceMapItem = await CalculateApplianceMapAsync(cropfieldItem, liberatorTarweAgent, tiffInputItem, tiffInputExtraItem); - if (applianceMapItem == null) - { - return; - } - - _logger.LogInformation("Downloading appliance map"); - await _farmmapsApiService.DownloadItemAsync(applianceMapItem.Code, Path.Combine(_downloadFolder, - $"{applianceMapItem.Name}_{Guid.NewGuid():N}.zip")); - } - - private async Task CreateCropfieldSingleLutumItemAsync(string parentItemCode) - { - var currentYear = new DateTime(DateTime.UtcNow.Year, 1, 1); - var cropfieldItemRequest = new ItemRequest() - { - ParentCode = parentItemCode, - ItemType = CROPFIELD_ITEMTYPE, - Name = "Cropfield VRA Herbicide LUTUM", - DataDate = currentYear, - DataEndDate = currentYear.AddMonths(3), - Data = JObject.Parse("{}"), - Geometry = JObject.Parse( - @"{""type"":""Polygon"",""coordinates"":[[[4.617786844284247,52.22533706956424],[4.618642601314543,52.225938364585989],[4.6192153806397,52.22563988897754],[4.619192414656403,52.2256242822442],[4.620306732153958,52.225031745661528],[4.620542019225217,52.22519855319158],[4.621157509147853,52.22487436515405],[4.623387917230182,52.22367660757213],[4.624563444939009,52.22304740241544],[4.624562779355982,52.223046635247019],[4.624534908813479,52.22302596787506],[4.627873021330343,52.221240670658399],[4.627504935938338,52.220104419135129],[4.627324878706837,52.22020569669098],[4.627320696113512,52.22020660117888],[4.626707169518044,52.22053923770041],[4.624700376420229,52.221619047547488],[4.623471571183885,52.22227447969577],[4.623471511010673,52.22227500174403],[4.623468838689317,52.22228052566992],[4.617786844284247,52.22533706956424]]]}") - }; - - return await _farmmapsApiService.CreateItemAsync(cropfieldItemRequest); - } - - private async Task CreateCropfieldVanDenBorneAsync(string parentItemCode) - { - var currentYear = new DateTime(DateTime.UtcNow.Year, 1, 1); - var cropfieldItemRequest = new ItemRequest() - { - ParentCode = parentItemCode, - ItemType = CROPFIELD_ITEMTYPE, - Name = "Cropfield VRA Herbicide van den borne", - DataDate = currentYear, - DataEndDate = currentYear.AddMonths(3), - Data = JObject.Parse("{}"), - Geometry = JObject.Parse( - @"{ ""type"": ""Polygon"", ""coordinates"": [ [ [ 5.833813406930386, 52.662044400144573 ], [ 5.835448040282574, 52.662663232992713 ], [ 5.836017878606523, 52.662878934715643 ], [ 5.836051608552347, 52.66284538659815 ], [ 5.836752490453029, 52.662168665385018 ], [ 5.837926180228544, 52.662604908046319 ], [ 5.839506445610824, 52.661074514977884 ], [ 5.839509138399547, 52.661071906335934 ], [ 5.83609382583743, 52.659780657270744 ], [ 5.834864415345847, 52.661000863063798 ], [ 5.833813406930386, 52.662044400144573 ] ] ] }") - }; - - return await _farmmapsApiService.CreateItemAsync(cropfieldItemRequest); - } - - private async Task CalculateApplianceMapAsync(Item cropfieldItem, HerbicideAgent agent, params Item[] inputItem) + public async Task CalculateApplicationMapAsync(Item cropfieldItem, HerbicideAgent agent, params Item[] inputItem) { if (inputItem.Length == 0) return null; diff --git a/FarmmapsHerbicide/Models/HerbicideAgent.cs b/FarmmapsHerbicide/Models/HerbicideAgent.cs index 8e13d77..7b76e03 100644 --- a/FarmmapsHerbicide/Models/HerbicideAgent.cs +++ b/FarmmapsHerbicide/Models/HerbicideAgent.cs @@ -1,4 +1,4 @@ -namespace FarmmapsApiSamples.Models +namespace FarmmapsHerbicide.Models { public class HerbicideAgent { diff --git a/FarmmapsHerbicide/Program.cs b/FarmmapsHerbicide/Program.cs index 1609f86..2b8c021 100644 --- a/FarmmapsHerbicide/Program.cs +++ b/FarmmapsHerbicide/Program.cs @@ -1,6 +1,5 @@ using System.Threading.Tasks; using FarmmapsApi; -using FarmmapsApiSamples; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; diff --git a/FarmmapsNbs/NbsApplication.cs b/FarmmapsNbs/NbsApplication.cs index 34c5bf4..ba5bc21 100644 --- a/FarmmapsNbs/NbsApplication.cs +++ b/FarmmapsNbs/NbsApplication.cs @@ -57,7 +57,7 @@ namespace FarmmapsNbs var cropfieldItem = await _generalService.CreateCropfieldItemAsync(myDriveRoot.Code, "VRA NBS cropfield", 2020, @"{ ""type"": ""Polygon"", ""coordinates"": [ [ [ 3.40843828875524, 50.638966444680605 ], [ 3.408953272886064, 50.639197789621612 ], [ 3.409242951459603, 50.639469958681836 ], [ 3.409328782148028, 50.639612846807708 ], [ 3.409457528180712, 50.639789755314411 ], [ 3.409639918393741, 50.640014292074966 ], [ 3.409833037442765, 50.640211611372706 ], [ 3.410069071836049, 50.640395321698435 ], [ 3.410380208081761, 50.640572227259661 ], [ 3.410605513638958, 50.640715112034222 ], [ 3.411925160474145, 50.641177783561204 ], [ 3.411935889310142, 50.640728720085136 ], [ 3.412590348309737, 50.63948356709389 ], [ 3.413244807309242, 50.638224772339846 ], [ 3.413400375432099, 50.637901562841307 ], [ 3.413539850300779, 50.637449065809889 ], [ 3.413475477284437, 50.637418445552932 ], [ 3.40999396998362, 50.637449065810451 ], [ 3.409940325803365, 50.638102293212661 ], [ 3.409575545377398, 50.638483338338325 ], [ 3.409060561246574, 50.638707881340494 ], [ 3.40843828875524, 50.638966444680605 ] ] ] }"); - var dataPath = Path.Combine("Data", "Nbs", "Scan_1_20190605.zip"); + var dataPath = Path.Combine("Data", "Scan_1_20190605.zip"); var isariaShapeItem = await _generalService.UploadZipWithShapeAsync(uploadedRoot, dataPath, "Scan_1_20190605"); if (isariaShapeItem == null)