Frits/FarmMapsApiClient
1
0
Fork 0
forked from FarmMaps/FarmMapsApiClient
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: Frits:262bd641a83750954567af5538a46ef9630d48aa
Branches Tags
Frits:master
Frits:feature/haulmkilling
FarmMaps:master
FarmMaps:fedde-patch-1
...
compare: Frits:357bcaea6059aa2d6e7a9fe88646120c7fd6dc12
Branches Tags
Frits:master
Frits:feature/haulmkilling
FarmMaps:master
FarmMaps:fedde-patch-1

2 Commits
262bd641a8 ... 357bcaea60

Author SHA1 Message Date
Evert
357bcaea60 replaced "applianceXXX" with "applicationXXX" 2020-04-29 14:58:30 +02:00
Mark van der Wal
7565c576c1 Merge branch 'master' of Frits/FarmMapsApiClient into master 2020-04-29 05:40:44 +00:00
2 changed files with 15 additions and 15 deletions
Show Stats Expand all files Collapse all files

4
FarmmapsNbs/NbsApplication.cs
View File

@ -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"));
}
}

26
FarmmapsNbs/NitrogenService.cs
View File

@ -125,7 +125,7 @@ namespace FarmmapsNbs
/// <summary>
/// Creates the nitrogen appliance map based on given input data
/// Creates the nitrogen application map based on given input data
/// </summary>
/// <param name="cropfieldItem">The cropfield to base the calculations on</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,
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;
}
}
}