FarmMaps/FarmMapsApiClient
11
0
Fork 3
Code Issues Pull Requests Releases Activity

master #8

Closed
jits wants to merge 5 commits from (deleted):master into master
pull from: (deleted):master
merge into: FarmMaps:master
Conversation 0 Commits 5 Files Changed 6 +244 -211
4 changed files with 244 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b47c9880f2 - Show all commits

23
FarmmapsApi/Services/GeneralService.cs
View File

@ -299,7 +299,7 @@ namespace FarmmapsApi.Services
}
public async Task<Item> FindSatelliteItems(Item cropfieldItem, string satelliteTaskCode)
public async Task<Item> FindSatelliteItem(Item cropfieldItem, string satelliteTaskCode)
{
var taskStatus = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, satelliteTaskCode);
@ -311,6 +311,7 @@ namespace FarmmapsApi.Services
taskStatus.Finished >= item.Created &&
taskStatus.Finished <= item.Created.Value.AddHours(1));
if (temporalItem == null)
{
_logger.LogError("Temporal item not found");
@ -318,15 +319,29 @@ namespace FarmmapsApi.Services
}
var satelliteTiffs = await _farmmapsApiService.GetItemChildrenAsync(temporalItem.Code);
var firstSatelliteItem = satelliteTiffs.FirstOrDefault();
if (firstSatelliteItem == null)
_logger.LogInformation("Available satellite images:");
var count = 0;
TimeSpan.FromSeconds(0.5);
foreach (var item in satelliteTiffs)
{
Console.WriteLine($"Satellite image #{count}: {item.DataDate}");
count++;
}
_logger.LogInformation("Enter satellite image number for NBS application");
int elment = Int32.Parse(Console.ReadLine());
var selectedSatelliteItem = satelliteTiffs[elment];
if (selectedSatelliteItem == null)
{
_logger.LogError("Satellite item not found");
}
return firstSatelliteItem;
return selectedSatelliteItem;

55
FarmmapsNbs/NbsApplication.cs
View File

@ -67,7 +67,7 @@ namespace FarmmapsNbs
private async Task Process(List<UserRoot> roots, NitrogenInput input)
{
// specify if you are using an already created cropfield:
// !!specify if you are using an already created cropfield:
bool useCreatedCropfield = false;
var plantingDate = input.PlantingDate;
var measurementDate = input.MeasurementDate;
@ -121,12 +121,12 @@ namespace FarmmapsNbs
}
// Find most recent satellite item
Item recentSatalliteItem = await _generalService.FindSatelliteItems(cropfieldItem, _settings.SatelliteTaskCode);
// Select a particular satellite item from satelliteTask
Item satalliteItem = await _generalService.FindSatelliteItem(cropfieldItem, _settings.SatelliteTaskCode);
// must be ndvi[0] or wdvi[1]
var inputType = (recentSatalliteItem.Data["layers"] as JArray)?[1]["name"].ToString();
// must be wdvi[1]
var inputType = (satalliteItem.Data["layers"] as JArray)?[1]["name"].ToString();
if (string.IsNullOrEmpty(inputType))
{
_logger.LogError("Could not get the input type name from the satellite item");
@ -135,10 +135,14 @@ namespace FarmmapsNbs
// download the geotiff
_logger.LogInformation("Downloading geotiff file");
await _farmmapsApiService.DownloadItemAsync(recentSatalliteItem.Code,
await _farmmapsApiService.DownloadItemAsync(satalliteItem.Code,
Path.Combine(DownloadFolder, $"nbs_inputSatelliteGeotiff_{input.OutputFileName}.zip"));
geotiffItem = recentSatalliteItem;
// overwrite measurement date by date of satellite item
measurementDate = satalliteItem.DataDate.Value;
geotiffItem = satalliteItem;
}
@ -225,8 +229,7 @@ namespace FarmmapsNbs
_logger.LogInformation("Calculating application map");
var applicationMapItem =
await _nitrogenService.CalculateApplicationMap(cropfieldItem, geotiffItem, plantingDate,
measurementDate,
input.InputVariable, targetNData.TargetN);
measurementDate, input.InputVariable, targetNData.TargetN, input.InputLayerName);
if (applicationMapItem == null)
{
@ -238,25 +241,25 @@ namespace FarmmapsNbs
Path.Combine(DownloadFolder, $"{input.OutputFileName}.application.zip"));
_logger.LogInformation("Application map can be found in {0}", Path.Combine(DownloadFolder, $"{input.OutputFileName}.application.zip"));
//transforming tiff to shape
var tiffItem = applicationMapItem;
// //transforming tiff to shape
// var tiffItem = applicationMapItem;
if (tiffItem == null)
{
_logger.LogError("Could not find item for uploaded data");
return;
}
_logger.LogInformation($"Converting geotiff to shape");
var taskmap = await _generalService.GeotiffToShape(tiffItem);
if (taskmap == null)
{
_logger.LogError("Something went wrong with geotiff to shape transformation");
return;
}
// if (tiffItem == null)
// {
// _logger.LogError("Could not find item for uploaded data");
// return;
// }
// _logger.LogInformation($"Converting geotiff to shape");
// var taskmap = await _generalService.GeotiffToShape(tiffItem);
// if (taskmap == null)
// {
// _logger.LogError("Something went wrong with geotiff to shape transformation");
// return;
// }
_logger.LogInformation("Downloading taskmap");
await _farmmapsApiService.DownloadItemAsync(taskmap.Code,
Path.Combine(DownloadFolder, $"{input.OutputFileName}.taskmap.zip"));
// _logger.LogInformation("Downloading taskmap");
// await _farmmapsApiService.DownloadItemAsync(taskmap.Code,
// Path.Combine(DownloadFolder, $"{input.OutputFileName}.taskmap.zip"));
}

