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

[WIP]second flow with shape files and extra input.

Browse Source
This commit is contained in:
Mark van der Wal 2020-04-07 13:46:58 +02:00
parent b1fe1a1efb
commit a757355d50
7 changed files with 177 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FarmmapsApi/Models/ItemTaskStatus.cs
View File

@ -15,8 +15,10 @@ namespace FarmmapsApi.Models
public string TaskType { get; set; } public string TaskType { get; set; }
public string Code { get; set; } public string Code { get; set; }
public string Message { get; set; } public string Message { get; set; }
public ItemTaskState State { get; set; } public ItemTaskState State { get; set; } = ItemTaskState.Scheduled;
public DateTime? Started { get; set; } public DateTime? Started { get; set; }
public DateTime? Finished { get; set; } public DateTime? Finished { get; set; }
public bool IsFinished => State == ItemTaskState.Error || State == ItemTaskState.Ok;
} }
} }

BIN
FarmmapsApiSamples/Data/Lutum.zip
View File

Binary file not shown.

BIN
FarmmapsApiSamples/Data/Scan_1_20190605.zip
View File

Binary file not shown.

BIN
FarmmapsApiSamples/Data/vd_born_lutum.zip Normal file
View File

Binary file not shown.

BIN
FarmmapsApiSamples/Data/vd_born_om.zip Normal file
View File

Binary file not shown.

192
FarmmapsApiSamples/HerbicideService.cs
View File

