From 8bb5c6f581154d75433c5820e6bdedafbfb5894c Mon Sep 17 00:00:00 2001 From: "Abel Hoeven, van" Date: Tue, 25 Apr 2023 16:14:43 +0200 Subject: [PATCH] Input aangepast, nu kan er van de gegeven input een cropfield wordern gemaakt, en hier kunnen vervolgens KPIs over berekend worden. Volgende stap is het strippen van de KPIinput om te kijken wat het minimale is dat nodig is om de kpis te berekenen. --- FarmmapsKPI/KPIApplication.cs | 4 ++-- FarmmapsKPI/KPIInput.json | 2 +- FarmmapsKPI/Models/KPIInput.cs | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/FarmmapsKPI/KPIApplication.cs b/FarmmapsKPI/KPIApplication.cs index af93856..3ec2434 100644 --- a/FarmmapsKPI/KPIApplication.cs +++ b/FarmmapsKPI/KPIApplication.cs @@ -98,11 +98,11 @@ namespace FarmmapsKPI // Use already created cropfield or create new one Item cropfieldItem; - if (useCreatedCropfield == false || string.IsNullOrEmpty(_settings.CropfieldItemCode)) + if (useCreatedCropfield == true || string.IsNullOrEmpty(_settings.CropfieldItemCode)) { _logger.LogInformation("Creating cropfield"); cropfieldItem = await _generalService.CreateCropfieldItemAsync(myDriveRoot.Code, - $"DataCropfield {input.OutputFileName}", cropYear, input.GeometryJson.ToString(Formatting.None)); + $"DataCropfield {input.OutputFileName}", cropYear, input.GeometryJson.ToString(Formatting.None), input.Data.ToString(Formatting.None)); _settings.CropfieldItemCode = cropfieldItem.Code; SaveSettings(settingsfile); } diff --git a/FarmmapsKPI/KPIInput.json b/FarmmapsKPI/KPIInput.json index 17322ee..da10356 100644 --- a/FarmmapsKPI/KPIInput.json +++ b/FarmmapsKPI/KPIInput.json @@ -1,6 +1,6 @@ [ { - "UseCreatedCropfield": true, + "UseCreatedCropfield": false, "outputFileName": "TestData", "fieldName": "TestField", "DownloadFolder": "Downloads", //"C:\\workdir\\groenmonitor\\", // "Downloads", -> if you just put "Downloads" the program will download to somewhere in ..\FarmMapsApiClient_WURtest\FarmmapsDataDownload\bin\Debug\netcoreapp3.1\Downloads\ diff --git a/FarmmapsKPI/Models/KPIInput.cs b/FarmmapsKPI/Models/KPIInput.cs index d21f594..99314b0 100644 --- a/FarmmapsKPI/Models/KPIInput.cs +++ b/FarmmapsKPI/Models/KPIInput.cs @@ -12,6 +12,7 @@ namespace FarmmapsKPI.Models public string DownloadFolder { get; set; } public int CropYear { get; set; } public JObject GeometryJson { get; set; } + public JObject Data { get; set; } public string InputLayerName { get; set; } public string fieldName { get; set; } //public bool GetSatelliteData { get; set; }