From 07985f6fcf6d0677f01561f2ee39ca7a57f61b55 Mon Sep 17 00:00:00 2001 From: Mark van der Wal Date: Thu, 15 Oct 2020 15:14:29 +0200 Subject: [PATCH] started with zonering sample/test code. --- FarmmapsApiSamples.sln | 6 + FarmmapsHerbicide/HerbicideApplication.cs | 2 +- FarmmapsZonering/FarmmapsZonering.csproj | 24 ++++ FarmmapsZonering/Models/Settings.cs | 8 ++ FarmmapsZonering/Program.cs | 24 ++++ FarmmapsZonering/Services/ZoneringService.cs | 20 ++++ FarmmapsZonering/ZoneringApplication.cs | 120 +++++++++++++++++++ FarmmapsZonering/appsettings.json | 10 ++ 8 files changed, 213 insertions(+), 1 deletion(-) create mode 100644 FarmmapsZonering/FarmmapsZonering.csproj create mode 100644 FarmmapsZonering/Models/Settings.cs create mode 100644 FarmmapsZonering/Program.cs create mode 100644 FarmmapsZonering/Services/ZoneringService.cs create mode 100644 FarmmapsZonering/ZoneringApplication.cs create mode 100644 FarmmapsZonering/appsettings.json diff --git a/FarmmapsApiSamples.sln b/FarmmapsApiSamples.sln index f4c5fdb..65894a6 100644 --- a/FarmmapsApiSamples.sln +++ b/FarmmapsApiSamples.sln @@ -21,6 +21,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FarmmapsPoten", "FarmmapsPo EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FarmMapsBlight", "FarmMapsBlight\FarmMapsBlight.csproj", "{892E0932-5D11-4A37-979E-CEDB39C2E181}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FarmmapsZonering", "FarmmapsZonering\FarmmapsZonering.csproj", "{91A58C4A-4A80-4079-B43D-9B851206194F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -51,6 +53,10 @@ Global {892E0932-5D11-4A37-979E-CEDB39C2E181}.Debug|Any CPU.Build.0 = Debug|Any CPU {892E0932-5D11-4A37-979E-CEDB39C2E181}.Release|Any CPU.ActiveCfg = Release|Any CPU {892E0932-5D11-4A37-979E-CEDB39C2E181}.Release|Any CPU.Build.0 = Release|Any CPU + {91A58C4A-4A80-4079-B43D-9B851206194F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {91A58C4A-4A80-4079-B43D-9B851206194F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {91A58C4A-4A80-4079-B43D-9B851206194F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {91A58C4A-4A80-4079-B43D-9B851206194F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/FarmmapsHerbicide/HerbicideApplication.cs b/FarmmapsHerbicide/HerbicideApplication.cs index 525856b..4d76566 100644 --- a/FarmmapsHerbicide/HerbicideApplication.cs +++ b/FarmmapsHerbicide/HerbicideApplication.cs @@ -104,7 +104,7 @@ namespace FarmmapsHerbicide _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 ] ] ] }"); diff --git a/FarmmapsZonering/FarmmapsZonering.csproj b/FarmmapsZonering/FarmmapsZonering.csproj new file mode 100644 index 0000000..6f9fc2a --- /dev/null +++ b/FarmmapsZonering/FarmmapsZonering.csproj @@ -0,0 +1,24 @@ + + + + Exe + netcoreapp3.0 + + + + + Always + + + Always + + + Always + + + + + + + + diff --git a/FarmmapsZonering/Models/Settings.cs b/FarmmapsZonering/Models/Settings.cs new file mode 100644 index 0000000..68925ef --- /dev/null +++ b/FarmmapsZonering/Models/Settings.cs @@ -0,0 +1,8 @@ +namespace FarmmapsHaulmkilling.Models +{ + public class Settings + { + public string CropfieldItemCode { get; set; } + public string SatelliteTaskCode { get; set; } + } +} \ No newline at end of file diff --git a/FarmmapsZonering/Program.cs b/FarmmapsZonering/Program.cs new file mode 100644 index 0000000..4ab9fa5 --- /dev/null +++ b/FarmmapsZonering/Program.cs @@ -0,0 +1,24 @@ +using System.Threading.Tasks; +using FarmmapsApi; +using FarmmapsZonering.Services; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; + +namespace FarmmapsZonering +{ + class Program : FarmmapsProgram + { + private static async Task Main(string[] args) + { + await new Program().Start(args); + } + + protected override void Configure(IServiceCollection serviceCollection) + { + serviceCollection.AddLogging(opts => opts + .AddConsole() + .AddFilter("System.Net.Http", LogLevel.Warning)) + .AddTransient(); + } + } +} \ No newline at end of file diff --git a/FarmmapsZonering/Services/ZoneringService.cs b/FarmmapsZonering/Services/ZoneringService.cs new file mode 100644 index 0000000..c55bd6f --- /dev/null +++ b/FarmmapsZonering/Services/ZoneringService.cs @@ -0,0 +1,20 @@ +using FarmmapsApi.Services; +using Microsoft.Extensions.Logging; + +namespace FarmmapsZonering.Services +{ + public class ZoneringService + { + private readonly ILogger _logger; + private readonly FarmmapsApiService _farmmapsApiService; + private readonly GeneralService _generalService; + + public ZoneringService(ILogger logger, FarmmapsApiService farmmapsApiService, + GeneralService generalService) + { + _logger = logger; + _farmmapsApiService = farmmapsApiService; + _generalService = generalService; + } + } +} \ No newline at end of file diff --git a/FarmmapsZonering/ZoneringApplication.cs b/FarmmapsZonering/ZoneringApplication.cs new file mode 100644 index 0000000..88e4861 --- /dev/null +++ b/FarmmapsZonering/ZoneringApplication.cs @@ -0,0 +1,120 @@ +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using FarmmapsApi; +using FarmmapsApi.Models; +using FarmmapsApi.Services; +using FarmmapsHaulmkilling.Models; +using FarmmapsZonering.Services; +using Microsoft.Extensions.Logging; +using Newtonsoft.Json; +using static FarmmapsApiSamples.Constants; + +namespace FarmmapsZonering +{ + public class ZoneringApplication : IApplication + { + private const string DownloadFolder = "Downloads"; + private const string SettingsFile = "settings.json"; + + private readonly ILogger _logger; + private readonly FarmmapsApiService _farmmapsApiService; + private readonly GeneralService _generalService; + private readonly ZoneringService _zoneringService; + + private Settings _settings; + + public ZoneringApplication(ILogger logger, FarmmapsApiService farmmapsApiService, + GeneralService generalService, ZoneringService zoneringService) + { + _logger = logger; + _farmmapsApiService = farmmapsApiService; + _generalService = generalService; + _zoneringService = zoneringService; + } + + public async Task RunAsync() + { + if (!Directory.Exists(DownloadFolder)) + Directory.CreateDirectory(DownloadFolder); + + LoadSettings(); + + // !! 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(); + + 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; + } + + Item cropfieldItem; + if (string.IsNullOrEmpty(_settings.CropfieldItemCode)) + { + _logger.LogInformation("Creating cropfield"); + cropfieldItem = await _generalService.CreateCropfieldItemAsync(myDrive.Code, "Cropfield VRA Zonering", 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]]]}"); + _settings.CropfieldItemCode = cropfieldItem.Code; + SaveSettings(); + } + else + { + _logger.LogInformation("Cropfield already exists trying to get"); + cropfieldItem = await _farmmapsApiService.GetItemAsync(_settings.CropfieldItemCode); + } + + ItemTaskStatus taskStatus; + if (string.IsNullOrEmpty(_settings.SatelliteTaskCode)) + { + _logger.LogInformation("Gathering satellite information for cropfield, this might take a while!"); + taskStatus = await _generalService.RunAndWaitForTask(cropfieldItem, SATELLITE_TASK, null, 20); + + if (taskStatus.State == ItemTaskState.Error) + { + _logger.LogError($"Something went wrong when trying to process satellite data; {taskStatus.Message}"); + return; + } + + _settings.SatelliteTaskCode = taskStatus.Code; + SaveSettings(); + + } + else + { + taskStatus = await _farmmapsApiService.GetTaskStatusAsync(_settings.CropfieldItemCode, _settings.SatelliteTaskCode); + } + } + + private void LoadSettings() + { + if (File.Exists(SettingsFile)) + { + var jsonText = File.ReadAllText(SettingsFile); + _settings = JsonConvert.DeserializeObject(jsonText); + } + else + { + _settings = new Settings(); + } + } + + private void SaveSettings() + { + if (_settings == null) + return; + + var json = JsonConvert.SerializeObject(_settings); + File.WriteAllText(SettingsFile, json); + } + } +} \ No newline at end of file diff --git a/FarmmapsZonering/appsettings.json b/FarmmapsZonering/appsettings.json new file mode 100644 index 0000000..caeb12c --- /dev/null +++ b/FarmmapsZonering/appsettings.json @@ -0,0 +1,10 @@ +{ + "Authority": "https://accounts.farmmaps.awtest.nl/", + "Endpoint": "https://farmmaps.awtest.nl/", + "BasePath": "api/v1", + "DiscoveryEndpointUrl": "https://accounts.farmmaps.awtest.nl/.well-known/openid-configuration", + "RedirectUri": "http://example.nl/api", + "ClientId": "", + "ClientSecret": "", + "Scopes": ["api"] +} \ No newline at end of file