@ -21,6 +21,7 @@ namespace FarmmapsApiSamples
private readonly FarmmapsApiService _farmmapsApiService; private readonly FarmmapsApiService _farmmapsApiService;
private HerbicideAgent liberatorTarweAgent; private HerbicideAgent liberatorTarweAgent;
private readonly string _downloadFolder = "Downloads";
public HerbicideService(ILogger<HerbicideService> logger, FarmmapsApiService farmmapsApiService) public HerbicideService(ILogger<HerbicideService> logger, FarmmapsApiService farmmapsApiService)
{ {
@ -49,10 +50,15 @@ namespace FarmmapsApiSamples
public async Task TestFlow(List<UserRoot> roots) public async Task TestFlow(List<UserRoot> roots)
{ {
var downloadFolder = "Downloads"; if (!Directory.Exists(_downloadFolder))
if (!Directory.Exists(downloadFolder)) Directory.CreateDirectory(_downloadFolder);
Directory.CreateDirectory(downloadFolder);
// await SingleLutumTiffFlow(roots);
await MultiVanDenBorneShapeFlow(roots);
}
private async Task SingleLutumTiffFlow(List<UserRoot> roots)
{
var myDrive = roots.SingleOrDefault(r => r.Name == "My drive"); var myDrive = roots.SingleOrDefault(r => r.Name == "My drive");
if (myDrive == null) if (myDrive == null)
{ {
@ -68,28 +74,93 @@ namespace FarmmapsApiSamples
} }
_logger.LogInformation("Creating cropfield"); _logger.LogInformation("Creating cropfield");
var cropfieldItem = await CreateCropfieldItemAsync(myDrive.Code); var cropfieldItem = await CreateCropfieldSingleLutumItemAsync(myDrive.Code);
_logger.LogInformation("Uploading data"); _logger.LogInformation("Uploading data");
var dataItem = await UploadData(uploadedRoot, GEOTIFF_PROCESSED_ITEMTYPE, Path.Combine("Data", "Lutum.tiff")); var inputItem = await UploadDataAsync(uploadedRoot, GEOTIFF_PROCESSED_ITEMTYPE, Path.Combine("Data", "Lutum.tiff"), "Lutum.tiff");
if(dataItem == null) if(inputItem == null)
{ {
_logger.LogError($"Failed to upload data"); _logger.LogError($"Failed to upload data");
return; return;
} }
_logger.LogInformation("Calculating appliance map"); _logger.LogInformation("Calculating appliance map");
var applianceMapItem = await CalculateApplianceMap(cropfieldItem, dataItem, liberatorTarweAgent); var applianceMapItem = await CalculateApplianceMapAsync(cropfieldItem, liberatorTarweAgent, inputItem);
if (applianceMapItem == null) if (applianceMapItem == null)
{ {
return; return;
} }
_logger.LogInformation("Downloading appliance map"); _logger.LogInformation("Downloading appliance map");
await _farmmapsApiService.DownloadItemAsync(applianceMapItem.Code, Path.Combine(downloadFolder, $"{applianceMapItem.Name}.zip")); await _farmmapsApiService.DownloadItemAsync(applianceMapItem.Code, Path.Combine(_downloadFolder,
$"{applianceMapItem.Name}_{Guid.NewGuid():N}.zip"));
} }
private async Task<Item> CreateCropfieldItemAsync(string parentItemCode) private async Task MultiVanDenBorneShapeFlow(List<UserRoot> roots)
{
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;
}
_logger.LogInformation("Creating cropfield");
var cropfieldItem = await CreateCropfieldVanDenBorneAsync(myDrive.Code);
// upload data
_logger.LogInformation("Uploading lutum data");
var inputItem = await UploadZipWithShapeAsync(uploadedRoot, Path.Combine("Data", "vd_born_lutum.zip"), "Lutum");
if(inputItem == null)
{
_logger.LogError($"Failed to upload lutum data");
return;
}
_logger.LogInformation("Uploading organic matter data");
var inputExtraItem = await UploadZipWithShapeAsync(uploadedRoot, Path.Combine("Data", "vd_born_om.zip"), "OS");
if(inputExtraItem == null)
{
_logger.LogError($"Failed to upload organic matter data");
return;
}
// transform shape to geotiff as nbstask only supports tiff input item
var tiffInputItem = await ShapeToGeotiff(inputItem);
if (tiffInputItem == null)
{
_logger.LogError($"Failed to convert shape to tiff for inputItem");
return;
}
var tiffInputExtraItem = await ShapeToGeotiff(inputExtraItem);
if (tiffInputExtraItem == null)
{
_logger.LogError($"Failed to convert shape to tiff for inputExtraItem");
return;
}
// create appliance map
_logger.LogInformation("Calculating appliance map");
var applianceMapItem = await CalculateApplianceMapAsync(cropfieldItem, liberatorTarweAgent, tiffInputItem, tiffInputExtraItem);
if (applianceMapItem == null)
{
return;
}
_logger.LogInformation("Downloading appliance map");
await _farmmapsApiService.DownloadItemAsync(applianceMapItem.Code, Path.Combine(_downloadFolder,
$"{applianceMapItem.Name}_{Guid.NewGuid():N}.zip"));
}
private async Task<Item> CreateCropfieldSingleLutumItemAsync(string parentItemCode)
{ {
var currentYear = new DateTime(DateTime.UtcNow.Year, 1, 1); var currentYear = new DateTime(DateTime.UtcNow.Year, 1, 1);
var cropfieldItemRequest = new ItemRequest() var cropfieldItemRequest = new ItemRequest()
@ -106,8 +177,26 @@ namespace FarmmapsApiSamples
return await _farmmapsApiService.CreateItemAsync(cropfieldItemRequest); return await _farmmapsApiService.CreateItemAsync(cropfieldItemRequest);
} }
private async Task<Item> CreateCropfieldVanDenBorneAsync(string parentItemCode)
{
var currentYear = new DateTime(DateTime.UtcNow.Year, 1, 1);
var cropfieldItemRequest = new ItemRequest()
{
ParentCode = parentItemCode,
ItemType = CROPFIELD_ITEMTYPE,
Name = "Cropfield VRA Herbicide van den borne",
DataDate = currentYear,
DataEndDate = currentYear.AddMonths(3),
Data = JObject.Parse("{}"),
Geometry = JObject.Parse(
@"{ ""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 ] ] ] }")
};
private async Task<Item> UploadData(UserRoot root, string itemType, string filePath) return await _farmmapsApiService.CreateItemAsync(cropfieldItemRequest);
}
private async Task<Item> UploadDataAsync(UserRoot root, string itemType, string filePath, string itemName)
{ {
var startUpload = DateTime.UtcNow; var startUpload = DateTime.UtcNow;
var result = await _farmmapsApiService.UploadFile(filePath, root.Code, var result = await _farmmapsApiService.UploadFile(filePath, root.Code,
@ -116,27 +205,69 @@ namespace FarmmapsApiSamples
if (result.Progress.Status == UploadStatus.Failed) if (result.Progress.Status == UploadStatus.Failed)
return null; return null;
var fileName = Path.GetFileNameWithoutExtension(filePath); return await FindChildItemAsync(root.Code, itemType, itemName,
return await FindItem(root.Code, itemType, fileName,
i => i.Created >= startUpload && i => i.Created >= startUpload &&
i.Name.ToLower().Contains(fileName.ToLower())); i.Name.ToLower().Contains(itemName.ToLower()));
} }
private async Task<Item> CalculateApplianceMap(Item cropfieldItem, Item inputItem, HerbicideAgent agent) private async Task<Item> UploadZipWithShapeAsync(UserRoot root, string filePath, string itemName)
{ {
var startUpload = DateTime.UtcNow;
var result = await _farmmapsApiService.UploadFile(filePath, root.Code,
progress => _logger.LogInformation($"Status: {progress.Status} - BytesSent: {progress.BytesSent}"));
if (result.Progress.Status == UploadStatus.Failed)
return null;
var zipName = Path.GetFileNameWithoutExtension(filePath);
Item shapeItem = null;
await PollTask(TimeSpan.FromSeconds(3), async source =>
{
var uploadedFilesChildren = await _farmmapsApiService.GetItemChildrenAsync(root.Code);
var zipItems = uploadedFilesChildren.Where(i => i.Name.Contains(zipName));
var childrenTasks = new List<Task<List<Item>>>();
foreach (var zipItem in zipItems)
{
childrenTasks.Add(_farmmapsApiService.GetItemChildrenAsync(zipItem.Code,
SHAPE_PROCESSED_ITEMTYPE));
}
List<Item>[] items = await Task.WhenAll(childrenTasks);
if (items.Length > 0)
{
var flatItems = items.SelectMany(i => i).Where(i => i.Name.Contains(itemName)).ToList();
if (flatItems.Count > 0)
{
shapeItem = flatItems.Where(i => i.Created >= startUpload).OrderByDescending(i => i.Created).First();
source.Cancel();
}
}
});
return shapeItem;
}
private async Task<Item> CalculateApplianceMapAsync(Item cropfieldItem, HerbicideAgent agent, params Item[] inputItem)
{
if (inputItem.Length == 0)
return null;
var taskRequest = new TaskRequest() var taskRequest = new TaskRequest()
{ {
TaskType = "vnd.farmmaps.task.vraherbicide" TaskType = "vnd.farmmaps.task.vraherbicide"
}; };
taskRequest.attributes["inputCode"] = inputItem.Code; taskRequest.attributes["inputCode"] = inputItem[0].Code;
taskRequest.attributes["agent"] = JsonConvert.SerializeObject(agent); taskRequest.attributes["agent"] = JsonConvert.SerializeObject(agent);
if (inputItem.Length > 1)
taskRequest.attributes["extraInputCode"] = inputItem[1].Code;
var taskCode = await _farmmapsApiService.QueueTaskAsync(cropfieldItem.Code, taskRequest); var taskCode = await _farmmapsApiService.QueueTaskAsync(cropfieldItem.Code, taskRequest);
await PollTask(TimeSpan.FromSeconds(3), async (tokenSource) => await PollTask(TimeSpan.FromSeconds(3), async (tokenSource) =>
{ {
_logger.LogInformation("Checking vraherbicide task status"); _logger.LogInformation("Checking vraherbicide task status");
var itemTaskStatus = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, taskCode); var itemTaskStatus = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, taskCode);
if (itemTaskStatus.State == ItemTaskState.Error || itemTaskStatus.State == ItemTaskState.Ok) if (itemTaskStatus.IsFinished)
tokenSource.Cancel(); tokenSource.Cancel();
}); });
@ -148,7 +279,7 @@ namespace FarmmapsApiSamples
} }
var itemName = $"VRAHerbicide {agent.Middel}"; var itemName = $"VRAHerbicide {agent.Middel}";
var applianceMapItem = await FindItem(cropfieldItem.Code, var applianceMapItem = await FindChildItemAsync(cropfieldItem.Code,
GEOTIFF_PROCESSED_ITEMTYPE, itemName, GEOTIFF_PROCESSED_ITEMTYPE, itemName,
i => i.Updated >= itemTask.Finished.GetValueOrDefault(DateTime.UtcNow) && i => i.Updated >= itemTask.Finished.GetValueOrDefault(DateTime.UtcNow) &&
i.Name.ToLower().Contains(itemName.ToLower())); i.Name.ToLower().Contains(itemName.ToLower()));
@ -162,7 +293,30 @@ namespace FarmmapsApiSamples
return applianceMapItem; return applianceMapItem;
} }
private async Task<Item> FindItem(string parentCode, string itemType, string containsName, private async Task<Item> ShapeToGeotiff(Item shapeItemCode)
{
var shapeToGeotiffRequest = new TaskRequest()
{
TaskType = "vnd.farmmaps.task.shapetogeotiff"
};
var taskCode = await _farmmapsApiService.QueueTaskAsync(shapeItemCode.Code, shapeToGeotiffRequest);
await PollTask(TimeSpan.FromSeconds(3), async (tokenSource) =>
{
_logger.LogInformation("Checking shapetogeotiff task status");
var itemTaskStatus = await _farmmapsApiService.GetTaskStatusAsync(shapeItemCode.Code, taskCode);
if (itemTaskStatus.IsFinished)
tokenSource.Cancel();
});
_logger.LogInformation("Data shape converted to geotiff");
// the parent of the shape item is now the tiff item
shapeItemCode = await _farmmapsApiService.GetItemAsync(shapeItemCode.Code);
return await _farmmapsApiService.GetItemAsync(shapeItemCode.ParentCode);
}
private async Task<Item> FindChildItemAsync(string parentCode, string itemType, string containsName,
Func<Item,bool> filter = null, int maxTries = 10) Func<Item,bool> filter = null, int maxTries = 10)
{ {
Item dataItem = null; Item dataItem = null;

2
FarmmapsApiSamples/NitrogenService.cs
View File

@ -159,7 +159,7 @@ namespace FarmmapsApiSamples
// the parent of the shape item is now the tiff isaria item // the parent of the shape item is now the tiff isaria item
isariaShapeItem = await _farmmapsApiService.GetItemAsync(isariaShapeItem.Code); isariaShapeItem = await _farmmapsApiService.GetItemAsync(isariaShapeItem.Code);
return await _farmmapsApiService.GetItemAsync(isariaShapeItem.ParentCode); ; return await _farmmapsApiService.GetItemAsync(isariaShapeItem.ParentCode);
} }
/// <summary> /// <summary>