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

removed references to isaria

Browse Source
This commit is contained in:
Frits van Evert
2020-04-28 16:35:14 +02:00
parent 56193b1b39
commit 262bd641a8
4 changed files with 113 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
FarmmapsNbs/NbsApplication.cs
View File

@@ -77,20 +77,20 @@ namespace FarmmapsNbs
var cropfieldItem = await _generalService.CreateCropfieldItemAsync(myDriveRoot.Code,
$"VRA NBS cropfield {input.OutputFileName}", plantingDate.Year, input.GeometryJson.ToString(Formatting.None));
var dataPath = Path.Combine("Data", input.IsariaZipFile);
var isariaShapeItem =
await _generalService.UploadZipWithShapeAsync(uploadedRoot, dataPath, Path.GetFileNameWithoutExtension(input.IsariaZipFile));
if (isariaShapeItem == null)
var dataPath = Path.Combine("Data", input.ZippedShapeFile);
var shapeItem =
await _generalService.UploadZipWithShapeAsync(uploadedRoot, dataPath, Path.GetFileNameWithoutExtension(input.ZippedShapeFile));
if (shapeItem == null)
{
_logger.LogError("Could not find isaria shape item");
_logger.LogError("Could not find shape item");
return;
}
_logger.LogInformation($"Converting shape to geotiff");
var isariaGeotiffItem = await _generalService.ShapeToGeotiff(isariaShapeItem);
if (isariaGeotiffItem == null)
var geotiffItem = await _generalService.ShapeToGeotiff(shapeItem);
if (geotiffItem == null)
{
_logger.LogError("Something went wrong with isaria shape to geotiff transformation");
_logger.LogError("Something went wrong with shape to geotiff transformation");
return;
}
@@ -112,20 +112,20 @@ namespace FarmmapsNbs
_logger.LogInformation("Calculating uptake map");
var uptakeMapItem =
await _nitrogenService.CalculateUptakeMap(cropfieldItem, isariaGeotiffItem, plantingDate,
measurementDate);
await _nitrogenService.CalculateUptakeMap(cropfieldItem, geotiffItem, plantingDate,
measurementDate, input.InputVariable);
_logger.LogInformation("Downloading uptake map");
await _farmmapsApiService.DownloadItemAsync(uptakeMapItem.Code,
Path.Combine(DownloadFolder, $"{input.OutputFileName}.uptake.zip"));
_logger.LogInformation("Calculating appliance map");
_logger.LogInformation("Calculating application map");
var applianceMapItem =
await _nitrogenService.CalculateApplicationMap(cropfieldItem, isariaGeotiffItem, plantingDate,
await _nitrogenService.CalculateApplicationMap(cropfieldItem, geotiffItem, plantingDate,
measurementDate,
"irmi", targetNData.TargetN);
input.InputVariable, targetNData.TargetN);
_logger.LogInformation("Downloading appliance map");
_logger.LogInformation("Downloading application map");
await _farmmapsApiService.DownloadItemAsync(applianceMapItem.Code,
Path.Combine(DownloadFolder, $"{input.OutputFileName}.application.zip"));
}