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

Veranderingen jits, fedde en pepijn. #9

Merged
mark merged 46 commits from jits/FarmMapsApiClient_WURtest:master into master 2021-06-10 08:25:25 +00:00
Conversation 0 Commits 46 Files Changed 56 +14 -7
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1ddafc6d87 - Show all commits

1
FarmmapsPoten/Models/PotenInput.cs
View File

@ -7,6 +7,7 @@ namespace FarmmapsPoten.Models
{ {
public string File { get; set; } public string File { get; set; }
public string InputLayerName { get; set; }
public string OutputFileName { get; set; } public string OutputFileName { get; set; }
public string FieldName { get; set; } public string FieldName { get; set; }
public int PlantingYear { get; set; } public int PlantingYear { get; set; }

5
FarmmapsPoten/PotenApplication.cs
View File

@ -59,6 +59,7 @@ namespace FarmmapsVRApoten
var fieldName = input.FieldName; var fieldName = input.FieldName;
bool useShadow = input.UseShadow; bool useShadow = input.UseShadow;
bool countPerArea = input.CountPerArea; bool countPerArea = input.CountPerArea;
var inputLayerName = input.InputLayerName;
var myDrive = roots.SingleOrDefault(r => r.Name == "My drive"); var myDrive = roots.SingleOrDefault(r => r.Name == "My drive");
if (myDrive == null) { if (myDrive == null) {
@ -78,6 +79,8 @@ namespace FarmmapsVRApoten
$"VRA Poten cropfield {input.OutputFileName}", input.PlantingYear, $"VRA Poten cropfield {input.OutputFileName}", input.PlantingYear,
input.GeometryJson.ToString(Formatting.None)); input.GeometryJson.ToString(Formatting.None));
_logger.LogInformation($"CropfielditemCode: {cropfieldItem.Code}");
//Downloading shadowMap for own interpretation //Downloading shadowMap for own interpretation
if (useShadow) { if (useShadow) {
_logger.LogInformation("Calculate shadow map for field"); _logger.LogInformation("Calculate shadow map for field");
@ -156,7 +159,7 @@ namespace FarmmapsVRApoten
// INPUT IS NEEDED as GEOTIFF // INPUT IS NEEDED as GEOTIFF
var applianceMapItem = var applianceMapItem =
await _potenService.CalculateApplicationMapAsync(cropfieldItem, geotiffItem, meanDensity, variation, countPerArea, useShadow); await _potenService.CalculateApplicationMapAsync(cropfieldItem, geotiffItem, meanDensity, variation, countPerArea, useShadow, inputLayerName);
if (applianceMapItem == null) { if (applianceMapItem == null) {
return; return;

12
FarmmapsPoten/PotenInput.json
View File

@ -1,12 +1,14 @@
[ [
{ {
"File": "PlantingSampleDataLutum.zip", "File": "PlantingSampleDataLutumANDec.zip",
"OutputFileName": "2021.04.12_vraPoten_SampleData", "InputLayerName": "EC0-60",
"OutputFileName": "2021.04.14_vraPoten_SampleDataMultipleLayers",
"FieldName": "lutum", "FieldName": "lutum",
"PlantingYear": 2021, "PlantingYear": 2021,
"MeanDensity": "30", "MeanDensity": "30",
"Variation": "20", "Variation": "20",
"UseShadow": true, "UseShadow": false,
"CountPerArea": false, // don't forget to change ddi if isoxml is created "CountPerArea": false, // don't forget to change ddi if isoxml is created
"geometryJson": { "geometryJson": {
"type": "Polygon", "type": "Polygon",
@ -22,9 +24,9 @@
}, },
"GenerateTaskmap": true, "GenerateTaskmap": true,
"OutputType": "isoxml", // "shape" or "isoxml" if isoxml also add ddiCode "OutputType": "shape", // "shape" or "isoxml" if isoxml also add ddiCode
"Precision": "2", "Precision": "2",
"MaximumClasses": "4", "MaximumClasses": "5",
"DdiCode": "0016", "DdiCode": "0016",
"CellWidth": "3", "CellWidth": "3",
"CellHeight": "10", "CellHeight": "10",

3
FarmmapsPoten/PotenService.cs
View File

@ -25,7 +25,7 @@ namespace FarmmapsVRApoten
_generalService = generalService; _generalService = generalService;
} }
public async Task<Item> CalculateApplicationMapAsync(Item cropfieldItem, Item inputItem, string meanDensity, string variation, bool countPerArea, bool useShadow) public async Task<Item> CalculateApplicationMapAsync(Item cropfieldItem, Item inputItem, string meanDensity, string variation, bool countPerArea, bool useShadow, string inputLayerName = null)
{ {
var potenApplicationMapRequest = new TaskRequest() { TaskType = VRAPLANTING_TASK }; var potenApplicationMapRequest = new TaskRequest() { TaskType = VRAPLANTING_TASK };
if (inputItem != null) {potenApplicationMapRequest.attributes["inputCode"] = inputItem.Code; } if (inputItem != null) {potenApplicationMapRequest.attributes["inputCode"] = inputItem.Code; }
@ -34,6 +34,7 @@ namespace FarmmapsVRApoten
potenApplicationMapRequest.attributes["variation"] = variation; potenApplicationMapRequest.attributes["variation"] = variation;
potenApplicationMapRequest.attributes["countPerArea"] = countPerArea.ToString(); potenApplicationMapRequest.attributes["countPerArea"] = countPerArea.ToString();
potenApplicationMapRequest.attributes["useShadow"] = useShadow.ToString(); potenApplicationMapRequest.attributes["useShadow"] = useShadow.ToString();
potenApplicationMapRequest.attributes["inputLayerName"] = inputLayerName;
var taskCode = await _farmmapsApiService.QueueTaskAsync(cropfieldItem.Code, potenApplicationMapRequest); var taskCode = await _farmmapsApiService.QueueTaskAsync(cropfieldItem.Code, potenApplicationMapRequest);
_logger.LogInformation($"itemTaskCode: {taskCode}"); _logger.LogInformation($"itemTaskCode: {taskCode}");