Compare commits
8 Commits
e6244ff74b
...
c8b82a2ed3
Author | SHA1 | Date | |
---|---|---|---|
c8b82a2ed3 | |||
2336bb138a | |||
38cb1e27a5 | |||
a331437433 | |||
276cce1808 | |||
17765f17b0 | |||
690807a632 | |||
f16ad90f68 |
@ -3,11 +3,16 @@ namespace FarmmapsApiSamples
|
||||
public static class Constants
|
||||
{
|
||||
public const string USERINPUT_ITEMTYPE = "vnd.farmmaps.itemtype.user.input";
|
||||
public const string TEMPORAL_ITEMTYPE = "vnd.farmmaps.itemtype.temporal";
|
||||
public const string GEOTIFF_ITEMTYPE = "vnd.farmmaps.itemtype.geotiff";
|
||||
public const string GEOTIFF_PROCESSED_ITEMTYPE = "vnd.farmmaps.itemtype.geotiff.processed";
|
||||
public const string CROPFIELD_ITEMTYPE = "vnd.farmmaps.itemtype.cropfield";
|
||||
public const string SHAPE_PROCESSED_ITEMTYPE = "vnd.farmmaps.itemtype.shape.processed";
|
||||
public const string SHAPE_ITEMTYPE = "vnd.farmmaps.itemtype.shape";
|
||||
|
||||
public const string VRANBS_TASK = "vnd.farmmaps.task.vranbs";
|
||||
public const string VRAHERBICIDE_TASK = "vnd.farmmaps.task.vraherbicide";
|
||||
public const string VRAHAULMKILLING_TASK = "vnd.farmmaps.task.vrahaulmkilling";
|
||||
public const string SATELLITE_TASK = "vnd.farmmaps.task.satellite";
|
||||
}
|
||||
}
|
@ -96,27 +96,37 @@ namespace FarmmapsApi.Services
|
||||
|
||||
public async Task<Item> ShapeToGeotiff(Item shapeItem)
|
||||
{
|
||||
var shapeToGeotiffRequest = new TaskRequest()
|
||||
{
|
||||
TaskType = "vnd.farmmaps.task.shapetogeotiff"
|
||||
};
|
||||
var taskCode = await _farmmapsApiService.QueueTaskAsync(shapeItem.Code, shapeToGeotiffRequest);
|
||||
|
||||
await PollTask(TimeSpan.FromSeconds(3), async (tokenSource) =>
|
||||
{
|
||||
_logger.LogInformation("Checking shapetogeotiff task status");
|
||||
var itemTaskStatus = await _farmmapsApiService.GetTaskStatusAsync(shapeItem.Code, taskCode);
|
||||
if (itemTaskStatus.IsFinished)
|
||||
tokenSource.Cancel();
|
||||
});
|
||||
|
||||
_logger.LogInformation("Data shape converted to geotiff");
|
||||
await RunAndWaitForTask(shapeItem, "vnd.farmmaps.task.shapetogeotiff");
|
||||
|
||||
// the parent of the shape item is now the tiff item
|
||||
shapeItem = await _farmmapsApiService.GetItemAsync(shapeItem.Code);
|
||||
return await _farmmapsApiService.GetItemAsync(shapeItem.ParentCode);
|
||||
}
|
||||
|
||||
public async Task<ItemTaskStatus> RunAndWaitForTask(Item subjectItem, string taskIdentifier,
|
||||
Action<TaskRequest> configureCallback = null, int retrySeconds = 3)
|
||||
{
|
||||
var taskRequest = new TaskRequest()
|
||||
{
|
||||
TaskType = taskIdentifier
|
||||
};
|
||||
configureCallback?.Invoke(taskRequest);
|
||||
|
||||
var taskCode = await _farmmapsApiService.QueueTaskAsync(subjectItem.Code, taskRequest);
|
||||
|
||||
await PollTask(TimeSpan.FromSeconds(retrySeconds), async (tokenSource) =>
|
||||
{
|
||||
_logger.LogInformation($"Checking {taskIdentifier} task status");
|
||||
var itemTaskStatus = await _farmmapsApiService.GetTaskStatusAsync(subjectItem.Code, taskCode);
|
||||
if (itemTaskStatus.IsFinished)
|
||||
tokenSource.Cancel();
|
||||
});
|
||||
|
||||
_logger.LogInformation($"{taskIdentifier} finished");
|
||||
|
||||
return await _farmmapsApiService.GetTaskStatusAsync(subjectItem.Code, taskCode);
|
||||
}
|
||||
|
||||
public async Task<Item> FindChildItemAsync(string parentCode, string itemType, string containsName,
|
||||
Func<Item, bool> filter = null, int maxTries = 10)
|
||||
{
|
||||
|
@ -1,17 +1,20 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
#
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FarmmapsNbs", "FarmmapsNbs\FarmmapsNbs.csproj", "{E08EF7E9-F09E-42D8-825C-164E458C78F4}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FarmmapsApi", "FarmmapsApi\FarmmapsApi.csproj", "{1FA9E50B-F45E-4534-953A-37C783D03C74}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "General", "General", "{6FA66E07-A59E-480E-B5D1-DBEFC4E4583D}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
README.MD = README.MD
|
||||
.gitignore = .gitignore
|
||||
EndProjectSection
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
README.MD = README.MD
|
||||
.gitignore = .gitignore
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FarmmapsHerbicide", "FarmmapsHerbicide\FarmmapsHerbicide.csproj", "{731A88CD-9DC4-4969-86F2-2315830A6998}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FarmmapsHaulmkilling", "FarmmapsHaulmkilling\FarmmapsHaulmkilling.csproj", "{DFA89D0B-5400-4374-B824-8367B76B4B6E}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
@ -30,5 +33,9 @@ Global
|
||||
{731A88CD-9DC4-4969-86F2-2315830A6998}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{731A88CD-9DC4-4969-86F2-2315830A6998}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{731A88CD-9DC4-4969-86F2-2315830A6998}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{DFA89D0B-5400-4374-B824-8367B76B4B6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{DFA89D0B-5400-4374-B824-8367B76B4B6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{DFA89D0B-5400-4374-B824-8367B76B4B6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{DFA89D0B-5400-4374-B824-8367B76B4B6E}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
20
FarmmapsHaulmkilling/FarmmapsHaulmkilling.csproj
Normal file
20
FarmmapsHaulmkilling/FarmmapsHaulmkilling.csproj
Normal file
@ -0,0 +1,20 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Update="appsettings.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="Data\**\*">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\FarmmapsApi\FarmmapsApi.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
172
FarmmapsHaulmkilling/HaulmkillingApplication.cs
Normal file
172
FarmmapsHaulmkilling/HaulmkillingApplication.cs
Normal file
@ -0,0 +1,172 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using FarmmapsApi;
|
||||
using FarmmapsApi.Models;
|
||||
using FarmmapsApi.Services;
|
||||
using FarmmapsHaulmkilling.Models;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using static FarmmapsApiSamples.Constants;
|
||||
|
||||
namespace FarmmapsHaulmkilling
|
||||
{
|
||||
public class HaulmkillingApplication : IApplication
|
||||
{
|
||||
private const string DownloadFolder = "Downloads";
|
||||
private const string SettingsFile = "settings.json";
|
||||
|
||||
private readonly ILogger<HaulmkillingApplication> _logger;
|
||||
private readonly FarmmapsApiService _farmmapsApiService;
|
||||
private readonly HaulmkillingService _haulmkillingService;
|
||||
private readonly GeneralService _generalService;
|
||||
|
||||
private Settings _settings;
|
||||
|
||||
public HaulmkillingApplication(ILogger<HaulmkillingApplication> logger, FarmmapsApiService farmmapsApiService,
|
||||
GeneralService generalService, HaulmkillingService haulmkillingService)
|
||||
{
|
||||
_logger = logger;
|
||||
_farmmapsApiService = farmmapsApiService;
|
||||
_generalService = generalService;
|
||||
_haulmkillingService = haulmkillingService;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
var agents = await _haulmkillingService.GetHaulmkillingAgents();
|
||||
if (agents == null || agents.Count == 0)
|
||||
{
|
||||
_logger.LogError("No valid agents found for haulmkilling");
|
||||
return;
|
||||
}
|
||||
|
||||
Item cropfieldItem;
|
||||
if (string.IsNullOrEmpty(_settings.CropfieldItemCode))
|
||||
{
|
||||
_logger.LogInformation("Creating cropfield");
|
||||
cropfieldItem = await _generalService.CreateCropfieldItemAsync(myDrive.Code, "Cropfield VRA Haulmkilling", 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);
|
||||
}
|
||||
|
||||
// find ndvi or wdvi satellite data geotiffs
|
||||
var temporalItem = await _generalService.FindChildItemAsync(cropfieldItem.Code, TEMPORAL_ITEMTYPE,
|
||||
"Cropfield VRA Haulmkilling, Satellite", item => item.SourceTask == SATELLITE_TASK &&
|
||||
taskStatus.Finished >= item.Created &&
|
||||
taskStatus.Finished <= item.Created.Value.AddHours(1));
|
||||
|
||||
if (temporalItem == null)
|
||||
{
|
||||
_logger.LogError("Temporal item not found");
|
||||
return;
|
||||
}
|
||||
|
||||
var satelliteTiffs = await _farmmapsApiService.GetItemChildrenAsync(temporalItem.Code);
|
||||
var firstSatelliteItem = satelliteTiffs.FirstOrDefault();
|
||||
|
||||
if (firstSatelliteItem == null)
|
||||
{
|
||||
_logger.LogError("Satellite item not found");
|
||||
return;
|
||||
}
|
||||
|
||||
// must be ndvi or wdvi
|
||||
var inputType = (firstSatelliteItem.Data["layers"] as JArray)?[0]["name"].ToString();
|
||||
if (string.IsNullOrEmpty(inputType))
|
||||
{
|
||||
_logger.LogError("Could not get the input type name from the satellite item");
|
||||
return;
|
||||
}
|
||||
|
||||
var selectedAgent = agents[0];
|
||||
var selectedOption = selectedAgent.SupportedOptions[0];
|
||||
|
||||
_logger.LogInformation("Calculating application map");
|
||||
var applianceMapItem = await _haulmkillingService.CalculateApplicationMapAsync(cropfieldItem,
|
||||
firstSatelliteItem, inputType, selectedAgent.Name, selectedOption);
|
||||
if (applianceMapItem == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
_logger.LogInformation("Downloading application map");
|
||||
await _farmmapsApiService.DownloadItemAsync(applianceMapItem.Code, Path.Combine(DownloadFolder,
|
||||
$"{applianceMapItem.Name}_{Guid.NewGuid():N}.zip"));
|
||||
}
|
||||
|
||||
private void LoadSettings()
|
||||
{
|
||||
if (File.Exists(SettingsFile))
|
||||
{
|
||||
var jsonText = File.ReadAllText(SettingsFile);
|
||||
_settings = JsonConvert.DeserializeObject<Settings>(jsonText);
|
||||
}
|
||||
else
|
||||
{
|
||||
_settings = new Settings();
|
||||
}
|
||||
}
|
||||
|
||||
private void SaveSettings()
|
||||
{
|
||||
if (_settings == null)
|
||||
return;
|
||||
|
||||
var json = JsonConvert.SerializeObject(_settings);
|
||||
File.WriteAllText(SettingsFile, json);
|
||||
}
|
||||
}
|
||||
}
|
97
FarmmapsHaulmkilling/HaulmkillingService.cs
Normal file
97
FarmmapsHaulmkilling/HaulmkillingService.cs
Normal file
@ -0,0 +1,97 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using FarmmapsApi.Models;
|
||||
using FarmmapsApi.Services;
|
||||
using FarmmapsHaulmkilling.Models;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using static FarmmapsApi.Extensions;
|
||||
using static FarmmapsApiSamples.Constants;
|
||||
|
||||
namespace FarmmapsHaulmkilling
|
||||
{
|
||||
public class HaulmkillingService
|
||||
{
|
||||
private readonly ILogger<HaulmkillingService> _logger;
|
||||
private readonly FarmmapsApiService _farmmapsApiService;
|
||||
private readonly GeneralService _generalService;
|
||||
|
||||
public HaulmkillingService(ILogger<HaulmkillingService> logger, FarmmapsApiService farmmapsApiService,
|
||||
GeneralService generalService)
|
||||
{
|
||||
_logger = logger;
|
||||
_farmmapsApiService = farmmapsApiService;
|
||||
_generalService = generalService;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the list of available haulmkilling agents
|
||||
/// </summary>
|
||||
/// <returns>List of haulmkilling agents</returns>
|
||||
public async Task<List<HaulmkillingAgent>> GetHaulmkillingAgents()
|
||||
{
|
||||
var itemType = "vnd.farmmaps.package.vra.haulmkilling";
|
||||
var vraHerbicideDataItems = await _farmmapsApiService.GetItemsAsync(string.Empty, itemType);
|
||||
|
||||
var item = vraHerbicideDataItems.FirstOrDefault();
|
||||
if (item == null)
|
||||
return null;
|
||||
|
||||
return item.Data.ContainsKey("agents") ? item.Data["agents"].ToObject<List<HaulmkillingAgent>>() : null;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Creates an haulmkilling application map
|
||||
/// </summary>
|
||||
/// <param name="cropfieldItem">The context cropfield item to use</param>
|
||||
/// <param name="inputItem">The geotiff item to use</param>
|
||||
/// <param name="inputType">WDVI or NDVI</param>
|
||||
/// <param name="agentName">One of the available agents</param>
|
||||
/// <param name="selectedOption">One of the available options</param>
|
||||
/// <returns>Haulmkilling application map item</returns>
|
||||
public async Task<Item> CalculateApplicationMapAsync(Item cropfieldItem, Item inputItem, string inputType,
|
||||
string agentName, string selectedOption)
|
||||
{
|
||||
var taskRequest = new TaskRequest()
|
||||
{
|
||||
TaskType = "vnd.farmmaps.task.vrahaulmkilling"
|
||||
};
|
||||
taskRequest.attributes["inputCode"] = inputItem.Code;
|
||||
taskRequest.attributes["inputType"] = inputType;
|
||||
taskRequest.attributes["agentName"] = agentName;
|
||||
taskRequest.attributes["selectedOption"] = selectedOption;
|
||||
taskRequest.attributes["minPercentile"] = "0.0";
|
||||
|
||||
var taskCode = await _farmmapsApiService.QueueTaskAsync(cropfieldItem.Code, taskRequest);
|
||||
await PollTask(TimeSpan.FromSeconds(3), async (tokenSource) =>
|
||||
{
|
||||
_logger.LogInformation("Checking vrahaulmkilling task status");
|
||||
var itemTaskStatus = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, taskCode);
|
||||
if (itemTaskStatus.IsFinished)
|
||||
tokenSource.Cancel();
|
||||
});
|
||||
|
||||
var itemTask = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, taskCode);
|
||||
if (itemTask.State == ItemTaskState.Error)
|
||||
{
|
||||
_logger.LogError($"Something went wrong with task execution: {itemTask.Message}");
|
||||
return null;
|
||||
}
|
||||
|
||||
var itemName = $"VRAHaulmkilling {agentName}";
|
||||
var applianceMapItem = await _generalService.FindChildItemAsync(cropfieldItem.Code,
|
||||
GEOTIFF_PROCESSED_ITEMTYPE, itemName,
|
||||
i => i.Updated >= itemTask.Finished &&
|
||||
i.Name.ToLower().Contains(itemName.ToLower()));
|
||||
|
||||
if (applianceMapItem == null)
|
||||
{
|
||||
_logger.LogError("Could not find the VRAHaulmkilling geotiff child item under cropfield");
|
||||
return null;
|
||||
}
|
||||
|
||||
return applianceMapItem;
|
||||
}
|
||||
}
|
||||
}
|
30
FarmmapsHaulmkilling/Models/HaulmkillingAgent.cs
Normal file
30
FarmmapsHaulmkilling/Models/HaulmkillingAgent.cs
Normal file
@ -0,0 +1,30 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace FarmmapsHaulmkilling.Models
|
||||
{
|
||||
public class HaulmkillingAgent
|
||||
{
|
||||
public string Name { get; set; }
|
||||
public List<string> SupportedOptions { get; set; }
|
||||
public Dictionary<string, List<HaulmkillingAgentValue>> Values { get; set; }
|
||||
|
||||
public HaulmkillingAgentValue? GetAgentValue(string inputName, string optionKey)
|
||||
{
|
||||
if (!Values.ContainsKey(inputName))
|
||||
return null;
|
||||
|
||||
var agentDataValues = Values[inputName];
|
||||
return agentDataValues.FirstOrDefault(v => v.Option.Equals(optionKey));
|
||||
}
|
||||
}
|
||||
|
||||
public struct HaulmkillingAgentValue
|
||||
{
|
||||
public string Option { get; set; }
|
||||
public float Min { get; set; }
|
||||
public float Max { get; set; }
|
||||
public float FMul { get; set; }
|
||||
public float FExp { get; set; }
|
||||
}
|
||||
}
|
8
FarmmapsHaulmkilling/Models/Settings.cs
Normal file
8
FarmmapsHaulmkilling/Models/Settings.cs
Normal file
@ -0,0 +1,8 @@
|
||||
namespace FarmmapsHaulmkilling.Models
|
||||
{
|
||||
public class Settings
|
||||
{
|
||||
public string CropfieldItemCode { get; set; }
|
||||
public string SatelliteTaskCode { get; set; }
|
||||
}
|
||||
}
|
23
FarmmapsHaulmkilling/Program.cs
Normal file
23
FarmmapsHaulmkilling/Program.cs
Normal file
@ -0,0 +1,23 @@
|
||||
using System.Threading.Tasks;
|
||||
using FarmmapsApi;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace FarmmapsHaulmkilling
|
||||
{
|
||||
class Program : FarmmapsProgram<HaulmkillingApplication>
|
||||
{
|
||||
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<HaulmkillingService>();
|
||||
}
|
||||
}
|
||||
}
|
10
FarmmapsHaulmkilling/appsettings.json
Normal file
10
FarmmapsHaulmkilling/appsettings.json
Normal file
@ -0,0 +1,10 @@
|
||||
{
|
||||
"Authority": "https://accounts.farmmaps.awtest.nl/",
|
||||
"Endpoint": "http://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"]
|
||||
}
|
@ -144,14 +144,14 @@ namespace FarmmapsHerbicide
|
||||
}
|
||||
|
||||
// create appliance map
|
||||
_logger.LogInformation("Calculating appliance map");
|
||||
_logger.LogInformation("Calculating application map");
|
||||
var applianceMapItem = await _herbicideService.CalculateApplicationMapAsync(cropfieldItem, _liberatorTarweAgent, tiffInputItem, tiffInputExtraItem);
|
||||
if (applianceMapItem == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
_logger.LogInformation("Downloading appliance map");
|
||||
_logger.LogInformation("Downloading application map");
|
||||
await _farmmapsApiService.DownloadItemAsync(applianceMapItem.Code, Path.Combine(DownloadFolder,
|
||||
$"{applianceMapItem.Name}_{Guid.NewGuid():N}.zip"));
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user