master #16

Merged
mark merged 70 commits from :master into master 2025-01-10 15:39:26 +00:00
3 changed files with 4 additions and 3 deletions
Showing only changes of commit 8bb5c6f581 - Show all commits

View File

@ -98,11 +98,11 @@ namespace FarmmapsKPI
// Use already created cropfield or create new one // Use already created cropfield or create new one
Item cropfieldItem; Item cropfieldItem;
if (useCreatedCropfield == false || string.IsNullOrEmpty(_settings.CropfieldItemCode)) if (useCreatedCropfield == true || string.IsNullOrEmpty(_settings.CropfieldItemCode))
{ {
_logger.LogInformation("Creating cropfield"); _logger.LogInformation("Creating cropfield");
cropfieldItem = await _generalService.CreateCropfieldItemAsync(myDriveRoot.Code, cropfieldItem = await _generalService.CreateCropfieldItemAsync(myDriveRoot.Code,
$"DataCropfield {input.OutputFileName}", cropYear, input.GeometryJson.ToString(Formatting.None)); $"DataCropfield {input.OutputFileName}", cropYear, input.GeometryJson.ToString(Formatting.None), input.Data.ToString(Formatting.None));
_settings.CropfieldItemCode = cropfieldItem.Code; _settings.CropfieldItemCode = cropfieldItem.Code;
SaveSettings(settingsfile); SaveSettings(settingsfile);
} }

View File

@ -1,6 +1,6 @@
[ [
{ {
"UseCreatedCropfield": true, "UseCreatedCropfield": false,
"outputFileName": "TestData", "outputFileName": "TestData",
"fieldName": "TestField", "fieldName": "TestField",
"DownloadFolder": "Downloads", //"C:\\workdir\\groenmonitor\\", // "Downloads", -> if you just put "Downloads" the program will download to somewhere in ..\FarmMapsApiClient_WURtest\FarmmapsDataDownload\bin\Debug\netcoreapp3.1\Downloads\ "DownloadFolder": "Downloads", //"C:\\workdir\\groenmonitor\\", // "Downloads", -> if you just put "Downloads" the program will download to somewhere in ..\FarmMapsApiClient_WURtest\FarmmapsDataDownload\bin\Debug\netcoreapp3.1\Downloads\

View File

@ -12,6 +12,7 @@ namespace FarmmapsKPI.Models
public string DownloadFolder { get; set; } public string DownloadFolder { get; set; }
public int CropYear { get; set; } public int CropYear { get; set; }
public JObject GeometryJson { get; set; } public JObject GeometryJson { get; set; }
public JObject Data { get; set; }
public string InputLayerName { get; set; } public string InputLayerName { get; set; }
public string fieldName { get; set; } public string fieldName { get; set; }
//public bool GetSatelliteData { get; set; } //public bool GetSatelliteData { get; set; }