353
FarmmapsNbs/NitrogenInput.json
View File

@ -1,182 +1,195 @@
[
//{
// "file": "", // keep emptpy to use satellite image
// "inputVariable": "wdvi",
// "InputLayerName": "wdvi",
// "outputFileName": "rtest1",
// "plantingDate": "2020-05-01",
// "measurementDate": "2020-06-14",
// "potatoPurposeType": "consumption",
// "targetYield": 60,
// "geometryJson": {
// "type": "Polygon",
// "coordinates": [
// [
// [ 4.960707146896585, 52.800583669708487 ],
// [ 4.960645975538824, 52.800470217610922 ],
// [ 4.962140695752897, 52.799177147194797 ],
// [ 4.967523821195745, 52.801502400041208 ],
// [ 4.966336768950911, 52.802543735879809 ],
// [ 4.961711880764330, 52.801009996856429 ],
// [ 4.960707146896585, 52.800583669708487 ]
// ]
// ]
// }
//}
//,
{
"file": "",
"inputVariable": "WDVI",
"inputlayerName": "wdvi",
"outputFileName": "vranbs_satellite",
"plantingDate": "2019-04-18",
"measurementDate": "2019-06-05",
"file": "", // keep emptpy to use satellite image
"inputVariable": "wdvi",
"InputLayerName": "wdvi",
"outputFileName": "mtest1",
"plantingDate": "2020-04-01",
"measurementDate": "2020-06-24",
"potatoPurposeType": "consumption",
"targetYield": 45,
"targetYield": 60,
"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 ]
]
]
}
}
,
{
"file": "Scan_1_20190605.zip",
"inputVariable": "irmi",
"inputlayerName": "IRMI",
"outputFileName": "vranbs2",
"plantingDate": "2019-04-18",
"measurementDate": "2019-06-05",
"potatoPurposeType": "starch",
"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 ]
]
]
}
},
{
"file": "Scan_1_20190605.zip",
"inputVariable": "irmi",
"inputlayerName": "IRMI",
"outputFileName": "vranbs3",
"plantingDate": "2019-04-18",
"measurementDate": "2019-06-20",
"potatoPurposeType": "starch",
"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 ]
]
]
}
},
{
"file": "Scan_1_20190605.zip",
"inputVariable": "irmi",
"inputlayerName": "IRMI",
"outputFileName": "vranbs4",
"plantingDate": "2019-04-18",
"measurementDate": "2019-07-03",
"potatoPurposeType": "starch",
"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 ]
[ 3.575458869234128, 51.308707885669762 ],
[ 3.575508957999423, 51.30878478562019 ],
[ 3.576188404403633, 51.309372997559777 ],
[ 3.576188872410267, 51.309374219701091 ],
[ 3.576210290749152, 51.309430091473608 ],
[ 3.57621266537704, 51.309483685674898 ],
[ 3.576213477455834, 51.309502027981374 ],
[ 3.577543136860447, 51.310682367527122 ],
[ 3.57796629328866, 51.31104321405175 ],
[ 3.578442479292087, 51.311449273042747 ],
[ 3.57866702353106, 51.311636072786726 ],
[ 3.57880446997978, 51.31157117599529 ],
[ 3.579155910205885, 51.311863542729718 ],
[ 3.579175814007489, 51.311875435159394 ],
[ 3.579293885246395, 51.311936532835396 ],
[ 3.579413896180069, 51.311998649478575 ],
[ 3.579514543462617, 51.312041110734917 ],
[ 3.579611760655688, 51.312082118352606 ],
[ 3.579635115371588, 51.312093949652223 ],
[ 3.579793143414486, 51.312189437140432 ],
[ 3.579966991648108, 51.312286148850511 ],
[ 3.580079704980967, 51.312332458349751 ],
[ 3.580203717638148, 51.312336471368539 ],
[ 3.580307101018293, 51.312330239539847 ],
[ 3.580383836270609, 51.312317097185243 ],
[ 3.580505207977176, 51.312279163554869 ],
[ 3.580610387713855, 51.312233723091026 ],
[ 3.5806309754483, 51.312226093729677 ],
[ 3.580638516049738, 51.312223727082049 ],
[ 3.58075536599681, 51.312186990706344 ],
[ 3.580787745633303, 51.312176820129551 ],
[ 3.580829682241423, 51.312167665428959 ],
[ 3.58086828456562, 51.312162614898625 ],
[ 3.580980493636721, 51.312147935609723 ],
[ 3.581014352632766, 51.312145662592656 ],
[ 3.581028980583245, 51.312145592849248 ],
[ 3.581119189823368, 51.312145103215911 ],
[ 3.581195330198145, 51.312144693075908 ],
[ 3.581243537809229, 51.312148741603245 ],
[ 3.58132480221972, 51.312163110548383 ],
[ 3.581426517039001, 51.312181089466016 ],
[ 3.581448095953263, 51.312184910295024 ],
[ 3.581474337475052, 51.312191038736145 ],
[ 3.581709405982819, 51.312260068944951 ],
[ 3.581727319558337, 51.312266163697757 ],
[ 3.581753583356718, 51.312276407881612 ],
[ 3.581841655772683, 51.312310743468075 ],
[ 3.581878851795624, 51.312325234405343 ],
[ 3.581905889860924, 51.312338260798654 ],
[ 3.581906254501594, 51.312338472113815 ],
[ 3.582048236499295, 51.312422439022804 ],
[ 3.58189849928915, 51.312481944577037 ],
[ 3.583044298383354, 51.312095780444281 ],
[ 3.582984006671231, 51.312017283925279 ],
[ 3.582743535862999, 51.311699343434064 ],
[ 3.582628599916243, 51.311582190756774 ],
[ 3.581446834435509, 51.310511259982569 ],
[ 3.580621864908701, 51.309767270412806 ],
[ 3.579610575760466, 51.308860440593946 ],
[ 3.579112608916012, 51.308394999612226 ],
[ 3.578688808506157, 51.307968441218165 ],
[ 3.578394256007207, 51.307644098092617 ],
[ 3.578355980318371, 51.307607614964702 ],
[ 3.578217977585775, 51.307654179547846 ],
[ 3.577480636332469, 51.307921035607997 ],
[ 3.575695560441006, 51.308577167973212 ],
[ 3.575668643609169, 51.30855384769157 ],
[ 3.575666204524265, 51.308551734020703 ],
[ 3.575506397192348, 51.308609906947261 ],
[ 3.575459139533024, 51.308653178431456 ],
[ 3.575458869234128, 51.308707885669762 ]
]
]
}
}
//,
//{
// "file": "Scan_1_20190605.zip",
// "inputVariable": "irmi",
// "InputLayerName": "IRMI",
// "outputFileName": "vranbs3",
// "plantingDate": "2019-04-18",
// "measurementDate": "2019-06-20",
// "potatoPurposeType": "starch",
// "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 ]
// ]
// ]
// }
//}
//,
//{
// "file": "Scan_1_20190605.zip",
// "inputVariable": "irmi",
// "InputLayerName": "",
// "outputFileName": "vranbs4",
// "plantingDate": "2019-04-18",
// "measurementDate": "2019-07-03",
// "potatoPurposeType": "starch",
// "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 ]
// ]
// ]
// }
//}
]

