jits
/
FarmMapsApiClient_WURtest
forked from FarmMaps/FarmMapsApiClient
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

can now specify geojson bounds for upload. 

changed how to get agents for haulmkilling.
master
Mark van der Wal 2021-04-11 17:22:19 +02:00
parent a94fb260c8
commit beaf00a043
5 changed files with 24 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FarmmapsApi/Services/FarmmapsApiService.cs
View File

@ -284,6 +284,7 @@ namespace FarmmapsApi.Services
/// <returns></returns>
/// <exception cref="FileNotFoundException"></exception>
public async Task<UploadResults> UploadFile(string filePath, string parentItemCode,
string geoJsonString = null,
Action<IUploadProgress> progressCallback = null)
{
if (!File.Exists(filePath))
@ -300,7 +301,8 @@ namespace FarmmapsApi.Services
{
Name = Path.GetFileName(filePath),
ParentCode = parentItemCode,
Size = uploadStream.Length
Size = uploadStream.Length,
Geometry = string.IsNullOrEmpty(geoJsonString) ? null : JObject.Parse(geoJsonString)
};
using var httpClient = CreateConfigurableHttpClient(_httpClient);

10
FarmmapsApi/Services/GeneralService.cs
View File

@ -41,10 +41,10 @@ namespace FarmmapsApi.Services
return await _farmmapsApiService.CreateItemAsync(cropfieldItemRequest);
}
public async Task<Item> UploadDataAsync(UserRoot root, string itemType, string filePath, string itemName)
public async Task<Item> UploadDataAsync(UserRoot root, string itemType, string filePath, string itemName, string geoJsonString = null)
{
var startUpload = DateTime.UtcNow.AddSeconds(-3);
var result = await _farmmapsApiService.UploadFile(filePath, root.Code,
var result = await _farmmapsApiService.UploadFile(filePath, root.Code, geoJsonString,
progress => _logger.LogInformation($"Status: {progress.Status} - BytesSent: {progress.BytesSent}"));
if (result.Progress.Status == UploadStatus.Failed)
@ -55,10 +55,10 @@ namespace FarmmapsApi.Services
i.Name.ToLower().Contains(itemName.ToLower()));
}
public async Task<Item> UploadZipWithShapeAsync(UserRoot root, string filePath, string itemName)
public async Task<Item> UploadZipWithShapeAsync(UserRoot root, string filePath, string itemName, string geoJsonString = null)
{
var startUpload = DateTime.UtcNow;
var result = await _farmmapsApiService.UploadFile(filePath, root.Code,
var startUpload = DateTime.UtcNow.AddSeconds(-3);
var result = await _farmmapsApiService.UploadFile(filePath, root.Code, geoJsonString,
progress => _logger.LogInformation($"Status: {progress.Status} - BytesSent: {progress.BytesSent}"));
if (result.Progress.Status == UploadStatus.Failed)

4
FarmmapsHaulmkilling/HaulmkillingApplication.cs
View File

@ -132,11 +132,11 @@ namespace FarmmapsHaulmkilling
}
var selectedAgent = agents[0];
var selectedOption = selectedAgent.SupportedOptions[0];
var selectedOption = selectedAgent.ValidOptions[0];
_logger.LogInformation("Calculating application map");
var applianceMapItem = await _haulmkillingService.CalculateApplicationMapAsync(cropfieldItem,
firstSatelliteItem, inputType, selectedAgent.Name, selectedOption);
firstSatelliteItem, inputType, selectedOption, selectedAgent);
if (applianceMapItem == null)
{
return;

20
FarmmapsHaulmkilling/HaulmkillingService.cs
View File

@ -6,6 +6,7 @@ using FarmmapsApi.Models;
using FarmmapsApi.Services;
using FarmmapsHaulmkilling.Models;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using static FarmmapsApi.Extensions;
using static FarmmapsApiSamples.Constants;
@ -31,14 +32,11 @@ namespace FarmmapsHaulmkilling
/// <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 itemType = "vnd.farmmaps.itemtype.codelist.fm005";
var haulmkillingAgentItems = 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;
return haulmkillingAgentItems.Select(item => item.Data.ToObject<HaulmkillingAgent>())
.ToList();
}
/// <summary>
@ -47,11 +45,11 @@ namespace FarmmapsHaulmkilling
/// <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="agentCode">code of 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)
string selectedOption, HaulmkillingAgent agent)
{
var taskRequest = new TaskRequest()
{
@ -59,7 +57,7 @@ namespace FarmmapsHaulmkilling
};
taskRequest.attributes["inputCode"] = inputItem.Code;
taskRequest.attributes["inputType"] = inputType;
taskRequest.attributes["agentName"] = agentName;
taskRequest.attributes["agentCode"] = agent.Code;
taskRequest.attributes["selectedOption"] = selectedOption;
taskRequest.attributes["minPercentile"] = "0.0";
@ -79,7 +77,7 @@ namespace FarmmapsHaulmkilling
return null;
}
var itemName = $"VRAHaulmkilling {agentName}";
var itemName = $"VRAHaulmkilling {agent.Label}";
var applianceMapItem = await _generalService.FindChildItemAsync(cropfieldItem.Code,
GEOTIFF_PROCESSED_ITEMTYPE, itemName,
i => i.Updated >= itemTask.Finished &&

25
FarmmapsHaulmkilling/Models/HaulmkillingAgent.cs
View File

@ -5,26 +5,11 @@ 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 string Cl { get; set; }
public string Code { get; set; }
public string Label { get; set; }
public string Options { 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; }
public List<string> ValidOptions => Options.Split(',').ToList();
}
}