Catch OverflowException in BinaryReader.ReadImplementGeometryValues (#245)

and add the error to plugin errors collection
Handle null TaskMapper.DeviceElementHierarchies in TimeLogMapper.ImportTimeLog()
Remove duplicate using statement in GuidancePatternMapper

Co-authored-by: Eric Pohl <eric.pohl@corteva.com>

Author: ericpohl

ISOv4Plugin/Mappers/GuidancePatternMapper.cs

@@ -13,7 +13,6 @@
 using AgGateway.ADAPT.ISOv4Plugin.ISOEnumerations;
 using AgGateway.ADAPT.ISOv4Plugin.ISOModels;
 using AgGateway.ADAPT.Representation.UnitSystem;
-using AgGateway.ADAPT.ISOv4Plugin.ExtensionMethods;
 
 namespace AgGateway.ADAPT.ISOv4Plugin.Mappers
 {

ISOv4Plugin/Mappers/TimeLogMapper.cs

@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using AgGateway.ADAPT.ApplicationDataModel.ADM;
 using AgGateway.ADAPT.ApplicationDataModel.Common;
 using AgGateway.ADAPT.ApplicationDataModel.Equipment;
 using AgGateway.ADAPT.ApplicationDataModel.LoggedData;
@@ -347,7 +348,7 @@ protected IEnumerable<OperationData> ImportTimeLog(ISOTask loggedTask, ISOTimeLo
                 Dictionary<ISODevice, HashSet<string>> loggedDeviceElementsByDevice = new Dictionary<ISODevice, HashSet<string>>();
                 foreach (string deviceElementID in deviceElementIDs)
                 {
-                    ISODeviceElement isoDeviceElement = TaskDataMapper.DeviceElementHierarchies.GetISODeviceElementFromID(deviceElementID);
+                    ISODeviceElement isoDeviceElement = TaskDataMapper.DeviceElementHierarchies?.GetISODeviceElementFromID(deviceElementID);
                     if (isoDeviceElement != null)
                     {
                         ISODevice device = isoDeviceElement.Device;
@@ -724,16 +725,16 @@ protected virtual IEnumerable<ISOSpatialRow> ReadTimeLog(ISOTimeLog timeLog, str
             return null;
         }
 
-        internal static Dictionary<byte, int> ReadImplementGeometryValues(IEnumerable<byte> dlvsToRead, ISOTime templateTime, string filePath, int version)
+        internal static Dictionary<byte, int> ReadImplementGeometryValues(IEnumerable<byte> dlvsToRead, ISOTime templateTime, string filePath, int version, IList<IError> errors)
         {
-            return BinaryReader.ReadImplementGeometryValues(filePath, templateTime, dlvsToRead, version);
+            return BinaryReader.ReadImplementGeometryValues(filePath, templateTime, dlvsToRead, version, errors);
         }
 
         protected class BinaryReader
         {
             private static readonly DateTime _firstDayOf1980 = new DateTime(1980, 01, 01);
 
-            public static Dictionary<byte, int> ReadImplementGeometryValues(string filePath, ISOTime templateTime, IEnumerable<byte> desiredDLVIndices, int version)
+            public static Dictionary<byte, int> ReadImplementGeometryValues(string filePath, ISOTime templateTime, IEnumerable<byte> desiredDLVIndices, int version, IList<IError> errors)
             {
                 Dictionary<byte, int> output = new Dictionary<byte, int>();
                 List<byte> desiredIndexes = desiredDLVIndices.ToList();
@@ -775,14 +776,22 @@ public static Dictionary<byte, int> ReadImplementGeometryValues(string filePath,
                                     {
                                         //A desired DLV is reported here
                                         int value = ReadInt32(null, true, false, binaryReader).GetValueOrDefault();
-                                        if (!output.ContainsKey(dlvIndex))
+                                        try
                                         {
-                                            output.Add(dlvIndex, value);
+                                            if (!output.ContainsKey(dlvIndex))
+                                            {
+                                                output.Add(dlvIndex, value);
+                                            }
+                                            else if (Math.Abs(value) > Math.Abs(output[dlvIndex]))
+                                            {
+                                                //Values should be all the same, but prefer the furthest from 0
+                                                output[dlvIndex] = value;
+                                            }
                                         }
-                                        else if (Math.Abs(value) > Math.Abs(output[dlvIndex]))
+                                        catch (OverflowException ex)
                                         {
-                                            //Values should be all the same, but prefer the furthest from 0
-                                            output[dlvIndex] = value;
+                                            // If value == int.MinValue, Math.Abs(value) will throw System.OverflowException: Negating the minimum value of a twos complement number is invalid.
+                                            errors.Add(new Error() { Description = ex.Message, Id = ex.GetType().ToString(), Source = ex.Source, StackTrace = ex.StackTrace });
                                         }
                                     }
                                     else
@@ -1047,7 +1056,7 @@ private static SpatialValue CreateSpatialValue(ISOTime templateTime, byte order,
                 if (matchingDlv == null)
                     return null;
 
-                ISODeviceElement det = deviceHierarchies.GetISODeviceElementFromID(matchingDlv.DeviceElementIdRef);
+                ISODeviceElement det = deviceHierarchies?.GetISODeviceElementFromID(matchingDlv.DeviceElementIdRef);
                 ISODevice dvc = det?.Device;
                 ISODeviceProcessData dpd = dvc?.FirstOrDefaultDeviceProcessData(matchingDlv.ProcessDataIntDDI);
 

ISOv4Plugin/ObjectModel/DeviceElementHierarchy.cs

@@ -11,16 +11,17 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.IO;
-using System.Runtime.InteropServices;
-using System.Security.Cryptography.X509Certificates;
 using AgGateway.ADAPT.ApplicationDataModel.Equipment;
 using AgGateway.ADAPT.ISOv4Plugin.Mappers.Manufacturers;
 using AgGateway.ADAPT.ISOv4Plugin.Mappers;
+using AgGateway.ADAPT.ApplicationDataModel.ADM;
 
 namespace AgGateway.ADAPT.ISOv4Plugin.ObjectModel
 {
     public class DeviceElementHierarchies
     {
+        private readonly List<IError> _errors;
+
         public DeviceElementHierarchies(IEnumerable<ISODevice> devices,
                                         RepresentationMapper representationMapper,
                                         bool mergeBins,
@@ -29,6 +30,7 @@ public DeviceElementHierarchies(IEnumerable<ISODevice> devices,
                                         TaskDataMapper taskDataMapper)
         {
             Items = new Dictionary<string, DeviceHierarchyElement>();
+            _errors = taskDataMapper.Errors;
 
             //Track any device element geometries not logged as a DPT
             Dictionary<string, List<string>> missingGeometryDefinitions = new Dictionary<string, List<string>>();
@@ -156,7 +158,7 @@ public void FillDPDGeometryDefinitions(Dictionary<string, List<string>> missingD
                         string binaryPath = taskDataPath.GetDirectoryFiles(binaryName, SearchOption.TopDirectoryOnly).FirstOrDefault();
                         if (binaryPath != null)
                         {
-                            Dictionary<byte, int> timelogValues = Mappers.TimeLogMapper.ReadImplementGeometryValues(dlvsToRead.Select(d => d.Index), time, binaryPath, version);
+                            Dictionary<byte, int> timelogValues = Mappers.TimeLogMapper.ReadImplementGeometryValues(dlvsToRead.Select(d => d.Index), time, binaryPath, version, _errors);
 
                             foreach (byte reportedDLVIndex in timelogValues.Keys)
                             {