12
FarmmapsNbs/NitrogenService.cs
View File

@ -82,6 +82,8 @@ namespace FarmmapsNbs
/// <param name="inputItem"></param>
/// <param name="plantingDate">The date the crop is planted</param>
/// <param name="measurementDate">The date the measurements are taken</param>
/// <param name="inputType">Data type, could be yara, ci, irmi or wdvi</param>
/// <param name="inputLayerName">Column name in which the sensor value is stored</param>
/// <returns></returns>
public async Task<Item> CalculateUptakeMap(Item cropfieldItem, Item inputItem, DateTime plantingDate,
DateTime measurementDate, string inputType, string inputLayerName)
@ -92,10 +94,9 @@ namespace FarmmapsNbs
nbsUptakeMapRequest.attributes["plantingDate"] = plantingDate.ToString("o");
nbsUptakeMapRequest.attributes["measurementDate"] = measurementDate.ToString("o");
nbsUptakeMapRequest.attributes["inputType"] = inputType.ToLower();
nbsUptakeMapRequest.attributes["inputLayerName"] = inputLayerName; //toevoeging FS. Kolom IRMI hernoemd als IMI. Deze wordt niet automatisch herkend. En moet dus gespecificeerd worden.
if (!(string.IsNullOrEmpty(inputLayerName))) 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
string itemTaskCode = await _farmmapsApiService.QueueTaskAsync(cropfieldItem.Code, nbsUptakeMapRequest);
@ -136,11 +137,11 @@ namespace FarmmapsNbs
/// <param name="inputItem">The farmmaps item containing the geotiff data</param>
/// <param name="plantingDate">The date the crop is planted</param>
/// <param name="measurementDate">The date the measurements are taken</param>
/// <param name="inputType">The inputtype to use</param>
/// <param name="inputType">The inputtype to use, could be yara, ci, irmi or wdvi</param>
/// <param name="targetN">The target nitrogen to use for the calculations</param>
/// <returns></returns>
public async Task<Item> CalculateApplicationMap(Item cropfieldItem, Item inputItem, DateTime plantingDate,
DateTime measurementDate, string inputType, double targetN)
DateTime measurementDate, string inputType, double targetN, string inputLayerName)
{
var nbsApplicationMapRequest = new TaskRequest {TaskType = VRANBS_TASK};
nbsApplicationMapRequest.attributes["operation"] = "application";
@ -150,6 +151,7 @@ namespace FarmmapsNbs
nbsApplicationMapRequest.attributes["inputCode"] = inputItem.Code;
nbsApplicationMapRequest.attributes["inputType"] = inputType.ToLower();
nbsApplicationMapRequest.attributes["targetN"] = targetN.ToString(CultureInfo.InvariantCulture);
if (!(string.IsNullOrEmpty(inputLayerName))) nbsApplicationMapRequest.attributes["inputLayerName"] = inputLayerName;
string itemTaskCode = await _farmmapsApiService.QueueTaskAsync(cropfieldItem.Code, nbsApplicationMapRequest);