forked from FarmMaps/FarmMapsApiClient
Compare commits
2 Commits
262bd641a8
...
357bcaea60
Author | SHA1 | Date | |
---|---|---|---|
357bcaea60 | |||
7565c576c1 |
@ -120,13 +120,13 @@ namespace FarmmapsNbs
|
|||||||
Path.Combine(DownloadFolder, $"{input.OutputFileName}.uptake.zip"));
|
Path.Combine(DownloadFolder, $"{input.OutputFileName}.uptake.zip"));
|
||||||
|
|
||||||
_logger.LogInformation("Calculating application map");
|
_logger.LogInformation("Calculating application map");
|
||||||
var applianceMapItem =
|
var applicationMapItem =
|
||||||
await _nitrogenService.CalculateApplicationMap(cropfieldItem, geotiffItem, plantingDate,
|
await _nitrogenService.CalculateApplicationMap(cropfieldItem, geotiffItem, plantingDate,
|
||||||
measurementDate,
|
measurementDate,
|
||||||
input.InputVariable, targetNData.TargetN);
|
input.InputVariable, targetNData.TargetN);
|
||||||
|
|
||||||
_logger.LogInformation("Downloading application map");
|
_logger.LogInformation("Downloading application map");
|
||||||
await _farmmapsApiService.DownloadItemAsync(applianceMapItem.Code,
|
await _farmmapsApiService.DownloadItemAsync(applicationMapItem.Code,
|
||||||
Path.Combine(DownloadFolder, $"{input.OutputFileName}.application.zip"));
|
Path.Combine(DownloadFolder, $"{input.OutputFileName}.application.zip"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -125,7 +125,7 @@ namespace FarmmapsNbs
|
|||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Creates the nitrogen appliance map based on given input data
|
/// Creates the nitrogen application map based on given input data
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="cropfieldItem">The cropfield to base the calculations on</param>
|
/// <param name="cropfieldItem">The cropfield to base the calculations on</param>
|
||||||
/// <param name="inputItem">The farmmaps item containing the geotiff data</param>
|
/// <param name="inputItem">The farmmaps item containing the geotiff data</param>
|
||||||
@ -137,16 +137,16 @@ namespace FarmmapsNbs
|
|||||||
public async Task<Item> CalculateApplicationMap(Item cropfieldItem, Item inputItem, DateTime plantingDate,
|
public async Task<Item> CalculateApplicationMap(Item cropfieldItem, Item inputItem, DateTime plantingDate,
|
||||||
DateTime measurementDate, string inputType, double targetN)
|
DateTime measurementDate, string inputType, double targetN)
|
||||||
{
|
{
|
||||||
var nbsApplianceMapRequest = new TaskRequest {TaskType = VRANBS_TASK};
|
var nbsApplicationMapRequest = new TaskRequest {TaskType = VRANBS_TASK};
|
||||||
nbsApplianceMapRequest.attributes["operation"] = "application";
|
nbsApplicationMapRequest.attributes["operation"] = "application";
|
||||||
nbsApplianceMapRequest.attributes["inputCode"] = inputItem.Code;
|
nbsApplicationMapRequest.attributes["inputCode"] = inputItem.Code;
|
||||||
nbsApplianceMapRequest.attributes["plantingDate"] = plantingDate.ToString();
|
nbsApplicationMapRequest.attributes["plantingDate"] = plantingDate.ToString();
|
||||||
nbsApplianceMapRequest.attributes["measurementDate"] = measurementDate.ToString();
|
nbsApplicationMapRequest.attributes["measurementDate"] = measurementDate.ToString();
|
||||||
nbsApplianceMapRequest.attributes["inputCode"] = inputItem.Code;
|
nbsApplicationMapRequest.attributes["inputCode"] = inputItem.Code;
|
||||||
nbsApplianceMapRequest.attributes["inputType"] = inputType.ToLower();
|
nbsApplicationMapRequest.attributes["inputType"] = inputType.ToLower();
|
||||||
nbsApplianceMapRequest.attributes["targetN"] = targetN.ToString(CultureInfo.InvariantCulture);
|
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) =>
|
await PollTask(TimeSpan.FromSeconds(5), async (tokenSource) =>
|
||||||
{
|
{
|
||||||
@ -163,17 +163,17 @@ namespace FarmmapsNbs
|
|||||||
}
|
}
|
||||||
|
|
||||||
var itemName = $"VRANbs application";
|
var itemName = $"VRANbs application";
|
||||||
var applianceMapItem = await _generalService.FindChildItemAsync(cropfieldItem.Code,
|
var applicationMapItem = await _generalService.FindChildItemAsync(cropfieldItem.Code,
|
||||||
GEOTIFF_PROCESSED_ITEMTYPE, itemName,
|
GEOTIFF_PROCESSED_ITEMTYPE, itemName,
|
||||||
i => i.Updated >= itemTask.Finished.GetValueOrDefault(DateTime.UtcNow) &&
|
i => i.Updated >= itemTask.Finished.GetValueOrDefault(DateTime.UtcNow) &&
|
||||||
i.Name.ToLower().Contains(itemName.ToLower()));
|
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");
|
_logger.LogError("Could not find the application map geotiff child item under cropfield");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return applianceMapItem;
|
return applicationMapItem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user