Initial resumable file upload.
Other changes.
This commit is contained in:
BIN
FarmmapsApiSamples/Data/Belgie.zip
Normal file
BIN
FarmmapsApiSamples/Data/Belgie.zip
Normal file
Binary file not shown.
BIN
FarmmapsApiSamples/Data/Scan_1_20190605.zip
Normal file
BIN
FarmmapsApiSamples/Data/Scan_1_20190605.zip
Normal file
Binary file not shown.
@@ -9,6 +9,9 @@
|
||||
<None Update="appsettings.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="Data\**\*">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@@ -1,8 +1,11 @@
|
||||
using System;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using FarmmapsApi.Models;
|
||||
using FarmmapsApi.Services;
|
||||
using Google.Apis.Upload;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using static FarmmapsApi.Extensions;
|
||||
@@ -12,6 +15,8 @@ namespace FarmmapsApiSamples
|
||||
public class NbsApp : IApp
|
||||
{
|
||||
private const string USERINPUT_ITEMTYPE = "vnd.farmmaps.itemtype.user.input";
|
||||
private const string GEOTIFF_ITEMTYPE = "vnd.farmmaps.itemtype.geotiff";
|
||||
private const string CROPFIELD_ITEMTYPE = "vnd.farmmaps.itemtype.cropfield";
|
||||
private const string VRANBS_TASK = "vnd.farmmaps.task.vranbs";
|
||||
|
||||
private readonly ILogger<NbsApp> _logger;
|
||||
@@ -41,14 +46,33 @@ namespace FarmmapsApiSamples
|
||||
_logger.LogInformation("Authenticated client credentials");
|
||||
|
||||
var roots = await _farmmapsApiService.GetCurrentUserRootsAsync();
|
||||
var myDriveRoot = roots.SingleOrDefault(r => r.Name == "My drive");
|
||||
|
||||
if (myDriveRoot != null)
|
||||
|
||||
// upload data to Uploaded
|
||||
var uploadedRoot = roots.SingleOrDefault(r => r.Name == "Uploaded");
|
||||
if (uploadedRoot != null)
|
||||
{
|
||||
var cropfieldItem = await GetOrCreateCropfieldItem(myDriveRoot.Code);
|
||||
var targetN = await CalculateTargetN(cropfieldItem, 60);
|
||||
await _farmmapsApiService.UploadFile(Path.Combine("Data", "Scan_1_20190605.zip"), uploadedRoot.Code,
|
||||
progress =>
|
||||
{
|
||||
_logger.LogInformation($"Status: {progress.Status} - BytesSent: {progress.BytesSent}");
|
||||
if(progress.Status == UploadStatus.Failed)
|
||||
_logger.LogError($"Uploading failed {progress.Exception.Message}");
|
||||
});
|
||||
|
||||
_logger.LogInformation($"TargetN: {targetN}");
|
||||
// need to transform shape data to geotiff
|
||||
|
||||
var myDriveRoot = roots.SingleOrDefault(r => r.Name == "My drive");
|
||||
if (myDriveRoot != null)
|
||||
{
|
||||
var cropfieldItem = await GetOrCreateCropfieldItem(myDriveRoot.Code);
|
||||
|
||||
_logger.LogInformation($"Calculating targetN with targetYield: {60}");
|
||||
var targetN = await CalculateTargetN(cropfieldItem, 60);
|
||||
_logger.LogInformation($"TargetN: {targetN}");
|
||||
|
||||
_logger.LogInformation("Calculating nitrogen map");
|
||||
// var nitrogenMapItem = CalculateNitrogenMap(cropfieldItem,, targetN);
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -60,7 +84,7 @@ namespace FarmmapsApiSamples
|
||||
private async Task<Item> GetOrCreateCropfieldItem(string parentItemCode)
|
||||
{
|
||||
var cropfieldItems = await
|
||||
_farmmapsApiService.GetItemChildrenAsync(parentItemCode, "vnd.farmmaps.itemtype.cropfield");
|
||||
_farmmapsApiService.GetItemChildrenAsync(parentItemCode,CROPFIELD_ITEMTYPE);
|
||||
|
||||
if (cropfieldItems.Count > 0)
|
||||
return cropfieldItems[0];
|
||||
@@ -70,18 +94,24 @@ namespace FarmmapsApiSamples
|
||||
{
|
||||
ParentCode = parentItemCode,
|
||||
ItemType = "vnd.farmmaps.itemtype.cropfield",
|
||||
Name = "cropfield for VRA",
|
||||
Name = "Cropfield for VRA",
|
||||
DataDate = currentYear,
|
||||
DataEndDate = currentYear.AddYears(1),
|
||||
Data = JObject.FromObject(new
|
||||
{startDate = currentYear, endDate = currentYear.AddYears(1)}),
|
||||
{startDate = currentYear, endDate = currentYear.AddMonths(3)}),
|
||||
Geometry = JObject.Parse(
|
||||
@"{""type"":""Polygon"",""coordinates"":[[[6.09942873984307,53.070025028087],[6.09992507404607,53.0705617890585],[6.10036959220086,53.0710679529031],[6.10065149010421,53.0714062774307],[6.10087493644271,53.0716712354474],[6.10091082982487,53.0716936039203],[6.10165087441291,53.0712041549161],[6.10204994718318,53.0709349338005],[6.10263143118855,53.0705789370018],[6.10311578125011,53.0702657538294],[6.10331686552072,53.0701314102389],[6.103326530575,53.070119463569],[6.10309137950343,53.0699829669055],[6.10184241586523,53.0692902201371],[6.10168497998891,53.0691984306747],[6.10092987659869,53.0694894453514],[6.09942873984307,53.070025028087]]]}")
|
||||
@"{ ""type"": ""Polygon"", ""coordinates"": [ [ [ 3.40843828875524, 50.638966444680605 ], [ 3.408953272886064, 50.639197789621612 ], [ 3.409242951459603, 50.639469958681836 ], [ 3.409328782148028, 50.639612846807708 ], [ 3.409457528180712, 50.639789755314411 ], [ 3.409639918393741, 50.640014292074966 ], [ 3.409833037442765, 50.640211611372706 ], [ 3.410069071836049, 50.640395321698435 ], [ 3.410380208081761, 50.640572227259661 ], [ 3.410605513638958, 50.640715112034222 ], [ 3.411925160474145, 50.641177783561204 ], [ 3.411935889310142, 50.640728720085136 ], [ 3.412590348309737, 50.63948356709389 ], [ 3.413244807309242, 50.638224772339846 ], [ 3.413400375432099, 50.637901562841307 ], [ 3.413539850300779, 50.637449065809889 ], [ 3.413475477284437, 50.637418445552932 ], [ 3.40999396998362, 50.637449065810451 ], [ 3.409940325803365, 50.638102293212661 ], [ 3.409575545377398, 50.638483338338325 ], [ 3.409060561246574, 50.638707881340494 ], [ 3.40843828875524, 50.638966444680605 ] ] ] }")
|
||||
};
|
||||
|
||||
return await _farmmapsApiService.CreateItemAsync(cropfieldItemRequest);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Calculates TargetN, makes the assumption the cropfield and user.input(targetn) item have the same parent
|
||||
/// </summary>
|
||||
/// <param name="cropfieldItem">The cropfield to base the calculations on</param>
|
||||
/// <param name="targetYield">The target yield input for the TargetN calculation</param>
|
||||
/// <returns>The TargetN</returns>
|
||||
private async Task<double> CalculateTargetN(Item cropfieldItem, int targetYield)
|
||||
{
|
||||
var targetNItems = await
|
||||
@@ -99,8 +129,6 @@ namespace FarmmapsApiSamples
|
||||
targetNItem = targetNItems[0];
|
||||
}
|
||||
|
||||
_logger.LogInformation($"Calculating targetN with targetYield: {targetYield}");
|
||||
|
||||
var nbsTargetNRequest = new TaskRequest {TaskType = VRANBS_TASK};
|
||||
nbsTargetNRequest.attributes["operation"] = "targetn";
|
||||
nbsTargetNRequest.attributes["inputCode"] = targetNItem.Code;
|
||||
@@ -111,19 +139,63 @@ namespace FarmmapsApiSamples
|
||||
|
||||
await PollTask(TimeSpan.FromSeconds(3), async (tokenSource) =>
|
||||
{
|
||||
var itemTask = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, itemTaskCode);
|
||||
|
||||
if (itemTask.State != ItemTaskState.Processing && itemTask.State != ItemTaskState.Scheduled)
|
||||
var itemTaskStatus = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, itemTaskCode);
|
||||
if (itemTaskStatus.State != ItemTaskState.Processing && itemTaskStatus.State != ItemTaskState.Scheduled)
|
||||
tokenSource.Cancel();
|
||||
});
|
||||
|
||||
var itemTask = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, itemTaskCode);
|
||||
if(itemTask.State == ItemTaskState.Error)
|
||||
{
|
||||
_logger.LogError($"Something went wrong with task execution: {itemTask.Message}");
|
||||
return 0;
|
||||
}
|
||||
|
||||
var item = await _farmmapsApiService.GetItemAsync(targetNItem.Code);
|
||||
if (item.Data.ContainsKey("TargetN"))
|
||||
return item.Data["TargetN"].Value<double>();
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
private async Task<Item> CalculateNitrogenMap(Item cropfieldItem, Item inputItem, double targetN)
|
||||
{
|
||||
var nbsNitrogenRequest = new TaskRequest {TaskType = VRANBS_TASK};
|
||||
nbsNitrogenRequest.attributes["operation"] = "nitrogen";
|
||||
nbsNitrogenRequest.attributes["inputCode"] = inputItem.Code;
|
||||
nbsNitrogenRequest.attributes["inputType"] = "irmi";
|
||||
nbsNitrogenRequest.attributes["targetN"] = targetN.ToString(CultureInfo.InvariantCulture);
|
||||
|
||||
string itemTaskCode = await _farmmapsApiService.QueueTaskAsync(cropfieldItem.Code, nbsNitrogenRequest);
|
||||
|
||||
await PollTask(TimeSpan.FromSeconds(5), async (tokenSource) =>
|
||||
{
|
||||
var itemTaskStatus = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, itemTaskCode);
|
||||
if (itemTaskStatus.State != ItemTaskState.Processing && itemTaskStatus.State != ItemTaskState.Scheduled)
|
||||
tokenSource.Cancel();
|
||||
});
|
||||
|
||||
var itemTask = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, itemTaskCode);
|
||||
if(itemTask.State == ItemTaskState.Error)
|
||||
{
|
||||
_logger.LogError($"Something went wrong with task execution: {itemTask.Message}");
|
||||
return null;
|
||||
}
|
||||
|
||||
var geotiffItems = await
|
||||
_farmmapsApiService.GetItemChildrenAsync(cropfieldItem.Code, GEOTIFF_ITEMTYPE);
|
||||
|
||||
// how to uniquely know which item is really created!?
|
||||
var nitrogenItem = geotiffItems.SingleOrDefault(i => i.Name.Contains("nitrogen"));
|
||||
if (nitrogenItem == null)
|
||||
{
|
||||
_logger.LogError("Could not find the nitrogen geotiff child item under cropfield");
|
||||
return null;
|
||||
}
|
||||
|
||||
return nitrogenItem;
|
||||
}
|
||||
|
||||
private ItemRequest CreateTargetNItemRequest(string parentItemCode)
|
||||
{
|
||||
return new ItemRequest()
|
||||
|
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"Authority": "https://accounts.farmmaps.awtest.nl/",
|
||||
"Endpoint": "https://farmmaps.awtest.nl/api/v1/",
|
||||
"Endpoint": "http://localhost:8083",
|
||||
"BasePath": "api/v1",
|
||||
"DiscoveryEndpointUrl": "https://accounts.farmmaps.awtest.nl/.well-known/openid-configuration",
|
||||
"RedirectUri": "http://example.nl/api",
|
||||
"ClientId": "",
|
||||
|
Reference in New Issue
Block a user