pvanoort/FarmMapsApiClient_WUR
1
0
Fork 0
forked from FarmMaps/FarmMapsApiClient
Code Pull Requests Activity

solved merging in poten app

Browse Source
This commit is contained in:
Riepma
2021-04-07 11:10:47 +02:00
committed by Mark van der Wal
parent 766674c731 d5f715ef92
commit 4459a4e76d
14 changed files with 27 additions and 840 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
FarmmapsPoten/Data/BBL-lutum.tif
View File

Binary file not shown.

BIN
FarmmapsPoten/Data/ClaassenVRA_Kruising_Lut.zip Normal file
View File

Binary file not shown.

BIN
FarmmapsPoten/Data/ClaassenVRA_Kruising_LutEmptyPointsErased.zip Normal file
View File

Binary file not shown.

BIN
FarmmapsPoten/Data/ClaassenVRA_Kruising_LutEmptyPointsErased_largerExtent.zip Normal file
View File

Binary file not shown.

BIN
FarmmapsPoten/Data/ClaassenVRA_Kruising_PG.zip Normal file
View File

Binary file not shown.

0
FarmmapsPoten/Data/PlantingSampleDataLutum.json → FarmmapsPoten/Data/PlantingSampleDataLutumJSON.json
View File

BIN
FarmmapsPoten/Data/PlantingSampleDataLutum_TEST2.zip Normal file
View File

Binary file not shown.

6
FarmmapsPoten/PotenApplication.cs
View File

@@ -133,7 +133,7 @@ namespace FarmmapsVRApoten
? await _generalService.UploadDataAsync(uploadedRoot, SHAPE_PROCESSED_ITEMTYPE, dataPath,
Path.GetFileNameWithoutExtension(input.File))
: await _generalService.UploadZipWithShapeAsync(uploadedRoot, dataPath,
Path.GetFileNameWithoutExtension(input.File));
Path.GetFileNameWithoutExtension(input.File), input.GeometryJson.ToString(Formatting.None));
if (shapeItem == null) {
_logger.LogError("Something went wrong while searching for the shape file");
@@ -188,6 +188,7 @@ namespace FarmmapsVRApoten
if(input.GenerateTaskmap) {
//GEOTIFF TO Taskmap
_logger.LogInformation($"Converting geotiff to taskmap");
var taskmap = (Item)null;
if (input.OutputType == "isoxml")
{
@@ -196,10 +197,11 @@ namespace FarmmapsVRApoten
} else
{
taskmap = await _generalService.CreateTaskmap(cropfieldItem, applianceMapItem, input.OutputType, input.CellWidth, input.CellHeight, input.StartPoint.ToString(Formatting.None),
input.Centered, input.EndPoint.ToString(Formatting.None), input.Angle);
null, input.Centered, input.EndPoint.ToString(Formatting.None), input.Angle);
}
if (taskmap == null)
{
_logger.LogError("Something went wrong with geotiff to taskmap transformation");

8
FarmmapsPoten/PotenInput.json
View File

@@ -319,10 +319,10 @@
//}
{
"File": "PlantingSampleDataLutum.zip",
"File": "PlantingSampleDataLutum_TEST2.zip",
"OutputFileName": "2021.03.15_vraPoten_SampleData",
"FieldName": "lutum",
"PlantingYear": 2020,
"PlantingYear": 2021,
"MeanDensity": "30",
"Variation": "20",
"UseShadow": false,
@@ -341,8 +341,8 @@
},
"GenerateTaskmap": true,
"OutputType": "isoxml", // "shape" or "isoxml" if isoxml also add ddiCode
"DdiCode": "0001",
"OutputType": "shape", // "shape" or "isoxml" if isoxml also add ddiCode
"DdiCode": "0001",
"CellWidth": "3",
"CellHeight": "10",
"Centered": "true",

18
FarmmapsPoten/appsettings.json
View File

@@ -1,10 +1,10 @@
{
"Authority": "https://accounts.test.farmmaps.eu/",
"Endpoint": "https://test.farmmaps.eu/",
"BasePath": "api/v1",
"DiscoveryEndpointUrl": "https://accounts.test.farmmaps.eu/.well-known/openid-configuration",
"RedirectUri": "http://example.nl/api",
"ClientId": "",
"ClientSecret": "",
"Scopes": [ "api" ]
}
"Authority": "https://accounts.test.farmmaps.eu/",
"Endpoint": "https://test.farmmaps.eu/",
"BasePath": "api/v1",
"DiscoveryEndpointUrl": "https://accounts.test.farmmaps.eu/.well-known/openid-configuration",
"RedirectUri": "http://example.nl/api",
"ClientId": "",
"ClientSecret": "",
"Scopes": [ "api" ]
}