#519 fix mmgisAPI.setTime start (#520)

NASA-AMMOS · Mar 27, 2024 · 39b221a · 39b221a
1 parent 9a99195
commit 39b221a
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 9 deletions.
diff --git a/src/essence/Ancillary/TimeControl.js b/src/essence/Ancillary/TimeControl.js
@@ -114,12 +114,12 @@ var TimeControl = {
                     .toISOString()
                     .split('.')[0] + 'Z'
         }
-        TimeControl.timeUI.updateTimes(
+
+        return TimeControl.timeUI.updateTimes(
             TimeControl.startTime,
             TimeControl.endTime,
             TimeControl.currentTime
         )
-        return true
     },
     setLayerTime: function (layer, startTime, endTime) {
         if (typeof layer == 'string') {

diff --git a/src/essence/Ancillary/TimeUI.js b/src/essence/Ancillary/TimeUI.js
@@ -866,25 +866,57 @@ const TimeUI = {
         let date
 
         // Start
+        let offsetStartDate = null
+        let parsedStart = null
         if (start != null) {
             date = new Date(start)
-            const offsetStartDate = TimeUI.addOffset(date)
-            const parsedStart = TimeUI.startTempus.dates.parseInput(
+            offsetStartDate = TimeUI.addOffset(date)
+            parsedStart = TimeUI.startTempus.dates.parseInput(
                 new Date(offsetStartDate)
             )
-            TimeUI.startTempus.dontChangeNext = true
-            TimeUI.startTempus.dates.setValue(parsedStart)
         }
-
         // End
+        let offsetEndDate = null
+        let parsedEnd = null
         if (end != null) {
             date = new Date(end)
-            const offsetEndDate = new Date(
+            offsetEndDate = new Date(
                 date.getTime() + date.getTimezoneOffset() * 60000
             )
-            const parsedEnd = TimeUI.endTempus.dates.parseInput(
+            parsedEnd = TimeUI.endTempus.dates.parseInput(
                 new Date(offsetEndDate)
             )
+        }
+
+        if (parsedStart != null && parsedEnd != null) {
+            if (offsetStartDate.getTime() > offsetEndDate.getTime()) {
+                console.warn(
+                    `updateTimes: Cannot set start time after end time. ${parsedStart} > ${parseEnd}`
+                )
+                return false
+            }
+        }
+
+        if (parsedStart != null) {
+            TimeUI.endTempus.updateOptions({
+                restrictions: {
+                    minDate: parsedStart,
+                },
+            })
+        }
+        if (parsedEnd != null) {
+            TimeUI.startTempus.updateOptions({
+                restrictions: {
+                    maxDate: parsedEnd,
+                },
+            })
+        }
+
+        if (parsedStart) {
+            TimeUI.startTempus.dontChangeNext = true
+            TimeUI.startTempus.dates.setValue(parsedStart)
+        }
+        if (parsedEnd) {
             TimeUI.endTempus.dontChangeNext = true
             TimeUI.endTempus.dates.setValue(parsedEnd)
         }
@@ -896,6 +928,7 @@ const TimeUI = {
         }
 
         TimeUI.change()
+        return true
     },
     setStartTime(
         ISOString,