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

Compare commits

base: jits:d5f715ef925f2d24998e2b920be2f6643762c4fe
Branches Tags
jits:master
FarmMaps:master
FarmMaps:fedde-patch-1
..
compare: jits:93469b605c97350368271a22f39b32295b641294
Branches Tags
jits:master
FarmMaps:master
FarmMaps:fedde-patch-1

No commits in common. "d5f715ef925f2d24998e2b920be2f6643762c4fe" and "93469b605c97350368271a22f39b32295b641294" have entirely different histories.
d5f715ef92 ... 93469b605c

3 changed files with 8 additions and 10 deletions
Show Stats Expand all files Collapse all files

5
FarmmapsApi/Services/FarmmapsApiService.cs
View File

@ -283,7 +283,7 @@ namespace FarmmapsApi.Services
/// <param name="progressCallback"></param> /// <param name="progressCallback"></param>
/// <returns></returns> /// <returns></returns>
/// <exception cref="FileNotFoundException"></exception> /// <exception cref="FileNotFoundException"></exception>
public async Task<UploadResults> UploadFile(string filePath, string parentItemCode, string geoJsonString, public async Task<UploadResults> UploadFile(string filePath, string parentItemCode,
Action<IUploadProgress> progressCallback = null) Action<IUploadProgress> progressCallback = null)
{ {
if (!File.Exists(filePath)) if (!File.Exists(filePath))
@ -300,8 +300,7 @@ namespace FarmmapsApi.Services
{ {
Name = Path.GetFileName(filePath), Name = Path.GetFileName(filePath),
ParentCode = parentItemCode, ParentCode = parentItemCode,
Size = uploadStream.Length, Size = uploadStream.Length
Geometry = JObject.Parse(geoJsonString)
}; };
using var httpClient = CreateConfigurableHttpClient(_httpClient); using var httpClient = CreateConfigurableHttpClient(_httpClient);

11
FarmmapsApi/Services/GeneralService.cs
View File

@ -37,9 +37,9 @@ namespace FarmmapsApi.Services
return await _farmmapsApiService.CreateItemAsync(cropfieldItemRequest); return await _farmmapsApiService.CreateItemAsync(cropfieldItemRequest);
} }
public async Task<Item> UploadDataAsync(UserRoot root, string itemType, string filePath, string itemName, string fieldGeomJson = null) { public async Task<Item> UploadDataAsync(UserRoot root, string itemType, string filePath, string itemName) {
var startUpload = DateTime.UtcNow.AddSeconds(-3); var startUpload = DateTime.UtcNow.AddSeconds(-3);
var result = await _farmmapsApiService.UploadFile(filePath, root.Code, fieldGeomJson, var result = await _farmmapsApiService.UploadFile(filePath, root.Code,
progress => _logger.LogInformation($"Status: {progress.Status} - BytesSent: {progress.BytesSent}")); progress => _logger.LogInformation($"Status: {progress.Status} - BytesSent: {progress.BytesSent}"));
if (result.Progress.Status == UploadStatus.Failed) if (result.Progress.Status == UploadStatus.Failed)
@ -50,9 +50,9 @@ namespace FarmmapsApi.Services
i.Name.ToLower().Contains(itemName.ToLower())); i.Name.ToLower().Contains(itemName.ToLower()));
} }
public async Task<Item> UploadZipWithShapeAsync(UserRoot root, string filePath, string itemName, string fieldGeomJson = null) { public async Task<Item> UploadZipWithShapeAsync(UserRoot root, string filePath, string itemName) {
var startUpload = DateTime.UtcNow; var startUpload = DateTime.UtcNow;
var result = await _farmmapsApiService.UploadFile(filePath, root.Code, fieldGeomJson, var result = await _farmmapsApiService.UploadFile(filePath, root.Code,
progress => _logger.LogInformation($"Status: {progress.Status} - BytesSent: {progress.BytesSent}")); progress => _logger.LogInformation($"Status: {progress.Status} - BytesSent: {progress.BytesSent}"));
if (result.Progress.Status == UploadStatus.Failed) if (result.Progress.Status == UploadStatus.Failed)
@ -108,7 +108,7 @@ namespace FarmmapsApi.Services
} }
// Create taskmap based on width, height and direction // Create taskmap based on width, height and direction
public async Task<Item> CreateTaskmap(Item cropfieldItem, Item tiffItem, string cellWidth, string cellHeight, string startPoint, string centered = "false", string endPoint = null, string angle = null, string precision = null) public async Task<Item> CreateTaskmap(Item cropfieldItem, Item tiffItem, string cellWidth, string cellHeight, string startPoint, string centered = "false", string endPoint = null, string angle = null)
{ {
var taskmapRequest = new TaskRequest { TaskType = TASKMAP_TASK }; var taskmapRequest = new TaskRequest { TaskType = TASKMAP_TASK };
taskmapRequest.attributes["inputCode"] = tiffItem.Code; taskmapRequest.attributes["inputCode"] = tiffItem.Code;
@ -119,7 +119,6 @@ namespace FarmmapsApi.Services
taskmapRequest.attributes["centered"] = centered; taskmapRequest.attributes["centered"] = centered;
if (angle == null) taskmapRequest.attributes["endPoint"] = endPoint; // Coordinates WGS84 if (angle == null) taskmapRequest.attributes["endPoint"] = endPoint; // Coordinates WGS84
if (endPoint == null) taskmapRequest.attributes["angle"] = angle; // degrees between 0.0 and 360.0 if (endPoint == null) taskmapRequest.attributes["angle"] = angle; // degrees between 0.0 and 360.0
taskmapRequest.attributes["precision"] = precision;
string itemTaskCode = await _farmmapsApiService.QueueTaskAsync(cropfieldItem.Code, taskmapRequest); string itemTaskCode = await _farmmapsApiService.QueueTaskAsync(cropfieldItem.Code, taskmapRequest);

2
FarmmapsPoten/PotenApplication.cs
View File

@ -176,7 +176,7 @@ namespace FarmmapsVRApoten
//GEOTIFF TO Taskmap //GEOTIFF TO Taskmap
_logger.LogInformation($"Converting geotiff to taskmap"); _logger.LogInformation($"Converting geotiff to taskmap");
var taskmap = await _generalService.CreateTaskmap(cropfieldItem, applianceMapItem, input.CellWidth, input.CellHeight, input.StartPoint.ToString(Formatting.None), var taskmap = await _generalService.CreateTaskmap(cropfieldItem, applianceMapItem, input.CellWidth, input.CellHeight, input.StartPoint.ToString(Formatting.None),
input.Centered, input.EndPoint.ToString(Formatting.None), input.Angle, input.Precision); input.Centered, input.EndPoint.ToString(Formatting.None), input.Angle);
if (taskmap == null) if (taskmap == null)
{ {
_logger.LogError("Something went wrong with geotiff to taskmap transformation"); _logger.LogError("Something went wrong with geotiff to taskmap transformation");