Merge pull request 'Master' (#1) from Master into master
Update Jits; added satellite import to API sample
This commit is contained in:
commit
e27ccbd8ee
@ -268,5 +268,73 @@ namespace FarmmapsApi.Services
|
||||
|
||||
return shadowItem;
|
||||
}
|
||||
|
||||
|
||||
public async Task<string> RunSatelliteTask(Item cropfieldItem)
|
||||
{
|
||||
|
||||
_logger.LogInformation("Gathering satellite information for cropfield, this might take a while!");
|
||||
|
||||
var taskmapRequest = new TaskRequest { TaskType = SATELLITE_TASK };
|
||||
string itemTaskCode = await _farmmapsApiService.QueueTaskAsync(cropfieldItem.Code, taskmapRequest);
|
||||
|
||||
await PollTask(TimeSpan.FromSeconds(5), async (tokenSource) =>
|
||||
{
|
||||
var itemTaskStatus = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, itemTaskCode);
|
||||
_logger.LogInformation($"Waiting on satellite data; status: {itemTaskStatus.State}");
|
||||
if (itemTaskStatus.IsFinished)
|
||||
tokenSource.Cancel();
|
||||
|
||||
});
|
||||
|
||||
var itemTask = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, itemTaskCode);
|
||||
|
||||
if (itemTask.State == ItemTaskState.Error)
|
||||
{
|
||||
_logger.LogError($"Something went wrong when trying to process satellite data; {itemTask.Message}");
|
||||
|
||||
}
|
||||
|
||||
return itemTask.Code;
|
||||
}
|
||||
|
||||
|
||||
public async Task<Item> FindSatelliteItems(Item cropfieldItem, string satelliteTaskCode)
|
||||
{
|
||||
|
||||
var taskStatus = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, satelliteTaskCode);
|
||||
|
||||
|
||||
// find ndvi or wdvi satellite data geotiffs
|
||||
var temporalItem = await FindChildItemAsync(cropfieldItem.Code, TEMPORAL_ITEMTYPE,
|
||||
"Cropfield Satellite items", 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");
|
||||
|
||||
}
|
||||
|
||||
var satelliteTiffs = await _farmmapsApiService.GetItemChildrenAsync(temporalItem.Code);
|
||||
var firstSatelliteItem = satelliteTiffs.FirstOrDefault();
|
||||
|
||||
if (firstSatelliteItem == null)
|
||||
{
|
||||
_logger.LogError("Satellite item not found");
|
||||
|
||||
}
|
||||
|
||||
return firstSatelliteItem;
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
@ -13,5 +13,8 @@ namespace FarmmapsNbs.Models
|
||||
public string PotatoPurposeType { get; set; }
|
||||
public int TargetYield { get; set; }
|
||||
public JObject GeometryJson { get; set; }
|
||||
public string InputLayerName { get; set; }
|
||||
|
||||
|
||||
}
|
||||
}
|
8
FarmmapsNbs/Models/Settings.cs
Normal file
8
FarmmapsNbs/Models/Settings.cs
Normal file
@ -0,0 +1,8 @@
|
||||
namespace FarmmapsNbs.Models
|
||||
{
|
||||
public class Settings
|
||||
{
|
||||
public string CropfieldItemCode { get; set; }
|
||||
public string SatelliteTaskCode { get; set; }
|
||||
}
|
||||
}
|
@ -9,6 +9,7 @@ using FarmmapsApi.Services;
|
||||
using FarmmapsNbs.Models;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using static FarmmapsApiSamples.Constants;
|
||||
|
||||
namespace FarmmapsNbs
|
||||
@ -16,12 +17,15 @@ namespace FarmmapsNbs
|
||||
public class NbsApplication : IApplication
|
||||
{
|
||||
private const string DownloadFolder = "Downloads";
|
||||
private const string SettingsFile = "settings.json";
|
||||
|
||||
private readonly ILogger<NbsApplication> _logger;
|
||||
private readonly FarmmapsApiService _farmmapsApiService;
|
||||
private readonly NitrogenService _nitrogenService;
|
||||
private readonly GeneralService _generalService;
|
||||
|
||||
private Settings _settings;
|
||||
|
||||
public NbsApplication(ILogger<NbsApplication> logger, FarmmapsApiService farmmapsApiService,
|
||||
GeneralService generalService, NitrogenService nitrogenService)
|
||||
{
|
||||
@ -40,6 +44,10 @@ namespace FarmmapsNbs
|
||||
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();
|
||||
@ -59,6 +67,8 @@ namespace FarmmapsNbs
|
||||
|
||||
private async Task Process(List<UserRoot> roots, NitrogenInput input)
|
||||
{
|
||||
// specify if you are using an already created cropfield:
|
||||
bool useCreatedCropfield = false;
|
||||
var plantingDate = input.PlantingDate;
|
||||
var measurementDate = input.MeasurementDate;
|
||||
|
||||
@ -76,12 +86,66 @@ namespace FarmmapsNbs
|
||||
return;
|
||||
}
|
||||
|
||||
var cropfieldItem = await _generalService.CreateCropfieldItemAsync(myDriveRoot.Code,
|
||||
|
||||
// Use already created cropfield or create new one
|
||||
Item cropfieldItem;
|
||||
if (useCreatedCropfield == false || string.IsNullOrEmpty(_settings.CropfieldItemCode))
|
||||
{
|
||||
_logger.LogInformation("Creating cropfield");
|
||||
cropfieldItem = await _generalService.CreateCropfieldItemAsync(myDriveRoot.Code,
|
||||
$"VRA NBS cropfield {input.OutputFileName}", plantingDate.Year, input.GeometryJson.ToString(Formatting.None));
|
||||
_settings.CropfieldItemCode = cropfieldItem.Code;
|
||||
SaveSettings();
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.LogInformation("Cropfield already exists, trying to get it");
|
||||
cropfieldItem = await _farmmapsApiService.GetItemAsync(_settings.CropfieldItemCode);
|
||||
}
|
||||
|
||||
|
||||
|
||||
var geotiffItem = (Item)null;
|
||||
|
||||
if (input.File.Contains(".tif") || input.File.Contains(".geotiff")) {
|
||||
// No file input, use most recent satellite image
|
||||
if (string.IsNullOrEmpty(input.File))
|
||||
{
|
||||
_logger.LogInformation("No specific data given, retrieving most recent satellite image");
|
||||
|
||||
// check if satellite task not yet done, do here and save taskcode
|
||||
if (useCreatedCropfield == false || string.IsNullOrEmpty(_settings.SatelliteTaskCode))
|
||||
{
|
||||
var satelliteTaskCode = await _generalService.RunSatelliteTask(cropfieldItem);
|
||||
_settings.SatelliteTaskCode = satelliteTaskCode;
|
||||
SaveSettings();
|
||||
}
|
||||
|
||||
|
||||
// Find most recent satellite item
|
||||
Item recentSatalliteItem = await _generalService.FindSatelliteItems(cropfieldItem, _settings.SatelliteTaskCode);
|
||||
|
||||
|
||||
// must be ndvi[0] or wdvi[1]
|
||||
var inputType = (recentSatalliteItem.Data["layers"] as JArray)?[1]["name"].ToString();
|
||||
if (string.IsNullOrEmpty(inputType))
|
||||
{
|
||||
_logger.LogError("Could not get the input type name from the satellite item");
|
||||
return;
|
||||
}
|
||||
|
||||
// download the geotiff
|
||||
_logger.LogInformation("Downloading geotiff file");
|
||||
await _farmmapsApiService.DownloadItemAsync(recentSatalliteItem.Code,
|
||||
Path.Combine(DownloadFolder, $"nbs_inputSatelliteGeotiff_{input.OutputFileName}.zip"));
|
||||
|
||||
geotiffItem = recentSatalliteItem;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
// (geo)tiff input:
|
||||
else if (input.File.Contains(".tif") || input.File.Contains(".geotiff")) {
|
||||
_logger.LogInformation("input = tiff data");
|
||||
var dataPath = Path.Combine("Data", input.File);
|
||||
geotiffItem = await _generalService.UploadDataAsync(uploadedRoot, GEOTIFF_PROCESSED_ITEMTYPE, dataPath,
|
||||
@ -93,6 +157,7 @@ namespace FarmmapsNbs
|
||||
}
|
||||
}
|
||||
|
||||
// json/shape input
|
||||
else {
|
||||
var isGeoJson = input.File.Contains("json");
|
||||
var dataPath = Path.Combine("Data", input.File);
|
||||
@ -117,6 +182,12 @@ namespace FarmmapsNbs
|
||||
Path.Combine(DownloadFolder, $"{input.OutputFileName}.input_geotiff.zip"));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
_logger.LogInformation($"Calculating targetN with targetYield: {input.TargetYield}");
|
||||
var targetNItem = await _nitrogenService.CreateTargetNItem(cropfieldItem);
|
||||
var targetNData = await _nitrogenService.CalculateTargetN(cropfieldItem, targetNItem, plantingDate,
|
||||
@ -139,7 +210,7 @@ namespace FarmmapsNbs
|
||||
_logger.LogInformation("Calculating uptake map");
|
||||
var uptakeMapItem =
|
||||
await _nitrogenService.CalculateUptakeMap(cropfieldItem, geotiffItem, plantingDate,
|
||||
measurementDate, input.InputVariable);
|
||||
measurementDate, input.InputVariable, input.InputLayerName);
|
||||
if (uptakeMapItem == null)
|
||||
{
|
||||
_logger.LogError("Something went wrong with creating the uptakeMap");
|
||||
@ -189,5 +260,28 @@ namespace FarmmapsNbs
|
||||
|
||||
|
||||
}
|
||||
|
||||
// Functions to save previously created cropfields
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
@ -1,17 +1,71 @@
|
||||
[
|
||||
{
|
||||
"file": "",
|
||||
"inputVariable": "WDVI",
|
||||
"inputlayerName": "wdvi",
|
||||
"outputFileName": "vranbs_satellite",
|
||||
"plantingDate": "2019-04-18",
|
||||
"measurementDate": "2019-06-05",
|
||||
"potatoPurposeType": "consumption",
|
||||
"targetYield": 45,
|
||||
"geometryJson": {
|
||||
"type": "Polygon",
|
||||
"coordinates": [
|
||||
[
|
||||
[ 5.66886041703652044, 52.52929999060298627 ],
|
||||
[ 5.6716230923214912, 52.52946316399909676 ],
|
||||
[ 5.67185376229668581, 52.5280565894154563 ],
|
||||
[ 5.66903207841337231, 52.52790646510525363 ],
|
||||
[ 5.66886041703652044, 52.52929999060298627 ]
|
||||
]
|
||||
]
|
||||
}
|
||||
}
|
||||
,
|
||||
{
|
||||
"file": "Scan_1_20190605.json",
|
||||
"inputVariable": "irmi",
|
||||
"inputlayerName": "IRMI",
|
||||
"outputFileName": "vranbs1",
|
||||
"plantingDate": "2019-04-18",
|
||||
"measurementDate": "2019-06-05",
|
||||
"potatoPurposeType": "consumption",
|
||||
"targetYield": 45,
|
||||
"geometryJson": { "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 ] ] ] }
|
||||
},
|
||||
"geometryJson": {
|
||||
"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 ]
|
||||
]
|
||||
]
|
||||
}
|
||||
}
|
||||
,
|
||||
{
|
||||
"file": "Scan_1_20190605.zip",
|
||||
"inputVariable": "irmi",
|
||||
"inputlayerName": "IRMI",
|
||||
"outputFileName": "vranbs2",
|
||||
"plantingDate": "2019-04-18",
|
||||
"measurementDate": "2019-06-05",
|
||||
@ -50,6 +104,7 @@
|
||||
{
|
||||
"file": "Scan_1_20190605.zip",
|
||||
"inputVariable": "irmi",
|
||||
"inputlayerName": "IRMI",
|
||||
"outputFileName": "vranbs3",
|
||||
"plantingDate": "2019-04-18",
|
||||
"measurementDate": "2019-06-20",
|
||||
@ -88,6 +143,7 @@
|
||||
{
|
||||
"file": "Scan_1_20190605.zip",
|
||||
"inputVariable": "irmi",
|
||||
"inputlayerName": "IRMI",
|
||||
"outputFileName": "vranbs4",
|
||||
"plantingDate": "2019-04-18",
|
||||
"measurementDate": "2019-07-03",
|
||||
|
@ -84,7 +84,7 @@ namespace FarmmapsNbs
|
||||
/// <param name="measurementDate">The date the measurements are taken</param>
|
||||
/// <returns></returns>
|
||||
public async Task<Item> CalculateUptakeMap(Item cropfieldItem, Item inputItem, DateTime plantingDate,
|
||||
DateTime measurementDate, string inputType)
|
||||
DateTime measurementDate, string inputType, string inputLayerName)
|
||||
{
|
||||
var nbsUptakeMapRequest = new TaskRequest {TaskType = VRANBS_TASK};
|
||||
nbsUptakeMapRequest.attributes["operation"] = "uptake";
|
||||
@ -92,7 +92,7 @@ namespace FarmmapsNbs
|
||||
nbsUptakeMapRequest.attributes["plantingDate"] = plantingDate.ToString("o");
|
||||
nbsUptakeMapRequest.attributes["measurementDate"] = measurementDate.ToString("o");
|
||||
nbsUptakeMapRequest.attributes["inputType"] = inputType.ToLower();
|
||||
nbsUptakeMapRequest.attributes["inputLayerName"] = "IRMI"; //toevoeging FS. Kolom IRMI hernoemd als IMI. Deze wordt niet automatisch herkend. En moet dus gespecificeerd worden.
|
||||
nbsUptakeMapRequest.attributes["inputLayerName"] = inputLayerName; //toevoeging FS. Kolom IRMI hernoemd als IMI. Deze wordt niet automatisch herkend. En moet dus gespecificeerd worden.
|
||||
|
||||
//var layers = inputItem.Data["layers"]; //toevoeging FS, check welke data lagen worden omgezet
|
||||
//_logger.LogInformation($"DataLayers: {layers}"); //toevoeging FS check welke data lagen worden omgezet
|
||||
|
Loading…
Reference in New Issue
Block a user