added vrapoten and changed some nbs stuff
This commit is contained in:
parent
bbf2db0040
commit
7005269701
@ -14,6 +14,13 @@ namespace FarmmapsApiSamples
|
|||||||
public const string VRANBS_TASK = "vnd.farmmaps.task.vranbs";
|
public const string VRANBS_TASK = "vnd.farmmaps.task.vranbs";
|
||||||
public const string VRAHERBICIDE_TASK = "vnd.farmmaps.task.vraherbicide";
|
public const string VRAHERBICIDE_TASK = "vnd.farmmaps.task.vraherbicide";
|
||||||
public const string VRAHAULMKILLING_TASK = "vnd.farmmaps.task.vrahaulmkilling";
|
public const string VRAHAULMKILLING_TASK = "vnd.farmmaps.task.vrahaulmkilling";
|
||||||
|
public const string VRAPLANTING_TASK = "vnd.farmmaps.task.vrapoten";
|
||||||
public const string SATELLITE_TASK = "vnd.farmmaps.task.satellite";
|
public const string SATELLITE_TASK = "vnd.farmmaps.task.satellite";
|
||||||
|
public const string TASKMAP_TASK = "vnd.farmmaps.task.taskmap";
|
||||||
|
public const string WORKFLOW_TASK = "vnd.farmmaps.task.workflow";
|
||||||
|
public const string BOFEK_TASK = "vnd.farmmaps.task.bofek";
|
||||||
|
public const string SHADOW_TASK = "vnd.farmmaps.task.shadow";
|
||||||
|
public const string AHN_TASK = "vnd.farmmaps.task.ahn";
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -23,7 +23,8 @@ namespace FarmmapsApi.Services
|
|||||||
_farmmapsApiService = farmmapsApiService;
|
_farmmapsApiService = farmmapsApiService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<Item> CreateCropfieldItemAsync(string parentItemCode, string name, int year, string fieldGeomJson)
|
public async Task<Item> CreateCropfieldItemAsync(string parentItemCode, string name, int year,
|
||||||
|
string fieldGeomJson)
|
||||||
{
|
{
|
||||||
var currentYear = new DateTime(year, 1, 1);
|
var currentYear = new DateTime(year, 1, 1);
|
||||||
var cropfieldItemRequest = new ItemRequest()
|
var cropfieldItemRequest = new ItemRequest()
|
||||||
@ -102,6 +103,42 @@ namespace FarmmapsApi.Services
|
|||||||
return await _farmmapsApiService.GetItemAsync(shapeItem.ParentCode);
|
return await _farmmapsApiService.GetItemAsync(shapeItem.ParentCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public async Task<Item> GeotiffToShape(Item tiffItem)
|
||||||
|
{
|
||||||
|
var taskmapRequest = new TaskRequest {TaskType = TASKMAP_TASK};
|
||||||
|
|
||||||
|
string itemTaskCode = await _farmmapsApiService.QueueTaskAsync(tiffItem.Code, taskmapRequest);
|
||||||
|
|
||||||
|
await PollTask(TimeSpan.FromSeconds(5), async (tokenSource) =>
|
||||||
|
{
|
||||||
|
var itemTaskStatus = await _farmmapsApiService.GetTaskStatusAsync(tiffItem.Code, itemTaskCode);
|
||||||
|
_logger.LogInformation($"Waiting on converting geotiff to shape; status: {itemTaskStatus.State}");
|
||||||
|
if (itemTaskStatus.IsFinished)
|
||||||
|
tokenSource.Cancel();
|
||||||
|
});
|
||||||
|
|
||||||
|
var itemTask = await _farmmapsApiService.GetTaskStatusAsync(tiffItem.Code, itemTaskCode);
|
||||||
|
if (itemTask.State == ItemTaskState.Error)
|
||||||
|
{
|
||||||
|
_logger.LogError($"Something went wrong with task execution: {itemTask.Message}");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
//the taskmap is a child of the input tiff
|
||||||
|
var itemName = "Taskmap";
|
||||||
|
var taskMapItem = await FindChildItemAsync(tiffItem.Code,
|
||||||
|
SHAPE_PROCESSED_ITEMTYPE, itemName);
|
||||||
|
if (taskMapItem == null)
|
||||||
|
{
|
||||||
|
_logger.LogError("Could not find the shape taskmap as a child item under the input");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return taskMapItem;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public async Task<ItemTaskStatus> RunAndWaitForTask(Item subjectItem, string taskIdentifier,
|
public async Task<ItemTaskStatus> RunAndWaitForTask(Item subjectItem, string taskIdentifier,
|
||||||
Action<TaskRequest> configureCallback = null, int retrySeconds = 3)
|
Action<TaskRequest> configureCallback = null, int retrySeconds = 3)
|
||||||
{
|
{
|
||||||
@ -158,5 +195,107 @@ namespace FarmmapsApi.Services
|
|||||||
_logger.LogInformation($"Found {containsName} item");
|
_logger.LogInformation($"Found {containsName} item");
|
||||||
return dataItem;
|
return dataItem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<Item> RunBofekTask(Item cropfieldItem)
|
||||||
|
{
|
||||||
|
var taskmapRequest = new TaskRequest {TaskType = BOFEK_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 retreiving BOFEK 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 with task execution: {itemTask.Message}");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
//the BOFEK data is a child of the cropfield
|
||||||
|
var itemName = "bofek";
|
||||||
|
var bofekItem = await FindChildItemAsync(cropfieldItem.Code,
|
||||||
|
SHAPE_PROCESSED_ITEMTYPE, itemName);
|
||||||
|
if (bofekItem == null)
|
||||||
|
{
|
||||||
|
_logger.LogError("Could not find the BOFEK data as a child item under the cropfield");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return bofekItem;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Item> RunAhnTask(Item cropfieldItem)
|
||||||
|
{
|
||||||
|
var taskmapRequest = new TaskRequest {TaskType = AHN_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 retreiving AHN 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 with task execution: {itemTask.Message}");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
//the AHN data is a child of the cropfield
|
||||||
|
var itemName = "ahn";
|
||||||
|
var ahnItem = await FindChildItemAsync(cropfieldItem.Code,
|
||||||
|
GEOTIFF_PROCESSED_ITEMTYPE, itemName);
|
||||||
|
if (ahnItem == null)
|
||||||
|
{
|
||||||
|
_logger.LogError("Could not find the AHN data as a child item under the cropfield");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ahnItem;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Item> RunShadowTask(Item cropfieldItem)
|
||||||
|
{
|
||||||
|
var taskmapRequest = new TaskRequest {TaskType = SHADOW_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 calculation shadow 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 with task execution: {itemTask.Message}");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
//the shadow data is a child of the cropfield
|
||||||
|
var itemName = "shadow";
|
||||||
|
var shadowItem = await FindChildItemAsync(cropfieldItem.Code,
|
||||||
|
GEOTIFF_PROCESSED_ITEMTYPE, itemName);
|
||||||
|
if (shadowItem == null)
|
||||||
|
{
|
||||||
|
_logger.LogError("Could not find the shadow data as a child item under the cropfield");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return shadowItem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,19 +1,23 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
#
|
# Visual Studio Version 16
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FarmmapsNbs", "FarmmapsNbs\FarmmapsNbs.csproj", "{E08EF7E9-F09E-42D8-825C-164E458C78F4}"
|
VisualStudioVersion = 16.0.30320.27
|
||||||
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FarmmapsNbs", "FarmmapsNbs\FarmmapsNbs.csproj", "{E08EF7E9-F09E-42D8-825C-164E458C78F4}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FarmmapsApi", "FarmmapsApi\FarmmapsApi.csproj", "{1FA9E50B-F45E-4534-953A-37C783D03C74}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FarmmapsApi", "FarmmapsApi\FarmmapsApi.csproj", "{1FA9E50B-F45E-4534-953A-37C783D03C74}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "General", "General", "{6FA66E07-A59E-480E-B5D1-DBEFC4E4583D}"
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "General", "General", "{6FA66E07-A59E-480E-B5D1-DBEFC4E4583D}"
|
||||||
ProjectSection(SolutionItems) = preProject
|
ProjectSection(SolutionItems) = preProject
|
||||||
README.MD = README.MD
|
|
||||||
.gitignore = .gitignore
|
.gitignore = .gitignore
|
||||||
|
README.MD = README.MD
|
||||||
EndProjectSection
|
EndProjectSection
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FarmmapsHerbicide", "FarmmapsHerbicide\FarmmapsHerbicide.csproj", "{731A88CD-9DC4-4969-86F2-2315830A6998}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FarmmapsHerbicide", "FarmmapsHerbicide\FarmmapsHerbicide.csproj", "{731A88CD-9DC4-4969-86F2-2315830A6998}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FarmmapsHaulmkilling", "FarmmapsHaulmkilling\FarmmapsHaulmkilling.csproj", "{DFA89D0B-5400-4374-B824-8367B76B4B6E}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FarmmapsHaulmkilling", "FarmmapsHaulmkilling\FarmmapsHaulmkilling.csproj", "{DFA89D0B-5400-4374-B824-8367B76B4B6E}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FarmmapsPoten", "FarmmapsPoten\FarmmapsPoten.csproj", "{AAFAB03A-6F5C-4D91-991F-867B7898F981}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
@ -37,5 +41,15 @@ Global
|
|||||||
{DFA89D0B-5400-4374-B824-8367B76B4B6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{DFA89D0B-5400-4374-B824-8367B76B4B6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{DFA89D0B-5400-4374-B824-8367B76B4B6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{DFA89D0B-5400-4374-B824-8367B76B4B6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{DFA89D0B-5400-4374-B824-8367B76B4B6E}.Release|Any CPU.Build.0 = Release|Any CPU
|
{DFA89D0B-5400-4374-B824-8367B76B4B6E}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{AAFAB03A-6F5C-4D91-991F-867B7898F981}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{AAFAB03A-6F5C-4D91-991F-867B7898F981}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{AAFAB03A-6F5C-4D91-991F-867B7898F981}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{AAFAB03A-6F5C-4D91-991F-867B7898F981}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
|
HideSolutionNode = FALSE
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
|
SolutionGuid = {88AA58C4-40E6-4FC6-B501-6557C7E9DA81}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
10
FarmmapsNbs/FarmmapsNbs.csproj.user
Normal file
10
FarmmapsNbs/FarmmapsNbs.csproj.user
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ShowAllFiles>false</ShowAllFiles>
|
||||||
|
<ActiveDebugProfile>FarmmapsNbs</ActiveDebugProfile>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||||
|
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
|
||||||
|
</PropertyGroup>
|
||||||
|
</Project>
|
@ -34,6 +34,7 @@ namespace FarmmapsNbs
|
|||||||
public async Task RunAsync()
|
public async Task RunAsync()
|
||||||
{
|
{
|
||||||
var nitrogenInputJson = File.ReadAllText("NitrogenInput.json");
|
var nitrogenInputJson = File.ReadAllText("NitrogenInput.json");
|
||||||
|
//var nitrogenInputJson = File.ReadAllText("fivefieldsinput.json");
|
||||||
List<NitrogenInput> nitrogenInputs = JsonConvert.DeserializeObject<List<NitrogenInput>>(nitrogenInputJson);
|
List<NitrogenInput> nitrogenInputs = JsonConvert.DeserializeObject<List<NitrogenInput>>(nitrogenInputJson);
|
||||||
|
|
||||||
if (!Directory.Exists(DownloadFolder))
|
if (!Directory.Exists(DownloadFolder))
|
||||||
@ -75,6 +76,7 @@ namespace FarmmapsNbs
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
var cropfieldItem = await _generalService.CreateCropfieldItemAsync(myDriveRoot.Code,
|
var cropfieldItem = await _generalService.CreateCropfieldItemAsync(myDriveRoot.Code,
|
||||||
$"VRA NBS cropfield {input.OutputFileName}", plantingDate.Year, input.GeometryJson.ToString(Formatting.None));
|
$"VRA NBS cropfield {input.OutputFileName}", plantingDate.Year, input.GeometryJson.ToString(Formatting.None));
|
||||||
|
|
||||||
@ -98,6 +100,11 @@ namespace FarmmapsNbs
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_logger.LogInformation("Downloading geotiff file");
|
||||||
|
await _farmmapsApiService.DownloadItemAsync(geotiffItem.Code,
|
||||||
|
Path.Combine(DownloadFolder, $"{input.OutputFileName}.input_geotiff.zip"));
|
||||||
|
|
||||||
|
|
||||||
_logger.LogInformation($"Calculating targetN with targetYield: {input.TargetYield}");
|
_logger.LogInformation($"Calculating targetN with targetYield: {input.TargetYield}");
|
||||||
var targetNItem = await _nitrogenService.CreateTargetNItem(cropfieldItem);
|
var targetNItem = await _nitrogenService.CreateTargetNItem(cropfieldItem);
|
||||||
var targetNData = await _nitrogenService.CalculateTargetN(cropfieldItem, targetNItem, plantingDate,
|
var targetNData = await _nitrogenService.CalculateTargetN(cropfieldItem, targetNItem, plantingDate,
|
||||||
@ -127,6 +134,7 @@ namespace FarmmapsNbs
|
|||||||
_logger.LogInformation("Downloading uptake map");
|
_logger.LogInformation("Downloading uptake map");
|
||||||
await _farmmapsApiService.DownloadItemAsync(uptakeMapItem.Code,
|
await _farmmapsApiService.DownloadItemAsync(uptakeMapItem.Code,
|
||||||
Path.Combine(DownloadFolder, $"{input.OutputFileName}.uptake.zip"));
|
Path.Combine(DownloadFolder, $"{input.OutputFileName}.uptake.zip"));
|
||||||
|
_logger.LogInformation("UptakeMap downloaded to {0}", Path.Combine(DownloadFolder, $"{input.OutputFileName}.uptake.zip"));
|
||||||
|
|
||||||
_logger.LogInformation("Calculating application map");
|
_logger.LogInformation("Calculating application map");
|
||||||
var applicationMapItem =
|
var applicationMapItem =
|
||||||
@ -142,6 +150,29 @@ namespace FarmmapsNbs
|
|||||||
_logger.LogInformation("Downloading application map");
|
_logger.LogInformation("Downloading application map");
|
||||||
await _farmmapsApiService.DownloadItemAsync(applicationMapItem.Code,
|
await _farmmapsApiService.DownloadItemAsync(applicationMapItem.Code,
|
||||||
Path.Combine(DownloadFolder, $"{input.OutputFileName}.application.zip"));
|
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;
|
||||||
|
|
||||||
|
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"));
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -51,8 +51,8 @@ namespace FarmmapsNbs
|
|||||||
var nbsTargetNRequest = new TaskRequest {TaskType = VRANBS_TASK};
|
var nbsTargetNRequest = new TaskRequest {TaskType = VRANBS_TASK};
|
||||||
nbsTargetNRequest.attributes["operation"] = "targetn";
|
nbsTargetNRequest.attributes["operation"] = "targetn";
|
||||||
nbsTargetNRequest.attributes["inputCode"] = targetNItem.Code;
|
nbsTargetNRequest.attributes["inputCode"] = targetNItem.Code;
|
||||||
nbsTargetNRequest.attributes["plantingDate"] = plantingDate.ToString();
|
nbsTargetNRequest.attributes["plantingDate"] = plantingDate.ToString("o");
|
||||||
nbsTargetNRequest.attributes["measurementDate"] = measurementDate.ToString();
|
nbsTargetNRequest.attributes["measurementDate"] = measurementDate.ToString("o");
|
||||||
nbsTargetNRequest.attributes["purposeType"] = purposeType.ToLower();
|
nbsTargetNRequest.attributes["purposeType"] = purposeType.ToLower();
|
||||||
nbsTargetNRequest.attributes["targetYield"] = targetYield.ToString();
|
nbsTargetNRequest.attributes["targetYield"] = targetYield.ToString();
|
||||||
string itemTaskCode = await _farmmapsApiService.QueueTaskAsync(cropfieldItem.Code, nbsTargetNRequest);
|
string itemTaskCode = await _farmmapsApiService.QueueTaskAsync(cropfieldItem.Code, nbsTargetNRequest);
|
||||||
@ -89,9 +89,14 @@ namespace FarmmapsNbs
|
|||||||
var nbsUptakeMapRequest = new TaskRequest {TaskType = VRANBS_TASK};
|
var nbsUptakeMapRequest = new TaskRequest {TaskType = VRANBS_TASK};
|
||||||
nbsUptakeMapRequest.attributes["operation"] = "uptake";
|
nbsUptakeMapRequest.attributes["operation"] = "uptake";
|
||||||
nbsUptakeMapRequest.attributes["inputCode"] = inputItem.Code;
|
nbsUptakeMapRequest.attributes["inputCode"] = inputItem.Code;
|
||||||
nbsUptakeMapRequest.attributes["plantingDate"] = plantingDate.ToString();
|
nbsUptakeMapRequest.attributes["plantingDate"] = plantingDate.ToString("o");
|
||||||
nbsUptakeMapRequest.attributes["measurementDate"] = measurementDate.ToString();
|
nbsUptakeMapRequest.attributes["measurementDate"] = measurementDate.ToString("o");
|
||||||
nbsUptakeMapRequest.attributes["inputType"] = inputType.ToLower();
|
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.
|
||||||
|
|
||||||
|
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);
|
string itemTaskCode = await _farmmapsApiService.QueueTaskAsync(cropfieldItem.Code, nbsUptakeMapRequest);
|
||||||
|
|
||||||
@ -140,8 +145,8 @@ namespace FarmmapsNbs
|
|||||||
var nbsApplicationMapRequest = new TaskRequest {TaskType = VRANBS_TASK};
|
var nbsApplicationMapRequest = new TaskRequest {TaskType = VRANBS_TASK};
|
||||||
nbsApplicationMapRequest.attributes["operation"] = "application";
|
nbsApplicationMapRequest.attributes["operation"] = "application";
|
||||||
nbsApplicationMapRequest.attributes["inputCode"] = inputItem.Code;
|
nbsApplicationMapRequest.attributes["inputCode"] = inputItem.Code;
|
||||||
nbsApplicationMapRequest.attributes["plantingDate"] = plantingDate.ToString();
|
nbsApplicationMapRequest.attributes["plantingDate"] = plantingDate.ToString("o");
|
||||||
nbsApplicationMapRequest.attributes["measurementDate"] = measurementDate.ToString();
|
nbsApplicationMapRequest.attributes["measurementDate"] = measurementDate.ToString("o");
|
||||||
nbsApplicationMapRequest.attributes["inputCode"] = inputItem.Code;
|
nbsApplicationMapRequest.attributes["inputCode"] = inputItem.Code;
|
||||||
nbsApplicationMapRequest.attributes["inputType"] = inputType.ToLower();
|
nbsApplicationMapRequest.attributes["inputType"] = inputType.ToLower();
|
||||||
nbsApplicationMapRequest.attributes["targetN"] = targetN.ToString(CultureInfo.InvariantCulture);
|
nbsApplicationMapRequest.attributes["targetN"] = targetN.ToString(CultureInfo.InvariantCulture);
|
||||||
@ -151,10 +156,13 @@ namespace FarmmapsNbs
|
|||||||
await PollTask(TimeSpan.FromSeconds(5), async (tokenSource) =>
|
await PollTask(TimeSpan.FromSeconds(5), async (tokenSource) =>
|
||||||
{
|
{
|
||||||
var itemTaskStatus = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, itemTaskCode);
|
var itemTaskStatus = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, itemTaskCode);
|
||||||
|
|
||||||
if (itemTaskStatus.IsFinished)
|
if (itemTaskStatus.IsFinished)
|
||||||
tokenSource.Cancel();
|
tokenSource.Cancel();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var itemTask = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, itemTaskCode);
|
var itemTask = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, itemTaskCode);
|
||||||
if(itemTask.State == ItemTaskState.Error)
|
if(itemTask.State == ItemTaskState.Error)
|
||||||
{
|
{
|
||||||
|
21
FarmmapsPoten/FarmmapsPoten.csproj
Normal file
21
FarmmapsPoten/FarmmapsPoten.csproj
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<None Update="appsettings.json">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
|
<None Update="Data\**\*">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\FarmmapsApi\FarmmapsApi.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
18
FarmmapsPoten/Models/PotenInput.cs
Normal file
18
FarmmapsPoten/Models/PotenInput.cs
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
using System;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
|
||||||
|
namespace FarmmapsPoten.Models
|
||||||
|
{
|
||||||
|
public class PotenInput
|
||||||
|
{
|
||||||
|
public bool UseShadow { get; set; }
|
||||||
|
|
||||||
|
public string File { get; set; }
|
||||||
|
public string OutputFileName { get; set; }
|
||||||
|
public string FieldName { get; set; }
|
||||||
|
public int PlantingYear { get; set; }
|
||||||
|
public string MeanDensity { get; set; }
|
||||||
|
public string Variation { get; set; }
|
||||||
|
public JObject GeometryJson { get; set; }
|
||||||
|
}
|
||||||
|
}
|
196
FarmmapsPoten/PotenApplication.cs
Normal file
196
FarmmapsPoten/PotenApplication.cs
Normal file
@ -0,0 +1,196 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using FarmmapsApi;
|
||||||
|
using FarmmapsApi.Models;
|
||||||
|
using FarmmapsApi.Services;
|
||||||
|
using FarmmapsPoten.Models;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using static FarmmapsApiSamples.Constants;
|
||||||
|
|
||||||
|
|
||||||
|
namespace FarmmapsVRApoten
|
||||||
|
{
|
||||||
|
public class PotenApplication : IApplication
|
||||||
|
|
||||||
|
{
|
||||||
|
private const string DownloadFolder = "Downloads";
|
||||||
|
|
||||||
|
private readonly ILogger<PotenApplication> _logger;
|
||||||
|
private readonly FarmmapsApiService _farmmapsApiService;
|
||||||
|
private readonly PotenService _potenService;
|
||||||
|
private readonly GeneralService _generalService;
|
||||||
|
|
||||||
|
|
||||||
|
public PotenApplication(ILogger<PotenApplication> logger, FarmmapsApiService farmmapsApiService,
|
||||||
|
GeneralService generalService, PotenService potenService)
|
||||||
|
{
|
||||||
|
_logger = logger;
|
||||||
|
_farmmapsApiService = farmmapsApiService;
|
||||||
|
_generalService = generalService;
|
||||||
|
_potenService = potenService;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task RunAsync()
|
||||||
|
{
|
||||||
|
// read field data from separate json file
|
||||||
|
var VRAPotenInputJson = File.ReadAllText("PotenInput.json");
|
||||||
|
List<PotenInput> potenInputs = JsonConvert.DeserializeObject<List<PotenInput>>(VRAPotenInputJson);
|
||||||
|
|
||||||
|
|
||||||
|
if (!Directory.Exists(DownloadFolder))
|
||||||
|
Directory.CreateDirectory(DownloadFolder);
|
||||||
|
|
||||||
|
// !! 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();
|
||||||
|
|
||||||
|
foreach (var input in potenInputs)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await Process(roots, input);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogError(ex.Message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task Process(List<UserRoot> roots, PotenInput input)
|
||||||
|
{
|
||||||
|
var meanDensity = input.MeanDensity;
|
||||||
|
var variation = input.Variation;
|
||||||
|
var fieldName = input.FieldName;
|
||||||
|
bool useShadow = input.UseShadow;
|
||||||
|
|
||||||
|
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 _generalService.CreateCropfieldItemAsync(myDrive.Code,
|
||||||
|
$"VRA Poten cropfield {input.OutputFileName}", input.PlantingYear,
|
||||||
|
input.GeometryJson.ToString(Formatting.None));
|
||||||
|
|
||||||
|
//Calculating shadow map
|
||||||
|
if (useShadow)
|
||||||
|
{
|
||||||
|
_logger.LogInformation("Calculate shadow map for field");
|
||||||
|
var shadowItem = await _generalService.RunShadowTask(cropfieldItem);
|
||||||
|
if (shadowItem == null)
|
||||||
|
{
|
||||||
|
_logger.LogError("Something went wrong while obtaining the shadow map");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_logger.LogInformation("Downloading shadow map");
|
||||||
|
await _farmmapsApiService.DownloadItemAsync(shadowItem.Code,
|
||||||
|
Path.Combine(DownloadFolder, $"{input.OutputFileName}.shadow.zip"));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
_logger.LogInformation("Looking for local data to use");
|
||||||
|
var localDataAvailable = input.File;
|
||||||
|
var geotiffItem = (Item) null;
|
||||||
|
|
||||||
|
|
||||||
|
if (String.IsNullOrEmpty(localDataAvailable))
|
||||||
|
{
|
||||||
|
_logger.LogInformation("Could not find item for uploaded data, using BOFEK");
|
||||||
|
|
||||||
|
//Retreiving BOFEK
|
||||||
|
_logger.LogInformation("Get BOFEK for field");
|
||||||
|
var bofekItem = await _generalService.RunBofekTask(cropfieldItem);
|
||||||
|
if (bofekItem == null)
|
||||||
|
{
|
||||||
|
_logger.LogError("Something went wrong while obtaining the BOFEK data");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_logger.LogInformation("Downloading Bofek map");
|
||||||
|
await _farmmapsApiService.DownloadItemAsync(bofekItem.Code,
|
||||||
|
Path.Combine(DownloadFolder, $"{input.OutputFileName}.BOFEK.zip"));
|
||||||
|
}
|
||||||
|
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var isGeoJson = input.File.Contains("json");
|
||||||
|
var dataPath = Path.Combine("Data", input.File);
|
||||||
|
var shapeItem = isGeoJson
|
||||||
|
? await _generalService.UploadDataAsync(uploadedRoot, SHAPE_PROCESSED_ITEMTYPE, dataPath,
|
||||||
|
Path.GetFileNameWithoutExtension(input.File))
|
||||||
|
: await _generalService.UploadZipWithShapeAsync(uploadedRoot, dataPath,
|
||||||
|
Path.GetFileNameWithoutExtension(input.File));
|
||||||
|
|
||||||
|
if (shapeItem == null)
|
||||||
|
{
|
||||||
|
_logger.LogError("Something went wrong while searching for the shape file");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// transform shape to geotiff as VRA poten only supports tiff input item
|
||||||
|
_logger.LogInformation($"Converting shape to geotiff");
|
||||||
|
|
||||||
|
geotiffItem = await _generalService.ShapeToGeotiff(shapeItem);
|
||||||
|
if (geotiffItem == null)
|
||||||
|
{
|
||||||
|
_logger.LogError("Something went wrong with shape to geotiff transformation");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_logger.LogInformation("Downloading geotiff file");
|
||||||
|
await _farmmapsApiService.DownloadItemAsync(geotiffItem.Code,
|
||||||
|
Path.Combine(DownloadFolder, $"VRApoten_inputGeotiff_{input.OutputFileName}.zip"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// create appliance map
|
||||||
|
_logger.LogInformation("Calculating application map");
|
||||||
|
|
||||||
|
// INPUT IS NEEDED as GEOTIFF
|
||||||
|
var applianceMapItem =
|
||||||
|
await _potenService.CalculateApplicationMapAsync(cropfieldItem, geotiffItem, meanDensity, variation);
|
||||||
|
|
||||||
|
if (applianceMapItem == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_logger.LogInformation("Downloading application map");
|
||||||
|
await _farmmapsApiService.DownloadItemAsync(applianceMapItem.Code,
|
||||||
|
Path.Combine(DownloadFolder, $"VRApoten_appliancemap_{input.OutputFileName}.zip"));
|
||||||
|
|
||||||
|
string finalOutput = Path.Combine(DownloadFolder, $"VRApoten_appliancemap_{input.OutputFileName}.zip");
|
||||||
|
_logger.LogInformation(File.Exists(finalOutput)
|
||||||
|
? "Download application map completed."
|
||||||
|
: "Something went wrong while downloading.");
|
||||||
|
|
||||||
|
_logger.LogInformation($"Converting geotiff to shape");
|
||||||
|
var taskmap = await _generalService.GeotiffToShape(applianceMapItem);
|
||||||
|
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, $"VRApoten_taskmap_{input.OutputFileName}.zip"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
91
FarmmapsPoten/PotenService.cs
Normal file
91
FarmmapsPoten/PotenService.cs
Normal file
@ -0,0 +1,91 @@
|
|||||||
|
using System;
|
||||||
|
using System.Globalization;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using FarmmapsApi.Models;
|
||||||
|
using FarmmapsApi.Services;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using static FarmmapsApi.Extensions;
|
||||||
|
using static FarmmapsApiSamples.Constants;
|
||||||
|
|
||||||
|
|
||||||
|
namespace FarmmapsVRApoten
|
||||||
|
{
|
||||||
|
public class PotenService
|
||||||
|
{
|
||||||
|
private readonly ILogger<PotenService> _logger;
|
||||||
|
private readonly FarmmapsApiService _farmmapsApiService;
|
||||||
|
private readonly GeneralService _generalService;
|
||||||
|
|
||||||
|
public PotenService(ILogger<PotenService> logger, FarmmapsApiService farmmapsApiService,
|
||||||
|
GeneralService generalService)
|
||||||
|
{
|
||||||
|
_logger = logger;
|
||||||
|
_farmmapsApiService = farmmapsApiService;
|
||||||
|
_generalService = generalService;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Item> CalculateApplicationMapAsync(Item cropfieldItem, Item inputItem,string meanDensity, string variation)
|
||||||
|
{
|
||||||
|
var potenApplicationMapRequest = new TaskRequest() { TaskType = VRAPLANTING_TASK };
|
||||||
|
if (inputItem != null) {potenApplicationMapRequest.attributes["inputCode"] = inputItem.Code; }
|
||||||
|
potenApplicationMapRequest.attributes["meanDensity"] = meanDensity;
|
||||||
|
potenApplicationMapRequest.attributes["variation"] = variation;
|
||||||
|
|
||||||
|
//var taskCode = await _farmmapsApiService.QueueTaskAsync(cropfieldItem.Code, potenApplicationMapRequest);
|
||||||
|
//await PollTask(TimeSpan.FromSeconds(3), async (tokenSource) =>
|
||||||
|
//{
|
||||||
|
// _logger.LogInformation("Checking VRAPoten task status");
|
||||||
|
// var itemTaskStatus = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, taskCode);
|
||||||
|
// // Code
|
||||||
|
// if (itemTaskStatus.IsFinished)
|
||||||
|
// tokenSource.Cancel();
|
||||||
|
//});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
var taskCode = await _farmmapsApiService.QueueTaskAsync(cropfieldItem.Code, potenApplicationMapRequest);
|
||||||
|
_logger.LogInformation($"itemTaskCode: {taskCode}");
|
||||||
|
_logger.LogInformation($"potenTaskmapRequest: {potenApplicationMapRequest}");
|
||||||
|
_logger.LogInformation($"potenTaskmapRequest type: {potenApplicationMapRequest.TaskType}");
|
||||||
|
_logger.LogInformation($"cropfieldItemCode: {cropfieldItem.Code}");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
await PollTask(TimeSpan.FromSeconds(5), async (tokenSource) => {
|
||||||
|
var itemTaskStatus = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, taskCode);
|
||||||
|
_logger.LogInformation($"Waiting on calculation of application map; Status: {itemTaskStatus.State}");
|
||||||
|
if (itemTaskStatus.IsFinished)
|
||||||
|
tokenSource.Cancel();
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
var itemTask = await _farmmapsApiService.GetTaskStatusAsync(cropfieldItem.Code, taskCode);
|
||||||
|
if (itemTask.State == ItemTaskState.Error)
|
||||||
|
{
|
||||||
|
_logger.LogError($"Something went wrong with task execution: {itemTask.Message}");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
var itemName = $"VRAPoten";
|
||||||
|
var applianceMapItem = await _generalService.FindChildItemAsync(cropfieldItem.Code,
|
||||||
|
GEOTIFF_PROCESSED_ITEMTYPE, itemName,
|
||||||
|
i => i.Updated >= itemTask.Finished.GetValueOrDefault(DateTime.UtcNow) &&
|
||||||
|
i.Name.ToLower().Contains(itemName.ToLower()));
|
||||||
|
|
||||||
|
if (applianceMapItem == null)
|
||||||
|
{
|
||||||
|
_logger.LogError("Could not find the VRAPoten geotiff child item under cropfield");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return applianceMapItem;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
23
FarmmapsPoten/Program.cs
Normal file
23
FarmmapsPoten/Program.cs
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
using System.Threading.Tasks;
|
||||||
|
using FarmmapsApi;
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
|
namespace FarmmapsVRApoten
|
||||||
|
{
|
||||||
|
class Program : FarmmapsProgram<PotenApplication>
|
||||||
|
{
|
||||||
|
private static async Task Main(string[] args)
|
||||||
|
{
|
||||||
|
await new Program().Start(args);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Configure(IServiceCollection serviceCollection)
|
||||||
|
{
|
||||||
|
serviceCollection.AddLogging(opts => opts
|
||||||
|
.AddConsole()
|
||||||
|
.AddFilter("System.Net.Http", LogLevel.Warning))
|
||||||
|
.AddTransient<PotenService>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user