From 4288365e968788322ed7b0622396023192a7a06e Mon Sep 17 00:00:00 2001
From: Wilco Krikke <wilco.krikke@akkerweb.nl>
Date: Sat, 3 Oct 2020 12:04:15 +0200
Subject: [PATCH] Moved crop field data to blight application.

---
 FarmMapsBlight/BlightApplication.cs    | 3 ++-
 FarmmapsApi/Services/GeneralService.cs | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/FarmMapsBlight/BlightApplication.cs b/FarmMapsBlight/BlightApplication.cs
index 104c6f3..6d35d0d 100644
--- a/FarmMapsBlight/BlightApplication.cs
+++ b/FarmMapsBlight/BlightApplication.cs
@@ -62,8 +62,9 @@ namespace FarmMapsBlight
             if (string.IsNullOrEmpty(_settings.CropfieldItemCode))
             {
                 _logger.LogInformation("Creating cropfield");
+                string cropFieldData = "{\"area\":0,\"code\":\"0552ef068b0e4e6590c317a4c662faea\",\"name\":null,\"polygon\":null,\"soilCode\":\"60\",\"soilName\":null,\"fieldCode\":null,\"schemeUrl\":null,\"externalId\":null,\"schemeCode\":null,\"varietyCode\":\"11113\",\"varietyName\":\"Bintje\",\"cropTypeCode\":\"1010101\",\"cropTypeName\":\"Consumptieaardappelen\",\"productionTypeCode\":\"1\",\"productionPurposeCode\":null,\"productionPurposeName\":null,\"productionSequenceCode\":\"HFDTLT\"}";
                 cropfieldItem = await _generalService.CreateCropfieldItemAsync(myDrive.Code, "Cropfield Blight", 2020,
-                    @"{""type"":""Polygon"",""coordinates"":[[[4.617786844284247,52.22533706956424],[4.618642601314543,52.225938364585989],[4.6192153806397,52.22563988897754],[4.619192414656403,52.2256242822442],[4.620306732153958,52.225031745661528],[4.620542019225217,52.22519855319158],[4.621157509147853,52.22487436515405],[4.623387917230182,52.22367660757213],[4.624563444939009,52.22304740241544],[4.624562779355982,52.223046635247019],[4.624534908813479,52.22302596787506],[4.627873021330343,52.221240670658399],[4.627504935938338,52.220104419135129],[4.627324878706837,52.22020569669098],[4.627320696113512,52.22020660117888],[4.626707169518044,52.22053923770041],[4.624700376420229,52.221619047547488],[4.623471571183885,52.22227447969577],[4.623471511010673,52.22227500174403],[4.623468838689317,52.22228052566992],[4.617786844284247,52.22533706956424]]]}");
+                    @"{""type"":""Polygon"",""coordinates"":[[[4.617786844284247,52.22533706956424],[4.618642601314543,52.225938364585989],[4.6192153806397,52.22563988897754],[4.619192414656403,52.2256242822442],[4.620306732153958,52.225031745661528],[4.620542019225217,52.22519855319158],[4.621157509147853,52.22487436515405],[4.623387917230182,52.22367660757213],[4.624563444939009,52.22304740241544],[4.624562779355982,52.223046635247019],[4.624534908813479,52.22302596787506],[4.627873021330343,52.221240670658399],[4.627504935938338,52.220104419135129],[4.627324878706837,52.22020569669098],[4.627320696113512,52.22020660117888],[4.626707169518044,52.22053923770041],[4.624700376420229,52.221619047547488],[4.623471571183885,52.22227447969577],[4.623471511010673,52.22227500174403],[4.623468838689317,52.22228052566992],[4.617786844284247,52.22533706956424]]]}", cropFieldData);
                 _settings.CropfieldItemCode = cropfieldItem.Code;
                 SaveSettings();
             }
diff --git a/FarmmapsApi/Services/GeneralService.cs b/FarmmapsApi/Services/GeneralService.cs
index 248c33f..e71a5b0 100644
--- a/FarmmapsApi/Services/GeneralService.cs
+++ b/FarmmapsApi/Services/GeneralService.cs
@@ -24,7 +24,7 @@ namespace FarmmapsApi.Services
         }
 
         public async Task<Item> CreateCropfieldItemAsync(string parentItemCode, string name, int year,
-            string fieldGeomJson)
+            string fieldGeomJson, string data = "{}")
         {
             var currentYear = new DateTime(year, 1, 1);
             var cropfieldItemRequest = new ItemRequest()
@@ -34,7 +34,7 @@ namespace FarmmapsApi.Services
                 Name = name,
                 DataDate = currentYear,
                 DataEndDate = currentYear.AddYears(1).AddDays(-1),
-                Data = JObject.Parse("{\"area\":0,\"code\":\"0552ef068b0e4e6590c317a4c662faea\",\"name\":null,\"polygon\":null,\"soilCode\":\"60\",\"soilName\":null,\"fieldCode\":null,\"schemeUrl\":null,\"externalId\":null,\"schemeCode\":null,\"varietyCode\":\"11113\",\"varietyName\":\"Bintje\",\"cropTypeCode\":\"1010101\",\"cropTypeName\":\"Consumptieaardappelen\",\"productionTypeCode\":\"1\",\"productionPurposeCode\":null,\"productionPurposeName\":null,\"productionSequenceCode\":\"HFDTLT\"}"),
+                Data = JObject.Parse(data),
                 Geometry = JObject.Parse(fieldGeomJson)
             };