diff --git a/FarmmapsZonering/Data/neo_ndvi-reglone-low-weed.tif b/FarmmapsZonering/Data/data_9001.tif similarity index 100% rename from FarmmapsZonering/Data/neo_ndvi-reglone-low-weed.tif rename to FarmmapsZonering/Data/data_9001.tif diff --git a/FarmmapsZonering/Data/data_lowres_9001.tiff b/FarmmapsZonering/Data/data_lowres_9001.tiff new file mode 100644 index 0000000..1495092 Binary files /dev/null and b/FarmmapsZonering/Data/data_lowres_9001.tiff differ diff --git a/FarmmapsZonering/Data/data_times_two_4326.tiff b/FarmmapsZonering/Data/data_times_two_4326.tiff new file mode 100644 index 0000000..36b0fcd Binary files /dev/null and b/FarmmapsZonering/Data/data_times_two_4326.tiff differ diff --git a/FarmmapsZonering/Data/neo_pg.json b/FarmmapsZonering/Data/pg.json similarity index 100% rename from FarmmapsZonering/Data/neo_pg.json rename to FarmmapsZonering/Data/pg.json diff --git a/FarmmapsZonering/Data/neo_pg.zip b/FarmmapsZonering/Data/pg.zip similarity index 100% rename from FarmmapsZonering/Data/neo_pg.zip rename to FarmmapsZonering/Data/pg.zip diff --git a/FarmmapsZonering/ZoneringApplication.cs b/FarmmapsZonering/ZoneringApplication.cs index 18ba353..5522490 100644 --- a/FarmmapsZonering/ZoneringApplication.cs +++ b/FarmmapsZonering/ZoneringApplication.cs @@ -73,27 +73,36 @@ namespace FarmmapsZonering _logger.LogInformation("Cropfield already exists trying to get"); cropfieldItem = await _farmmapsApiService.GetItemAsync(_settings.CropfieldItemCode); } - - var inputFileName = "neo_ndvi-reglone-low-weed.tif"; - var dataPath = Path.Combine("Data", inputFileName); - var geotiffItem = await _generalService.UploadDataAsync(uploadedRoot, GEOTIFF_PROCESSED_ITEMTYPE, dataPath, - Path.GetFileNameWithoutExtension(inputFileName)); - - if (geotiffItem == null) { + + var inputOneItem = await _generalService.UploadDataAsync(uploadedRoot, GEOTIFF_PROCESSED_ITEMTYPE, + Path.Combine("Data", "data_9001.tif"),"data_9001"); + if (inputOneItem == null) { _logger.LogError("Could not find item for uploaded data"); return; - } + } - var outputItem = await _zoneringService.CreateApplicationMapAsync(cropfieldItem, "[0] * 2", new Output() - { - Name = "times_2_zonering", - Unit = "n/kg", - Quantity = "Nitrogen" - }, new InputParameter() - { - ItemCode = geotiffItem.Code, - LayerName = geotiffItem.Data["layers"][0]["name"].ToString() - }); + var inputTwoItem = await _generalService.UploadDataAsync(uploadedRoot, GEOTIFF_PROCESSED_ITEMTYPE, + Path.Combine("Data", "data_times_two_4326.tiff"), "data_times_two_4326"); + if (inputTwoItem == null) { + _logger.LogError("Could not find item for uploaded data"); + return; + } + + var outputItem = await _zoneringService.CreateApplicationMapAsync(cropfieldItem, "[0] + [1]", new Output() + { + Name = "add", + Unit = "n/kg", + Quantity = "Nitrogen" + }, new InputParameter() + { + ItemCode = inputOneItem.Code, + LayerName = inputOneItem.Data["layers"][0]["name"].ToString() + }, + new InputParameter() + { + ItemCode = inputTwoItem.Code, + LayerName = inputTwoItem.Data["layers"][0]["name"].ToString() + }); _logger.LogInformation("Downloading output"); await _farmmapsApiService.DownloadItemAsync(outputItem.Code,