diff --git a/FarmmapsNbs/NbsApplication.cs b/FarmmapsNbs/NbsApplication.cs index a8ea528..a1700ce 100644 --- a/FarmmapsNbs/NbsApplication.cs +++ b/FarmmapsNbs/NbsApplication.cs @@ -120,13 +120,13 @@ namespace FarmmapsNbs Path.Combine(DownloadFolder, $"{input.OutputFileName}.uptake.zip")); _logger.LogInformation("Calculating application map"); - var applianceMapItem = + var applicationMapItem = await _nitrogenService.CalculateApplicationMap(cropfieldItem, geotiffItem, plantingDate, measurementDate, input.InputVariable, targetNData.TargetN); _logger.LogInformation("Downloading application map"); - await _farmmapsApiService.DownloadItemAsync(applianceMapItem.Code, + await _farmmapsApiService.DownloadItemAsync(applicationMapItem.Code, Path.Combine(DownloadFolder, $"{input.OutputFileName}.application.zip")); } } diff --git a/FarmmapsNbs/NitrogenService.cs b/FarmmapsNbs/NitrogenService.cs index 81ff2c2..4256147 100644 --- a/FarmmapsNbs/NitrogenService.cs +++ b/FarmmapsNbs/NitrogenService.cs @@ -125,7 +125,7 @@ namespace FarmmapsNbs /// - /// Creates the nitrogen appliance map based on given input data + /// Creates the nitrogen application map based on given input data /// /// The cropfield to base the calculations on /// The farmmaps item containing the geotiff data @@ -137,16 +137,16 @@ namespace FarmmapsNbs public async Task CalculateApplicationMap(Item cropfieldItem, Item inputItem, DateTime plantingDate, DateTime measurementDate, string inputType, double targetN) { - var nbsApplianceMapRequest = new TaskRequest {TaskType = VRANBS_TASK}; - nbsApplianceMapRequest.attributes["operation"] = "application"; - nbsApplianceMapRequest.attributes["inputCode"] = inputItem.Code; - nbsApplianceMapRequest.attributes["plantingDate"] = plantingDate.ToString(); - nbsApplianceMapRequest.attributes["measurementDate"] = measurementDate.ToString(); - nbsApplianceMapRequest.attributes["inputCode"] = inputItem.Code; - nbsApplianceMapRequest.attributes["inputType"] = inputType.ToLower(); - nbsApplianceMapRequest.attributes["targetN"] = targetN.ToString(CultureInfo.InvariantCulture); + var nbsApplicationMapRequest = new TaskRequest {TaskType = VRANBS_TASK}; + nbsApplicationMapRequest.attributes["operation"] = "application"; + nbsApplicationMapRequest.attributes["inputCode"] = inputItem.Code; + nbsApplicationMapRequest.attributes["plantingDate"] = plantingDate.ToString(); + nbsApplicationMapRequest.attributes["measurementDate"] = measurementDate.ToString(); + nbsApplicationMapRequest.attributes["inputCode"] = inputItem.Code; + nbsApplicationMapRequest.attributes["inputType"] = inputType.ToLower(); + nbsApplicationMapRequest.attributes["targetN"] = targetN.ToString(CultureInfo.InvariantCulture); - string itemTaskCode = await _farmmapsApiService.QueueTaskAsync(cropfieldItem.Code, nbsApplianceMapRequest); + string itemTaskCode = await _farmmapsApiService.QueueTaskAsync(cropfieldItem.Code, nbsApplicationMapRequest); await PollTask(TimeSpan.FromSeconds(5), async (tokenSource) => { @@ -163,17 +163,17 @@ namespace FarmmapsNbs } var itemName = $"VRANbs application"; - var applianceMapItem = await _generalService.FindChildItemAsync(cropfieldItem.Code, + var applicationMapItem = 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) + if (applicationMapItem == null) { _logger.LogError("Could not find the application map geotiff child item under cropfield"); return null; } - return applianceMapItem; + return applicationMapItem; } } } \ No newline at end of file