Added option to generate ISOXML taskmap, added missing Nbs data
This commit is contained in:
		| @@ -25,6 +25,8 @@ namespace FarmmapsPoten.Models | ||||
|         public JObject StartPoint { get; set; } | ||||
|         public JObject EndPoint { get; set; } | ||||
|         public string Angle { get; set; } | ||||
|         public string Precision { get; set; } | ||||
|         public string MaximumClasses { get; set; } | ||||
|  | ||||
|     } | ||||
| } | ||||
| @@ -175,14 +175,7 @@ namespace FarmmapsVRApoten | ||||
|             _logger.LogInformation(File.Exists(finalOutput) | ||||
|                 ? "Download application map completed." | ||||
|                 : "Something went wrong while downloading."); | ||||
|  | ||||
|              ////GEOTIFF TO SHAPE | ||||
|             //_logger.LogInformation($"Converting geotiff to shape"); | ||||
|             //var geotiffToShapeItem= await _generalService.GeotiffToShape(applianceMapItem); | ||||
|             //if (taskmap == null) { | ||||
|             //    _logger.LogError("Something went wrong with geotiff to shape transformation"); | ||||
|             //    return; | ||||
|             //}         | ||||
|     | ||||
|              | ||||
|  | ||||
|             if(input.GenerateTaskmap) {  | ||||
| @@ -192,12 +185,17 @@ namespace FarmmapsVRApoten | ||||
|                 var taskmap = (Item)null; | ||||
|             if (input.OutputType == "isoxml")  | ||||
|                 { | ||||
|                     taskmap = await _generalService.CreateTaskmap(cropfieldItem, applianceMapItem, input.OutputType, input.CellWidth, input.CellHeight, input.StartPoint.ToString(Formatting.None), | ||||
|                         input.DdiCode, input.Centered, input.EndPoint.ToString(Formatting.None), input.Angle); | ||||
|  | ||||
|                     taskmap = await _generalService.CreateTaskmap(cropfieldItem: cropfieldItem, tiffItem: applianceMapItem, outputType: input.OutputType, cellWidth: input.CellWidth, | ||||
|                         cellHeight: input.CellHeight, startPoint: input.StartPoint.ToString(Formatting.None), ddiCode: input.DdiCode, centered: input.Centered,  | ||||
|                         endPoint: input.EndPoint.ToString(Formatting.None), angle: input.Angle, precision: input.Precision,  | ||||
|                         cropTypeName: null, costumerName: null, ProductGroupName: null, productName : null, resolution: null, unitScale: null, maximumClasses: input.MaximumClasses); | ||||
|  | ||||
|                 } else | ||||
|                 { | ||||
|                     taskmap = await _generalService.CreateTaskmap(cropfieldItem, applianceMapItem, input.OutputType, input.CellWidth, input.CellHeight, input.StartPoint.ToString(Formatting.None), | ||||
|                     null, input.Centered, input.EndPoint.ToString(Formatting.None), input.Angle); | ||||
|                     taskmap = await _generalService.CreateTaskmap(cropfieldItem: cropfieldItem, tiffItem: applianceMapItem, outputType: input.OutputType, cellWidth: input.CellWidth, | ||||
|                         cellHeight: input.CellHeight, startPoint: input.StartPoint.ToString(Formatting.None), centered: input.Centered, | ||||
|                         endPoint: input.EndPoint.ToString(Formatting.None), angle: input.Angle, precision: input.Precision, maximumClasses: input.MaximumClasses); | ||||
|                 } | ||||
|  | ||||
|  | ||||
|   | ||||
| @@ -15,284 +15,6 @@ | ||||
|     //            [ | ||||
|     //                [ 6.3070655, 53.3623397 ], | ||||
|     //                [ 6.3070875, 53.3623898 ], | ||||
|     //                [ 6.3071092, 53.3624398 ], | ||||
|     //                [ 6.3071312, 53.3624898 ], | ||||
|     //                [ 6.3071531, 53.3625399 ], | ||||
|     //                [ 6.3071749, 53.3625899 ], | ||||
|     //                [ 6.3071968, 53.36264 ], | ||||
|     //                [ 6.3072186, 53.36269 ], | ||||
|     //                [ 6.3072393, 53.3627389 ], | ||||
|     //                [ 6.3072598, 53.3627879 ], | ||||
|     //                [ 6.3072803, 53.3628367 ], | ||||
|     //                [ 6.3073008, 53.3628856 ], | ||||
|     //                [ 6.3073215, 53.3629345 ], | ||||
|     //                [ 6.307342, 53.3629834 ], | ||||
|     //                [ 6.3073625, 53.3630324 ], | ||||
|     //                [ 6.3073832, 53.3630812 ], | ||||
|     //                [ 6.3074037, 53.3631301 ], | ||||
|     //                [ 6.3074242, 53.363179 ], | ||||
|     //                [ 6.3074447, 53.3632279 ], | ||||
|     //                [ 6.3074654, 53.3632768 ], | ||||
|     //                [ 6.3074859, 53.3633257 ], | ||||
|     //                [ 6.3075064, 53.3633746 ], | ||||
|     //                [ 6.3075271, 53.3634235 ], | ||||
|     //                [ 6.3075476, 53.3634724 ], | ||||
|     //                [ 6.3075681, 53.3635213 ], | ||||
|     //                [ 6.3075886, 53.3635702 ], | ||||
|     //                [ 6.3076093, 53.3636191 ], | ||||
|     //                [ 6.3076609, 53.3637669 ], | ||||
|     //                [ 6.3076735, 53.3638141 ], | ||||
|     //                [ 6.3076717, 53.3638452 ], | ||||
|     //                [ 6.3076566, 53.3638765 ], | ||||
|     //                [ 6.3076265, 53.3639037 ], | ||||
|     //                [ 6.3075848, 53.3639245 ], | ||||
|     //                [ 6.3075321, 53.3639382 ], | ||||
|     //                [ 6.3074494, 53.3639508 ], | ||||
|     //                [ 6.3073665, 53.3639632 ], | ||||
|     //                [ 6.3072835, 53.3639758 ], | ||||
|     //                [ 6.3072006, 53.3639884 ], | ||||
|     //                [ 6.3071179, 53.3640008 ], | ||||
|     //                [ 6.307035, 53.3640134 ], | ||||
|     //                [ 6.306952, 53.3640258 ], | ||||
|     //                [ 6.3068693, 53.3640384 ], | ||||
|     //                [ 6.3067864, 53.3640509 ], | ||||
|     //                [ 6.3067035, 53.3640634 ], | ||||
|     //                [ 6.3066207, 53.3640759 ], | ||||
|     //                [ 6.3065378, 53.3640884 ], | ||||
|     //                [ 6.3064549, 53.364101 ], | ||||
|     //                [ 6.306372, 53.3641135 ], | ||||
|     //                [ 6.3062892, 53.364126 ], | ||||
|     //                [ 6.3062063, 53.3641385 ], | ||||
|     //                [ 6.3061234, 53.364151 ], | ||||
|     //                [ 6.305889, 53.3641875 ], | ||||
|     //                [ 6.3058018, 53.3642004 ], | ||||
|     //                [ 6.3057146, 53.3642134 ], | ||||
|     //                [ 6.3056273, 53.3642265 ], | ||||
|     //                [ 6.3055401, 53.3642395 ], | ||||
|     //                [ 6.3054529, 53.3642525 ], | ||||
|     //                [ 6.3053655, 53.3642655 ], | ||||
|     //                [ 6.3052782, 53.3642785 ], | ||||
|     //                [ 6.3051975, 53.3642908 ], | ||||
|     //                [ 6.3051167, 53.3643032 ], | ||||
|     //                [ 6.3050358, 53.3643154 ], | ||||
|     //                [ 6.304955, 53.3643277 ], | ||||
|     //                [ 6.3048741, 53.3643401 ], | ||||
|     //                [ 6.3047933, 53.3643523 ], | ||||
|     //                [ 6.3047126, 53.3643647 ], | ||||
|     //                [ 6.3046316, 53.364377 ], | ||||
|     //                [ 6.3045509, 53.3643893 ], | ||||
|     //                [ 6.3044701, 53.3644016 ], | ||||
|     //                [ 6.3043892, 53.3644139 ], | ||||
|     //                [ 6.3043086, 53.3644261 ], | ||||
|     //                [ 6.304228, 53.3644382 ], | ||||
|     //                [ 6.3041476, 53.3644503 ], | ||||
|     //                [ 6.304067, 53.3644624 ], | ||||
|     //                [ 6.3039864, 53.3644746 ], | ||||
|     //                [ 6.3039059, 53.3644868 ], | ||||
|     //                [ 6.3038253, 53.3644989 ], | ||||
|     //                [ 6.3037447, 53.3645111 ], | ||||
|     //                [ 6.3036641, 53.3645232 ], | ||||
|     //                [ 6.3035835, 53.3645353 ], | ||||
|     //                [ 6.303503, 53.3645474 ], | ||||
|     //                [ 6.3034224, 53.3645596 ], | ||||
|     //                [ 6.3033418, 53.3645717 ], | ||||
|     //                [ 6.3032344, 53.3645896 ], | ||||
|     //                [ 6.3029993, 53.364623 ], | ||||
|     //                [ 6.3028959, 53.3646389 ], | ||||
|     //                [ 6.3027925, 53.3646549 ], | ||||
|     //                [ 6.3026889, 53.3646708 ], | ||||
|     //                [ 6.3025855, 53.3646868 ], | ||||
|     //                [ 6.3024821, 53.3647026 ], | ||||
|     //                [ 6.3024042, 53.3647144 ], | ||||
|     //                [ 6.3023261, 53.3647261 ], | ||||
|     //                [ 6.3022482, 53.3647378 ], | ||||
|     //                [ 6.3021702, 53.3647495 ], | ||||
|     //                [ 6.3020923, 53.3647612 ], | ||||
|     //                [ 6.3020142, 53.364773 ], | ||||
|     //                [ 6.3019363, 53.3647847 ], | ||||
|     //                [ 6.3018585, 53.3647964 ], | ||||
|     //                [ 6.3017804, 53.3648081 ], | ||||
|     //                [ 6.3017025, 53.3648198 ], | ||||
|     //                [ 6.3016245, 53.3648315 ], | ||||
|     //                [ 6.3015466, 53.3648433 ], | ||||
|     //                [ 6.3014687, 53.364855 ], | ||||
|     //                [ 6.3013906, 53.3648667 ], | ||||
|     //                [ 6.3013128, 53.3648784 ], | ||||
|     //                [ 6.3012347, 53.3648901 ], | ||||
|     //                [ 6.3011568, 53.3649018 ], | ||||
|     //                [ 6.3010788, 53.3649136 ], | ||||
|     //                [ 6.3010009, 53.3649253 ], | ||||
|     //                [ 6.300923, 53.364937 ], | ||||
|     //                [ 6.3008449, 53.3649487 ], | ||||
|     //                [ 6.300767, 53.3649604 ], | ||||
|     //                [ 6.300689, 53.3649721 ], | ||||
|     //                [ 6.3006111, 53.3649839 ], | ||||
|     //                [ 6.300533, 53.3649956 ], | ||||
|     //                [ 6.3004552, 53.3650073 ], | ||||
|     //                [ 6.3003771, 53.365019 ], | ||||
|     //                [ 6.3002992, 53.3650307 ], | ||||
|     //                [ 6.3002213, 53.3650425 ], | ||||
|     //                [ 6.3001433, 53.3650542 ], | ||||
|     //                [ 6.3000654, 53.3650659 ], | ||||
|     //                [ 6.2999843, 53.3650783 ], | ||||
|     //                [ 6.2999033, 53.3650905 ], | ||||
|     //                [ 6.2998224, 53.3651029 ], | ||||
|     //                [ 6.2997415, 53.3651151 ], | ||||
|     //                [ 6.2996603, 53.3651274 ], | ||||
|     //                [ 6.2995794, 53.3651398 ], | ||||
|     //                [ 6.2994985, 53.365152 ], | ||||
|     //                [ 6.2994175, 53.3651644 ], | ||||
|     //                [ 6.2993364, 53.3651767 ], | ||||
|     //                [ 6.2992623, 53.3651849 ], | ||||
|     //                [ 6.2992157, 53.3651857 ], | ||||
|     //                [ 6.2991679, 53.365182 ], | ||||
|     //                [ 6.2991157, 53.3651694 ], | ||||
|     //                [ 6.2990734, 53.3651492 ], | ||||
|     //                [ 6.2990423, 53.3651248 ], | ||||
|     //                [ 6.299008, 53.3650764 ], | ||||
|     //                [ 6.2989616, 53.3649669 ], | ||||
|     //                [ 6.2989414, 53.3649136 ], | ||||
|     //                [ 6.2989213, 53.3648604 ], | ||||
|     //                [ 6.2989011, 53.3648072 ], | ||||
|     //                [ 6.298881, 53.3647538 ], | ||||
|     //                [ 6.2988608, 53.3647006 ], | ||||
|     //                [ 6.2988407, 53.3646474 ], | ||||
|     //                [ 6.2988206, 53.3645941 ], | ||||
|     //                [ 6.2987995, 53.3645407 ], | ||||
|     //                [ 6.2987785, 53.3644873 ], | ||||
|     //                [ 6.2987574, 53.3644339 ], | ||||
|     //                [ 6.2987364, 53.3643805 ], | ||||
|     //                [ 6.2987153, 53.3643271 ], | ||||
|     //                [ 6.2986943, 53.3642738 ], | ||||
|     //                [ 6.2986731, 53.3642204 ], | ||||
|     //                [ 6.298654, 53.364171 ], | ||||
|     //                [ 6.2986349, 53.3641217 ], | ||||
|     //                [ 6.2986159, 53.3640723 ], | ||||
|     //                [ 6.2985968, 53.3640229 ], | ||||
|     //                [ 6.2985777, 53.3639736 ], | ||||
|     //                [ 6.2985587, 53.3639242 ], | ||||
|     //                [ 6.2985396, 53.3638748 ], | ||||
|     //                [ 6.2985205, 53.3638254 ], | ||||
|     //                [ 6.2985015, 53.3637761 ], | ||||
|     //                [ 6.2984826, 53.3637267 ], | ||||
|     //                [ 6.2984571, 53.3636525 ], | ||||
|     //                [ 6.2984554, 53.3636239 ], | ||||
|     //                [ 6.2984678, 53.3635953 ], | ||||
|     //                [ 6.2984948, 53.3635675 ], | ||||
|     //                [ 6.2985616, 53.3635415 ], | ||||
|     //                [ 6.2986411, 53.3635329 ], | ||||
|     //                [ 6.2987148, 53.363522 ], | ||||
|     //                [ 6.2987885, 53.3635112 ], | ||||
|     //                [ 6.2988625, 53.3635003 ], | ||||
|     //                [ 6.2989362, 53.3634895 ], | ||||
|     //                [ 6.29901, 53.3634786 ], | ||||
|     //                [ 6.2990837, 53.3634678 ], | ||||
|     //                [ 6.2991574, 53.363457 ], | ||||
|     //                [ 6.2992312, 53.3634461 ], | ||||
|     //                [ 6.2993049, 53.3634353 ], | ||||
|     //                [ 6.2993787, 53.3634244 ], | ||||
|     //                [ 6.2994524, 53.3634136 ], | ||||
|     //                [ 6.2995262, 53.3634028 ], | ||||
|     //                [ 6.2995999, 53.3633919 ], | ||||
|     //                [ 6.2996737, 53.3633811 ], | ||||
|     //                [ 6.2997474, 53.3633702 ], | ||||
|     //                [ 6.2998211, 53.3633594 ], | ||||
|     //                [ 6.2998949, 53.3633486 ], | ||||
|     //                [ 6.2999686, 53.3633376 ], | ||||
|     //                [ 6.3000424, 53.3633268 ], | ||||
|     //                [ 6.3001161, 53.3633159 ], | ||||
|     //                [ 6.3001899, 53.3633051 ], | ||||
|     //                [ 6.3002636, 53.3632943 ], | ||||
|     //                [ 6.3003374, 53.3632834 ], | ||||
|     //                [ 6.3004111, 53.3632726 ], | ||||
|     //                [ 6.3004848, 53.3632617 ], | ||||
|     //                [ 6.3005588, 53.3632509 ], | ||||
|     //                [ 6.3006325, 53.36324 ], | ||||
|     //                [ 6.3007063, 53.3632292 ], | ||||
|     //                [ 6.30078, 53.3632184 ], | ||||
|     //                [ 6.3008537, 53.3632075 ], | ||||
|     //                [ 6.3009275, 53.3631967 ], | ||||
|     //                [ 6.3010012, 53.3631858 ], | ||||
|     //                [ 6.301075, 53.363175 ], | ||||
|     //                [ 6.3011487, 53.3631642 ], | ||||
|     //                [ 6.3012225, 53.3631533 ], | ||||
|     //                [ 6.3012962, 53.3631425 ], | ||||
|     //                [ 6.30137, 53.3631316 ], | ||||
|     //                [ 6.3014437, 53.3631208 ], | ||||
|     //                [ 6.3015174, 53.36311 ], | ||||
|     //                [ 6.3015912, 53.3630991 ], | ||||
|     //                [ 6.3016649, 53.3630883 ], | ||||
|     //                [ 6.3017387, 53.3630774 ], | ||||
|     //                [ 6.3018124, 53.3630666 ], | ||||
|     //                [ 6.3018862, 53.3630558 ], | ||||
|     //                [ 6.3019599, 53.3630449 ], | ||||
|     //                [ 6.3020337, 53.3630341 ], | ||||
|     //                [ 6.3021074, 53.3630232 ], | ||||
|     //                [ 6.3021811, 53.3630124 ], | ||||
|     //                [ 6.3022549, 53.3630016 ], | ||||
|     //                [ 6.3023286, 53.3629907 ], | ||||
|     //                [ 6.3024026, 53.3629799 ], | ||||
|     //                [ 6.3024763, 53.362969 ], | ||||
|     //                [ 6.30255, 53.3629582 ], | ||||
|     //                [ 6.3026238, 53.3629474 ], | ||||
|     //                [ 6.3026975, 53.3629365 ], | ||||
|     //                [ 6.3027713, 53.3629256 ], | ||||
|     //                [ 6.302845, 53.3629147 ], | ||||
|     //                [ 6.3029188, 53.3629039 ], | ||||
|     //                [ 6.3029925, 53.362893 ], | ||||
|     //                [ 6.3030663, 53.3628822 ], | ||||
|     //                [ 6.30314, 53.3628714 ], | ||||
|     //                [ 6.3032137, 53.3628605 ], | ||||
|     //                [ 6.3032875, 53.3628497 ], | ||||
|     //                [ 6.3033612, 53.3628388 ], | ||||
|     //                [ 6.303435, 53.362828 ], | ||||
|     //                [ 6.3035087, 53.3628172 ], | ||||
|     //                [ 6.3035825, 53.3628063 ], | ||||
|     //                [ 6.3036562, 53.3627955 ], | ||||
|     //                [ 6.30373, 53.3627846 ], | ||||
|     //                [ 6.3038037, 53.3627738 ], | ||||
|     //                [ 6.3038774, 53.362763 ], | ||||
|     //                [ 6.3039512, 53.3627521 ], | ||||
|     //                [ 6.3040249, 53.3627413 ], | ||||
|     //                [ 6.3040987, 53.3627304 ], | ||||
|     //                [ 6.3041724, 53.3627196 ], | ||||
|     //                [ 6.3042462, 53.3627088 ], | ||||
|     //                [ 6.3043199, 53.3626979 ], | ||||
|     //                [ 6.3043937, 53.3626871 ], | ||||
|     //                [ 6.3044674, 53.3626762 ], | ||||
|     //                [ 6.3045413, 53.3626654 ], | ||||
|     //                [ 6.3046151, 53.3626545 ], | ||||
|     //                [ 6.3046888, 53.3626436 ], | ||||
|     //                [ 6.3047626, 53.3626328 ], | ||||
|     //                [ 6.3048363, 53.3626219 ], | ||||
|     //                [ 6.30491, 53.3626111 ], | ||||
|     //                [ 6.3049838, 53.3626002 ], | ||||
|     //                [ 6.3050575, 53.3625894 ], | ||||
|     //                [ 6.3051313, 53.3625786 ], | ||||
|     //                [ 6.305205, 53.3625677 ], | ||||
|     //                [ 6.3052788, 53.3625569 ], | ||||
|     //                [ 6.3053525, 53.362546 ], | ||||
|     //                [ 6.3054263, 53.3625352 ], | ||||
|     //                [ 6.3055, 53.3625244 ], | ||||
|     //                [ 6.3055737, 53.3625135 ], | ||||
|     //                [ 6.3056475, 53.3625027 ], | ||||
|     //                [ 6.3057212, 53.3624918 ], | ||||
|     //                [ 6.305795, 53.362481 ], | ||||
|     //                [ 6.3058687, 53.3624701 ], | ||||
|     //                [ 6.3059425, 53.3624593 ], | ||||
|     //                [ 6.3060162, 53.3624485 ], | ||||
|     //                [ 6.30609, 53.3624376 ], | ||||
|     //                [ 6.3061637, 53.3624268 ], | ||||
|     //                [ 6.3062374, 53.3624158 ], | ||||
|     //                [ 6.3063112, 53.362405 ], | ||||
|     //                [ 6.3063849, 53.3623942 ], | ||||
|     //                [ 6.3064587, 53.3623833 ], | ||||
|     //                [ 6.3065324, 53.3623725 ], | ||||
|     //                [ 6.3066062, 53.3623616 ], | ||||
|     //                [ 6.3066799, 53.3623508 ], | ||||
|     //                [ 6.3067537, 53.36234 ], | ||||
|     //                [ 6.3068274, 53.3623291 ], | ||||
|     //                [ 6.3069011, 53.3623183 ], | ||||
|     //                [ 6.3069749, 53.3623074 ], | ||||
|     //                [ 6.3070314, 53.3623125 ], | ||||
|     //                [ 6.3070655, 53.3623397 ] | ||||
| @@ -319,14 +41,14 @@ | ||||
|     //} | ||||
|  | ||||
|     { | ||||
|         "File": "PlantingSampleDataLutum_TEST2.zip", | ||||
|         "OutputFileName": "2021.03.15_vraPoten_SampleData", | ||||
|         "File": "PlantingSampleDataLutum.zip", | ||||
|         "OutputFileName": "2021.04.09_vraPoten_SampleData4", | ||||
|         "FieldName": "lutum", | ||||
|         "PlantingYear": 2021, | ||||
|         "MeanDensity": "30", | ||||
|         "Variation": "20", | ||||
|         "UseShadow": false, | ||||
|         "CountPerArea": true, | ||||
|         "CountPerArea": false, | ||||
|         "geometryJson": { | ||||
|             "type": "Polygon", | ||||
|             "coordinates": [ | ||||
| @@ -341,8 +63,10 @@ | ||||
|         }, | ||||
|  | ||||
|         "GenerateTaskmap": true, | ||||
|         "OutputType": "shape", // "shape" or "isoxml" if isoxml also add ddiCode | ||||
|         "DdiCode": "0001", | ||||
|         "OutputType": "isoxml", // "shape" or "isoxml" if isoxml also add ddiCode | ||||
|         "Precision": "2", | ||||
|         "MaximumClasses": "4", | ||||
|         "DdiCode": "0016", | ||||
|         "CellWidth": "3", | ||||
|         "CellHeight": "10", | ||||
|         "Centered": "true", | ||||
| @@ -351,11 +75,11 @@ | ||||
|             //"coordinates": [ 5.669032078413372, 52.527906465105254 ] // 1 | ||||
|             //"coordinates": [ 5.668860417036520, 52.529299990602986 ] // 2 | ||||
|             //"coordinates": [ 5.671623092321491, 52.529463163999097 ] // 3 | ||||
|             "coordinates": [ 5.668375834141733, 52.527202407445586 ] // 4 | ||||
|             "coordinates": [ 5.671623092321491, 52.529463163999097 ] // 4 | ||||
|         }, | ||||
|         "EndPoint": { | ||||
|             "type": "Point", | ||||
|             "coordinates": [ 5.668263398897563, 52.529744573890817 ] // 1 | ||||
|             "coordinates": [ 5.668860417036520, 52.529299990602986 ] // 1 | ||||
|             //"coordinates": [ 5.668860417036520, 52.529299990602986 ] // 2 | ||||
|             //"coordinates": [ 5.671623092321491, 52.529463163999097 ] // 3 | ||||
|             //"coordinates": [ 5.671853762296686, 52.528056589415456 ] // 4 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user