Merge pull request #251 from ADAPT/develop

Merge to master for release

Author: strhea

ISOv4Plugin/Mappers/GuidancePatternMapper.cs

@@ -215,7 +215,10 @@ public IEnumerable<GuidancePattern> ImportGuidancePatterns(IEnumerable<ISOGuidan
             foreach (ISOGuidancePattern isoGuidancePattern in isoGuidancePatterns)
             {
                 GuidancePattern adaptGuidancePattern = ImportGuidancePattern(isoGuidancePattern);
-                adaptGuidancePatterns.Add(adaptGuidancePattern);
+                if (adaptGuidancePattern != null)
+                {
+                    adaptGuidancePatterns.Add(adaptGuidancePattern);
+                }
             }
 
             //Add the patterns to the Catalog
@@ -236,7 +239,13 @@ public GuidancePattern ImportGuidancePattern(ISOGuidancePattern isoGuidancePatte
             GuidancePattern pattern = null;
             LineStringMapper lineStringMapper = new LineStringMapper(TaskDataMapper);
             PointMapper pointMapper = new PointMapper(TaskDataMapper);
-            var isoLineString = isoGuidancePattern.LineString ?? new ISOLineString();
+            ISOLineString isoLineString = isoGuidancePattern.LineString;
+            if ((isoLineString?.Points?.Count ?? 0) == 0)
+            {
+                TaskDataMapper.AddError($"Guidance pattern {isoGuidancePattern.GuidancePatternDesignator} is invalid. Skipping.");
+                return null;
+            }
+
             switch (isoGuidancePattern.GuidancePatternType)
             {
                 case ISOGuidancePatternType.AB:

ISOv4Plugin/Mappers/Manufacturers/CNH.cs

@@ -254,7 +254,8 @@ public IEnumerable<OperationData> PostProcessOperationData(TaskDataMapper taskDa
                 }
 
                 if (!string.IsNullOrEmpty(cropNameFromTask) &&
-                    operationData.OperationType != OperationTypeEnum.DataCollection &&
+                    (operationData.OperationType == OperationTypeEnum.Harvesting ||
+                    operationData.OperationType == OperationTypeEnum.ForageHarvesting) &&
                     (operationData.ProductIds == null || operationData.ProductIds.Count == 0))
                 {
                     operationData.ProductIds = new List<int>

ISOv4Plugin/Mappers/TimeLogMapper.cs

@@ -408,7 +408,9 @@ protected IEnumerable<OperationData> ImportTimeLog(ISOTask loggedTask, ISOTimeLo
                         operationData.DeviceElementUses = sectionMapper.ConvertToBaseTypes(sections.ToList());
                         operationData.GetDeviceElementUses = x => operationData.DeviceElementUses.Where(s => s.Depth == x).ToList();
                         operationData.PrescriptionId = prescriptionID;
-                        operationData.OperationType = GetOperationTypeFromProductCategory(productIDs) ?? GetOperationTypeFromLoggingDevices(time);
+                        operationData.OperationType = GetOperationTypeFromProductCategory(productIDs) ??
+                                                      GetOperationTypeFromWorkingDatas(workingDatas) ??
+                                                      GetOperationTypeFromLoggingDevices(time);
                         operationData.ProductIds = productIDs;
                         if (!useDeferredExecution)
                         {
@@ -426,6 +428,24 @@ protected IEnumerable<OperationData> ImportTimeLog(ISOTask loggedTask, ISOTimeLo
             return null;
         }
 
+        private OperationTypeEnum? GetOperationTypeFromWorkingDatas(List<WorkingData> workingDatas)
+        {
+            //Harvest/ForageHarvest omitted intentionally to be determined from machine type vs. working data
+            if (workingDatas.Any(w => w.Representation.Code.Contains("Seed")))
+            {
+                return OperationTypeEnum.SowingAndPlanting;
+            }
+            else if (workingDatas.Any(w => w.Representation.Code.Contains("Tillage")))
+            {
+                return OperationTypeEnum.Tillage;
+            }
+            if (workingDatas.Any(w => w.Representation.Code.Contains("AppRate")))
+            {
+                return OperationTypeEnum.Unknown; //We can't differentiate CropProtection from Fertilizing, but prefer unkonwn to letting implement type set to SowingAndPlanting
+            }
+            return null;
+        }
+
         private List<List<string>> SplitElementsByProductProperties(Dictionary<string, List<ISOProductAllocation>> productAllocations, HashSet<string> loggedDeviceElementIds, ISODevice dvc)
         {
             //This function splits device elements logged by single TimeLog into groups based

ISOv4Plugin/Plugin.cs

@@ -41,13 +41,15 @@ public void Export(ApplicationDataModel.ADM.ApplicationDataModel dataModel, stri
             ISO11783_TaskData taskData = taskDataMapper.Export(dataModel);
 
             //Serialize the ISO model to XML
-            TaskDocumentWriter writer = new TaskDocumentWriter();
-            writer.WriteTaskData(outputPath, taskData);
-
-            //Serialize the Link List
-            if (taskData.Version > 3)
+            using (TaskDocumentWriter writer = new TaskDocumentWriter())
             {
-                writer.WriteLinkList(outputPath, taskData.LinkList);
+                writer.WriteTaskData(outputPath, taskData);
+
+                //Serialize the Link List
+                if (taskData.Version > 3)
+                {
+                    writer.WriteLinkList(outputPath, taskData.LinkList);
+                }
             }
         }