From c1ebd16837aab70d4057a052b6aa649ee6d51a9d Mon Sep 17 00:00:00 2001
From: Eric Pohl <eric.pohl@corteva.com>
Date: Thu, 9 Oct 2025 10:14:24 -0400
Subject: [PATCH 1/2] Construct DateTime objects with Local DateTimeKind

---
 ISOv4Plugin/Mappers/TimeLogMapper.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ISOv4Plugin/Mappers/TimeLogMapper.cs b/ISOv4Plugin/Mappers/TimeLogMapper.cs
index 4922ace..5c336a7 100644
--- a/ISOv4Plugin/Mappers/TimeLogMapper.cs
+++ b/ISOv4Plugin/Mappers/TimeLogMapper.cs
@@ -150,7 +150,7 @@ private class BinaryWriter
         {   // ATTENTION: CoordinateMultiplier and ZMultiplier also exist in Import\SpatialRecordMapper.cs!
             private const double CoordinateMultiplier = 0.0000001;
             private const double ZMultiplier = 0.001;   // In ISO the PositionUp value is specified in mm.
-            private readonly DateTime _januaryFirst1980 = new DateTime(1980, 1, 1);
+            private readonly DateTime _januaryFirst1980 = new DateTime(1980, 1, 1, 0, 0, 0, DateTimeKind.Local);
 
             private readonly IEnumeratedValueMapper _enumeratedValueMapper;
             private readonly INumericValueMapper _numericValueMapper;
@@ -753,7 +753,7 @@ internal static Dictionary<byte, int> ReadImplementGeometryValues(IEnumerable<by
 
         protected class BinaryReader
         {
-            private static readonly DateTime _firstDayOf1980 = new DateTime(1980, 01, 01);
+            private static readonly DateTime _firstDayOf1980 = new DateTime(1980, 1, 1, 0, 0, 0, DateTimeKind.Local);
 
             public static Dictionary<byte, int> ReadImplementGeometryValues(string filePath, ISOTime templateTime, IEnumerable<byte> desiredDLVIndices, int version, IList<IError> errors)
             {

From 5624d23d0f305cbf3a10093e4d421bf314ac7560 Mon Sep 17 00:00:00 2001
From: Eric Pohl <eric.pohl@corteva.com>
Date: Thu, 9 Oct 2025 10:34:01 -0400
Subject: [PATCH 2/2] Consolidate "first day of 1980" fields

---
 ISOv4Plugin/Mappers/TimeLogMapper.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ISOv4Plugin/Mappers/TimeLogMapper.cs b/ISOv4Plugin/Mappers/TimeLogMapper.cs
index 5c336a7..13a39bb 100644
--- a/ISOv4Plugin/Mappers/TimeLogMapper.cs
+++ b/ISOv4Plugin/Mappers/TimeLogMapper.cs
@@ -33,6 +33,8 @@ internal TimeLogMapper(TaskDataMapper taskDataMapper) : base(taskDataMapper, "TL
         {
         }
 
+        private static readonly DateTime _firstDayOf1980 = new DateTime(1980, 1, 1, 0, 0, 0, DateTimeKind.Local);
+
         #region Export
         private Dictionary<int, int> _dataLogValueOrdersByWorkingDataID;
         public IEnumerable<ISOTimeLog> ExportTimeLogs(IEnumerable<OperationData> operationDatas, string dataPath)
@@ -150,7 +152,6 @@ private class BinaryWriter
         {   // ATTENTION: CoordinateMultiplier and ZMultiplier also exist in Import\SpatialRecordMapper.cs!
             private const double CoordinateMultiplier = 0.0000001;
             private const double ZMultiplier = 0.001;   // In ISO the PositionUp value is specified in mm.
-            private readonly DateTime _januaryFirst1980 = new DateTime(1980, 1, 1, 0, 0, 0, DateTimeKind.Local);
 
             private readonly IEnumeratedValueMapper _enumeratedValueMapper;
             private readonly INumericValueMapper _numericValueMapper;
@@ -193,7 +194,7 @@ private void WriteSpatialRecord(SpatialRecord spatialRecord, List<WorkingData> m
                 var millisecondsSinceMidnight = (UInt32)new TimeSpan(0, spatialRecord.Timestamp.Hour, spatialRecord.Timestamp.Minute, spatialRecord.Timestamp.Second, spatialRecord.Timestamp.Millisecond).TotalMilliseconds;
                 memoryStream.Write(BitConverter.GetBytes(millisecondsSinceMidnight), 0, 4);
 
-                var daysSinceJanOne1980 = (UInt16)(spatialRecord.Timestamp - (_januaryFirst1980)).TotalDays;
+                var daysSinceJanOne1980 = (UInt16)(spatialRecord.Timestamp - _firstDayOf1980).TotalDays;
                 memoryStream.Write(BitConverter.GetBytes(daysSinceJanOne1980), 0, 2);
 
                 //Position
@@ -753,8 +754,6 @@ internal static Dictionary<byte, int> ReadImplementGeometryValues(IEnumerable<by
 
         protected class BinaryReader
         {
-            private static readonly DateTime _firstDayOf1980 = new DateTime(1980, 1, 1, 0, 0, 0, DateTimeKind.Local);
-
             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>();