@opengeoweb/core 4.11.0 → 4.13.0

package/index.esm.js

@@ -1101,6 +1101,8 @@ var createMap = function createMap(_ref) {
       animationEndTime = _ref$animationEndTime === void 0 ? moment.utc(moment().unix() * 1000).subtract(10, 'm').format(dateFormat) : _ref$animationEndTime,
       _ref$isAutoUpdating = _ref.isAutoUpdating,
       isAutoUpdating = _ref$isAutoUpdating === void 0 ? false : _ref$isAutoUpdating,
+      _ref$isEndTimeOverrid = _ref.isEndTimeOverriding,
+      isEndTimeOverriding = _ref$isEndTimeOverrid === void 0 ? false : _ref$isEndTimeOverrid,
       _ref$bbox = _ref.bbox,
       bbox = _ref$bbox === void 0 ? {
     left: -19000000,
@@ -1152,6 +1154,7 @@ var createMap = function createMap(_ref) {
     animationStartTime: animationStartTime,
     animationEndTime: animationEndTime,
     isAutoUpdating: isAutoUpdating,
+    isEndTimeOverriding: isEndTimeOverriding,
     srs: srs,
     bbox: bbox,
     baseLayers: baseLayers,
@@ -2578,87 +2581,98 @@ var slice$4 = createSlice({
 
       draft.byId[mapId].isAutoUpdating = shouldAutoUpdate;
     },
-    toggleTimestepAuto: function toggleTimestepAuto(draft, action) {
+    setEndTimeOverriding: function setEndTimeOverriding(draft, action) {
       var _action$payload15 = action.payload,
           mapId = _action$payload15.mapId,
-          timestepAuto = _action$payload15.timestepAuto;
+          shouldEndtimeOverride = _action$payload15.shouldEndtimeOverride;
 
       if (!draft.byId[mapId]) {
         return;
       }
 
-      draft.byId[mapId].isTimestepAuto = timestepAuto;
+      draft.byId[mapId].isEndTimeOverriding = shouldEndtimeOverride;
     },
-    toggleTimeSliderHover: function toggleTimeSliderHover(draft, action) {
+    toggleTimestepAuto: function toggleTimestepAuto(draft, action) {
       var _action$payload16 = action.payload,
           mapId = _action$payload16.mapId,
-          isTimeSliderHoverOn = _action$payload16.isTimeSliderHoverOn;
+          timestepAuto = _action$payload16.timestepAuto;
 
       if (!draft.byId[mapId]) {
         return;
       }
 
-      draft.byId[mapId].isTimeSliderHoverOn = isTimeSliderHoverOn;
+      draft.byId[mapId].isTimestepAuto = timestepAuto;
     },
-    toggleTimeSliderIsVisible: function toggleTimeSliderIsVisible(draft, action) {
+    toggleTimeSliderHover: function toggleTimeSliderHover(draft, action) {
       var _action$payload17 = action.payload,
           mapId = _action$payload17.mapId,
-          isTimeSliderVisible = _action$payload17.isTimeSliderVisible;
+          isTimeSliderHoverOn = _action$payload17.isTimeSliderHoverOn;
 
       if (!draft.byId[mapId]) {
         return;
       }
 
-      draft.byId[mapId].isTimeSliderVisible = isTimeSliderVisible;
+      draft.byId[mapId].isTimeSliderHoverOn = isTimeSliderHoverOn;
     },
-    toggleZoomControls: function toggleZoomControls(draft, action) {
+    toggleTimeSliderIsVisible: function toggleTimeSliderIsVisible(draft, action) {
       var _action$payload18 = action.payload,
           mapId = _action$payload18.mapId,
-          shouldShowZoomControls = _action$payload18.shouldShowZoomControls;
+          isTimeSliderVisible = _action$payload18.isTimeSliderVisible;
 
       if (!draft.byId[mapId]) {
         return;
       }
 
-      draft.byId[mapId].shouldShowZoomControls = shouldShowZoomControls;
+      draft.byId[mapId].isTimeSliderVisible = isTimeSliderVisible;
     },
-    setMapPinLocation: function setMapPinLocation(draft, action) {
+    toggleZoomControls: function toggleZoomControls(draft, action) {
       var _action$payload19 = action.payload,
           mapId = _action$payload19.mapId,
-          mapPinLocation = _action$payload19.mapPinLocation;
+          shouldShowZoomControls = _action$payload19.shouldShowZoomControls;
 
       if (!draft.byId[mapId]) {
         return;
       }
 
-      draft.byId[mapId].mapPinLocation = mapPinLocation;
+      draft.byId[mapId].shouldShowZoomControls = shouldShowZoomControls;
     },
-    setDisableMapPin: function setDisableMapPin(draft, action) {
+    setMapPinLocation: function setMapPinLocation(draft, action) {
       var _action$payload20 = action.payload,
           mapId = _action$payload20.mapId,
-          disableMapPin = _action$payload20.disableMapPin;
+          mapPinLocation = _action$payload20.mapPinLocation;
 
       if (!draft.byId[mapId]) {
         return;
       }
 
-      draft.byId[mapId].disableMapPin = disableMapPin;
+      draft.byId[mapId].mapPinLocation = mapPinLocation;
     },
-    toggleMapPinIsVisible: function toggleMapPinIsVisible(draft, action) {
+    setDisableMapPin: function setDisableMapPin(draft, action) {
       var _action$payload21 = action.payload,
           mapId = _action$payload21.mapId,
-          displayMapPin = _action$payload21.displayMapPin;
+          disableMapPin = _action$payload21.disableMapPin;
 
       if (!draft.byId[mapId]) {
         return;
       }
 
-      draft.byId[mapId].displayMapPin = displayMapPin;
+      draft.byId[mapId].disableMapPin = disableMapPin;
     },
-    setDockedLayerManagerSize: function setDockedLayerManagerSize(draft, action) {
+    toggleMapPinIsVisible: function toggleMapPinIsVisible(draft, action) {
       var _action$payload22 = action.payload,
           mapId = _action$payload22.mapId,
-          dockedLayerManagerSize = _action$payload22.dockedLayerManagerSize;
+          displayMapPin = _action$payload22.displayMapPin;
+
+      if (!draft.byId[mapId]) {
+        return;
+      }
+
+      draft.byId[mapId].displayMapPin = displayMapPin;
+    },
+    setDockedLayerManagerSize: function setDockedLayerManagerSize(draft, action) {
+      var _action$payload23 = action.payload,
+          mapId = _action$payload23.mapId,
+          dockedLayerManagerSize = _action$payload23.dockedLayerManagerSize;
 
       if (!draft.byId[mapId]) {
         return;
@@ -2669,9 +2683,9 @@ var slice$4 = createSlice({
   },
   extraReducers: function extraReducers(builder) {
     builder.addCase(addLayer$1, function (draft, action) {
-      var _action$payload23 = action.payload,
-          layerId = _action$payload23.layerId,
-          mapId = _action$payload23.mapId;
+      var _action$payload24 = action.payload,
+          layerId = _action$payload24.layerId,
+          mapId = _action$payload24.mapId;
 
       if (!draft.byId[mapId]) {
         return;
@@ -2688,10 +2702,10 @@ var slice$4 = createSlice({
 
       draft.byId[mapId].mapLayers.unshift(layerId);
     }).addCase(addBaseLayer, function (draft, action) {
-      var _action$payload24 = action.payload,
-          layer = _action$payload24.layer,
-          layerId = _action$payload24.layerId,
-          mapId = _action$payload24.mapId;
+      var _action$payload25 = action.payload,
+          layer = _action$payload25.layer,
+          layerId = _action$payload25.layerId,
+          mapId = _action$payload25.mapId;
 
       if (!draft.byId[mapId]) {
         return;
@@ -2741,9 +2755,9 @@ var slice$4 = createSlice({
         }
       }
     }).addCase(setBaseLayers$1, function (draft, action) {
-      var _action$payload25 = action.payload,
-          layers = _action$payload25.layers,
-          mapId = _action$payload25.mapId; // Split into base and overlayers
+      var _action$payload26 = action.payload,
+          layers = _action$payload26.layers,
+          mapId = _action$payload26.mapId; // Split into base and overlayers
 
       var baseLayers = [];
       var overLayers = [];
@@ -2770,9 +2784,9 @@ var slice$4 = createSlice({
         if (overLayerIds.length !== 0) draft.byId[mapId].overLayers = overLayerIds;
       }
     }).addCase(layerDelete$1, function (draft, action) {
-      var _action$payload26 = action.payload,
-          mapId = _action$payload26.mapId,
-          layerId = _action$payload26.layerId;
+      var _action$payload27 = action.payload,
+          mapId = _action$payload27.mapId,
+          layerId = _action$payload27.layerId;
 
       if (!draft.byId[mapId]) {
         return;
@@ -2793,9 +2807,9 @@ var slice$4 = createSlice({
         draft.byId[mapId].activeLayerId = '';
       }
     }).addCase(baseLayerDelete, function (draft, action) {
-      var _action$payload27 = action.payload,
-          mapId = _action$payload27.mapId,
-          layerId = _action$payload27.layerId;
+      var _action$payload28 = action.payload,
+          mapId = _action$payload28.mapId,
+          layerId = _action$payload28.layerId;
 
       if (!draft.byId[mapId]) {
         return;
@@ -2808,14 +2822,14 @@ var slice$4 = createSlice({
         return id !== layerId;
       });
     }).addCase(layerChangeDimension$1, function (draft, action) {
-      var _action$payload28 = action.payload,
-          layerId = _action$payload28.layerId,
-          dimension = _action$payload28.dimension;
+      var _action$payload29 = action.payload,
+          layerId = _action$payload29.layerId,
+          dimension = _action$payload29.dimension;
       produceDraftStateSetMapDimensionFromLayerChangeDimension(draft, layerId, dimension);
     }).addCase(setTimeSync, function (draft, action) {
-      var _action$payload29 = action.payload,
-          targetsFromAction = _action$payload29.targets,
-          source = _action$payload29.source;
+      var _action$payload30 = action.payload,
+          targetsFromAction = _action$payload30.targets,
+          source = _action$payload30.source;
       /* Because we want backwards compatibility with the previous code, we also need to listen to the original source action */
 
       var targets = [{
@@ -2839,9 +2853,9 @@ var slice$4 = createSlice({
         }
       });
     }).addCase(setBboxSync, function (draft, action) {
-      var _action$payload30 = action.payload,
-          targetsFromAction = _action$payload30.targets,
-          source = _action$payload30.source;
+      var _action$payload31 = action.payload,
+          targetsFromAction = _action$payload31.targets,
+          source = _action$payload31.source;
       /* Because we want backwards compatibility with the previous code, we also need to listen to the original source action */
 
       var targets = [{
@@ -2872,9 +2886,9 @@ var slice$4 = createSlice({
        * These targets can be used as payloads in new Layer actions.
        * These actions are here handled via the layer reducer, as it is the same logic
        */
-      var _action$payload31 = action.payload,
-          targets = _action$payload31.targets,
-          source = _action$payload31.source;
+      var _action$payload32 = action.payload,
+          targets = _action$payload32.targets,
+          source = _action$payload32.source;
       return targets.reduce(function (prevState, target) {
         var action = {
           payload: target,
@@ -2890,9 +2904,9 @@ var slice$4 = createSlice({
       var mapAction = mapActions$1.mapUpdateAllMapDimensions(mapDimensions);
       return reducer$4(draft, mapAction);
     }).addCase(mapChangeDimension, function (draft, action) {
-      var _action$payload32 = action.payload,
-          mapId = _action$payload32.mapId,
-          dimensionFromAction = _action$payload32.dimension;
+      var _action$payload33 = action.payload,
+          mapId = _action$payload33.mapId,
+          dimensionFromAction = _action$payload33.dimension;
       produceDraftStateSetWebMapDimension(draft, mapId, dimensionFromAction, true);
     }).addCase(setMapPreset, function (draft, action) {
       var mapId = action.payload.mapId;
@@ -2914,9 +2928,9 @@ var slice$4 = createSlice({
       draft.byId[mapId].animationDelay = defaultAnimationDelayAtStart;
       draft.byId[mapId].dockedLayerManagerSize = '';
     }).addCase(uiActions.registerDialog, function (draft, action) {
-      var _action$payload33 = action.payload,
-          mapId = _action$payload33.mapId,
-          type = _action$payload33.type;
+      var _action$payload34 = action.payload,
+          mapId = _action$payload34.mapId,
+          type = _action$payload34.type;
 
       if (!draft.byId[mapId]) {
         return;
@@ -4175,6 +4189,18 @@ var getAnimationEndTime$1 = createSelector(getMapById, function (store) {
 var isAutoUpdating = createSelector(getMapById, function (store) {
   return store ? store.isAutoUpdating : false;
 });
+/**
+ * Gets if endTime and duration of animationPayload are overriding maxValue and minValue of leading layer
+ *
+ * Example: isEndTimeOverriding = isEndTimeOverriding(store, 'mapid_1')
+ * @param {object} store store: object - store object
+ * @param {string} mapId mapId: string - Id of the map
+ * @returns {boolean} returnType: boolean
+ */
+
+var isEndTimeOverriding = createSelector(getMapById, function (store) {
+  return store ? store.isEndTimeOverriding : false;
+});
 /**
  * Gets activeLayerId for map
  *
@@ -4604,6 +4630,7 @@ var selectors = /*#__PURE__*/Object.freeze({
   getAnimationStartTime: getAnimationStartTime,
   getAnimationEndTime: getAnimationEndTime$1,
   isAutoUpdating: isAutoUpdating,
+  isEndTimeOverriding: isEndTimeOverriding,
   getActiveLayerId: getActiveLayerId,
   getMapTimeSliderScale: getMapTimeSliderScale,
   getMapTimeStep: getMapTimeStep,
@@ -8183,7 +8210,7 @@ function updateAnimation(mapId, maxValue) {
   }, _marked4$1);
 }
 function setLayerDimensionsSaga(_ref4) {
-  var payload, layerDimensions, dimensions, layerId, layer, newTimeDimension, mapId, activeLayerId, shouldAutoUpdate, prevTimeDimension, isAnimating$1, webmapInstance, isActiveLayer, timeStep, isTimestepAuto$1, newTimeStep;
+  var payload, layerDimensions, dimensions, layerId, layer, newTimeDimension, mapId, activeLayerId, shouldAutoUpdate, shouldEndTimeOverride, prevTimeDimension, isAnimating$1, webmapInstance, isActiveLayer, timeStep, isTimestepAuto$1, newTimeStep;
   return regeneratorRuntime.wrap(function setLayerDimensionsSaga$(_context5) {
     while (1) {
       switch (_context5.prev = _context5.next) {
@@ -8230,59 +8257,64 @@ function setLayerDimensionsSaga(_ref4) {
         case 18:
           shouldAutoUpdate = _context5.sent;
           _context5.next = 21;
-          return select(getLayerTimeDimension, layerId);
+          return select(isEndTimeOverriding, mapId);
 
         case 21:
-          prevTimeDimension = _context5.sent;
+          shouldEndTimeOverride = _context5.sent;
           _context5.next = 24;
-          return select(isAnimating, mapId);
+          return select(getLayerTimeDimension, layerId);
 
         case 24:
+          prevTimeDimension = _context5.sent;
+          _context5.next = 27;
+          return select(isAnimating, mapId);
+
+        case 27:
           isAnimating$1 = _context5.sent;
           webmapInstance = getWMJSMapById(mapId);
           isActiveLayer = layerId === activeLayerId;
-          _context5.next = 29;
+          _context5.next = 32;
           return select(getMapTimeStepWithoutDefault, mapId);
 
-        case 29:
+        case 32:
           timeStep = _context5.sent;
-          _context5.next = 32;
+          _context5.next = 35;
           return select(isTimestepAuto, mapId);
 
-        case 32:
+        case 35:
           isTimestepAuto$1 = _context5.sent;
 
           if (!(isTimestepAuto$1 && isActiveLayer && timeStep === undefined && newTimeDimension)) {
-            _context5.next = 38;
+            _context5.next = 41;
             break;
           }
 
           newTimeStep = getActiveLayerTimeStep(newTimeDimension);
 
           if (!newTimeStep) {
-            _context5.next = 38;
+            _context5.next = 41;
             break;
           }
 
-          _context5.next = 38;
+          _context5.next = 41;
           return put(mapActions$1.setTimeStep({
             mapId: mapId,
             timeStep: newTimeStep
           }));
 
-        case 38:
+        case 41:
           if (!(isActiveLayer && // only update the active layer
-          shouldAutoUpdate && newTimeDimension && newTimeDimension.maxValue && prevTimeDimension && prevTimeDimension.currentValue && prevTimeDimension.currentValue !== newTimeDimension.maxValue)) {
-            _context5.next = 46;
+          shouldAutoUpdate && newTimeDimension && newTimeDimension.maxValue && prevTimeDimension && prevTimeDimension.currentValue && prevTimeDimension.currentValue !== newTimeDimension.maxValue && !shouldEndTimeOverride)) {
+            _context5.next = 49;
             break;
           }
 
           if (isAnimating$1) {
-            _context5.next = 42;
+            _context5.next = 45;
             break;
           }
 
-          _context5.next = 42;
+          _context5.next = 45;
           return put(layerActions.layerChangeDimension({
             layerId: layerId,
             origin: LayerActionOrigin.setLayerDimensionSaga,
@@ -8292,39 +8324,39 @@ function setLayerDimensionsSaga(_ref4) {
             }
           }));
 
-        case 42:
-          _context5.next = 44;
+        case 45:
+          _context5.next = 47;
           return call(updateAnimation, mapId, newTimeDimension.maxValue);
 
-        case 44:
-          _context5.next = 49;
+        case 47:
+          _context5.next = 52;
           break;
 
-        case 46:
-          if (!(isAnimating$1 && !webmapInstance.isAnimating && newTimeDimension && newTimeDimension.maxValue)) {
-            _context5.next = 49;
+        case 49:
+          if (!(isAnimating$1 && !webmapInstance.isAnimating && newTimeDimension && newTimeDimension.maxValue && !shouldEndTimeOverride)) {
+            _context5.next = 52;
             break;
           }
 
-          _context5.next = 49;
+          _context5.next = 52;
           return call(updateAnimation, mapId, newTimeDimension.maxValue);
 
-        case 49:
-          _context5.next = 54;
+        case 52:
+          _context5.next = 57;
           break;
 
-        case 51:
-          _context5.prev = 51;
+        case 54:
+          _context5.prev = 54;
           _context5.t0 = _context5["catch"](1);
           // eslint-disable-next-line no-console
           console.warn(_context5.t0);
 
-        case 54:
+        case 57:
         case "end":
           return _context5.stop();
       }
     }
-  }, _marked5, null, [[1, 51]]);
+  }, _marked5, null, [[1, 54]]);
 }
 function toggleAutoUpdateSaga(_ref5) {
   var payload, shouldAutoUpdate, mapId, layerId, timeDimension;
@@ -8443,7 +8475,7 @@ function handleBaseLayersSaga(mapId, baseLayers) {
   }, _marked7);
 }
 function setMapPresetSaga(_ref6) {
-  var payload, mapId, initialProps, mapPreset, layers, activeLayerId, proj, shouldAutoUpdate, shouldAnimate, animationPayload, toggleTimestepAuto, showTimeSlider, displayMapPin, shouldShowZoomControls, shouldShowLegend, dockedLayerManagerSize, _filterLayers, mapLayers, baseLayers, overLayers, _yield$call, layersNewIds, activeLayerNewId, newActiveLayerId, baseLayersWithDefaultLayer, overLayersWithDefaultLayer, allBaseLayers, animationLength, animationEndTime, interval, animationEnd, _animationEnd, duration, shouldOpenLegend, legendId, fiveMinuteDelayForAnimation, _animationEnd2, animationStart;
+  var payload, mapId, initialProps, mapPreset, layers, activeLayerId, proj, shouldAutoUpdate, shouldAnimate, animationPayload, toggleTimestepAuto, showTimeSlider, displayMapPin, shouldShowZoomControls, shouldShowLegend, dockedLayerManagerSize, _filterLayers, mapLayers, baseLayers, overLayers, _yield$call, layersNewIds, activeLayerNewId, newActiveLayerId, baseLayersWithDefaultLayer, overLayersWithDefaultLayer, allBaseLayers, animationLength, animationEndTime, shouldEndtimeOverride, interval, animationEnd, _animationEnd, duration, _animationEnd2, animationStart, shouldOpenLegend, legendId, fiveMinuteDelayForAnimation, _animationEnd3, _animationStart;
 
   return regeneratorRuntime.wrap(function setMapPresetSaga$(_context8) {
     while (1) {
@@ -8455,7 +8487,7 @@ function setMapPresetSaga(_ref6) {
           mapPreset = initialProps.mapPreset;
 
           if (!mapPreset) {
-            _context8.next = 100;
+            _context8.next = 120;
             break;
           }
 
@@ -8518,257 +8550,307 @@ function setMapPresetSaga(_ref6) {
         case 26:
           animationLength = animationPayload && animationPayload.duration;
           animationEndTime = animationPayload && animationPayload.endTime && isAnimationEndTimeValid(animationPayload.endTime) && animationPayload.endTime;
+          shouldEndtimeOverride = animationPayload ? animationPayload.shouldEndtimeOverride : false;
+
+          if (!shouldEndtimeOverride) {
+            _context8.next = 32;
+            break;
+          }
 
+          _context8.next = 32;
+          return put(mapActions$1.setEndTimeOverriding({
+            mapId: mapId,
+            shouldEndtimeOverride: shouldEndtimeOverride
+          }));
+
+        case 32:
           if (!(shouldAutoUpdate !== undefined && !animationEndTime)) {
-            _context8.next = 31;
+            _context8.next = 35;
             break;
           }
 
-          _context8.next = 31;
+          _context8.next = 35;
           return put(mapActions$1.toggleAutoUpdate({
             mapId: mapId,
             shouldAutoUpdate: shouldAutoUpdate
           }));
 
-        case 31:
+        case 35:
           if (!(showTimeSlider !== undefined)) {
-            _context8.next = 34;
+            _context8.next = 38;
             break;
           }
 
-          _context8.next = 34;
+          _context8.next = 38;
           return put(mapActions$1.toggleTimeSliderIsVisible({
             mapId: mapId,
             isTimeSliderVisible: showTimeSlider
           }));
 
-        case 34:
+        case 38:
           if (!(shouldShowZoomControls !== undefined)) {
-            _context8.next = 37;
+            _context8.next = 41;
             break;
           }
 
-          _context8.next = 37;
+          _context8.next = 41;
           return put(mapActions$1.toggleZoomControls({
             mapId: mapId,
             shouldShowZoomControls: shouldShowZoomControls
           }));
 
-        case 37:
+        case 41:
           if (!(displayMapPin !== undefined)) {
-            _context8.next = 40;
+            _context8.next = 44;
             break;
           }
 
-          _context8.next = 40;
+          _context8.next = 44;
           return put(mapActions$1.toggleMapPinIsVisible({
             mapId: mapId,
             displayMapPin: displayMapPin
           }));
 
-        case 40:
+        case 44:
           // sets timestep by interval of animationPayload
           interval = animationPayload && animationPayload.interval;
 
           if (!interval) {
-            _context8.next = 44;
+            _context8.next = 48;
             break;
           }
 
-          _context8.next = 44;
+          _context8.next = 48;
           return put(mapActions$1.setTimeStep({
             mapId: mapId,
             timeStep: interval
           }));
 
-        case 44:
+        case 48:
           if (!animationEndTime) {
-            _context8.next = 53;
+            _context8.next = 57;
             break;
           }
 
-          _context8.next = 47;
+          _context8.next = 51;
           return put(mapActions$1.setAnimationEndTime({
             mapId: mapId,
             animationEndTime: getAnimationEndTime(animationEndTime)
           }));
 
-        case 47:
+        case 51:
           if (animationLength) {
-            _context8.next = 53;
+            _context8.next = 57;
             break;
           }
 
-          _context8.next = 50;
+          _context8.next = 54;
           return select(getAnimationEndTime$1, mapId);
 
-        case 50:
+        case 54:
           animationEnd = _context8.sent;
-          _context8.next = 53;
+          _context8.next = 57;
           return put(mapActions$1.setAnimationStartTime({
             mapId: mapId,
             animationStartTime: moment(animationEnd).subtract(5 * 60, 'minutes') // set to default of 5 hours
             .toISOString()
           }));
 
-        case 53:
+        case 57:
           if (!animationLength) {
-            _context8.next = 59;
+            _context8.next = 63;
             break;
           }
 
-          _context8.next = 56;
+          _context8.next = 60;
           return select(getAnimationEndTime$1, mapId);
 
-        case 56:
+        case 60:
           _animationEnd = _context8.sent;
-          _context8.next = 59;
+          _context8.next = 63;
           return put(mapActions$1.setAnimationStartTime({
             mapId: mapId,
             animationStartTime: moment(_animationEnd).subtract(animationLength, 'minutes').toISOString()
           }));
 
-        case 59:
+        case 63:
           if (!(animationPayload && animationPayload.speed)) {
-            _context8.next = 62;
+            _context8.next = 66;
             break;
           }
 
-          _context8.next = 62;
+          _context8.next = 66;
           return put(mapActions$1.setAnimationDelay({
             mapId: mapId,
             animationDelay: getSpeedDelay(animationPayload.speed)
           }));
 
-        case 62:
+        case 66:
           if (!(shouldAnimate === true)) {
-            _context8.next = 71;
+            _context8.next = 91;
             break;
           }
 
           duration = animationPayload && animationPayload.duration ? animationPayload.duration : 5 * 60; //  set to default of 5 hours
 
-          _context8.next = 66;
+          if (!(shouldEndtimeOverride && animationEndTime)) {
+            _context8.next = 74;
+            break;
+          }
+
+          _context8.next = 71;
+          return select(getAnimationEndTime$1, mapId);
+
+        case 71:
+          _context8.t0 = _context8.sent;
+          _context8.next = 75;
+          break;
+
+        case 74:
+          _context8.t0 = moment.utc().format(dateFormat);
+
+        case 75:
+          _animationEnd2 = _context8.t0;
+
+          if (!(shouldEndtimeOverride && animationLength)) {
+            _context8.next = 82;
+            break;
+          }
+
+          _context8.next = 79;
+          return select(getAnimationStartTime, mapId);
+
+        case 79:
+          _context8.t1 = _context8.sent;
+          _context8.next = 83;
+          break;
+
+        case 82:
+          _context8.t1 = moment.utc().subtract(duration, 'minutes').format(dateFormat);
+
+        case 83:
+          animationStart = _context8.t1;
+          _context8.next = 86;
           return put(mapActions$1.mapStartAnimation({
             mapId: mapId,
-            start: moment.utc().subtract(duration, 'minutes').format(dateFormat),
-            end: moment.utc().format(dateFormat),
+            start: animationStart,
+            end: _animationEnd2,
             interval: interval || animationIntervalDefault
           }));
 
-        case 66:
+        case 86:
           if (!interval) {
-            _context8.next = 69;
+            _context8.next = 89;
             break;
           }
 
-          _context8.next = 69;
+          _context8.next = 89;
           return put(mapActions$1.toggleTimestepAuto({
             mapId: mapId,
             timestepAuto: false
           }));
 
-        case 69:
-          _context8.next = 74;
+        case 89:
+          _context8.next = 94;
           break;
 
-        case 71:
+        case 91:
           if (!(toggleTimestepAuto !== undefined)) {
-            _context8.next = 74;
+            _context8.next = 94;
             break;
           }
 
-          _context8.next = 74;
+          _context8.next = 94;
           return put(mapActions$1.toggleTimestepAuto({
             mapId: mapId,
             timestepAuto: toggleTimestepAuto
           }));
 
-        case 74:
+        case 94:
           // show legend
           shouldOpenLegend = shouldShowLegend !== undefined ? shouldShowLegend : IS_LEGEND_OPEN_BY_DEFAULT;
-          _context8.next = 77;
+          _context8.next = 97;
           return select(getLegendId, mapId);
 
-        case 77:
+        case 97:
           legendId = _context8.sent;
 
           if (!legendId) {
-            _context8.next = 81;
+            _context8.next = 101;
             break;
           }
 
-          _context8.next = 81;
+          _context8.next = 101;
           return put(uiActions.setToggleOpenDialog({
             type: legendId,
             setOpen: shouldOpenLegend
           }));
 
-        case 81:
+        case 101:
           if (!dockedLayerManagerSize) {
-            _context8.next = 84;
+            _context8.next = 104;
             break;
           }
 
-          _context8.next = 84;
+          _context8.next = 104;
           return put(mapActions$1.setDockedLayerManagerSize({
             mapId: mapId,
             dockedLayerManagerSize: dockedLayerManagerSize
           }));
 
-        case 84:
-          if (!animationEndTime) {
-            _context8.next = 100;
+        case 104:
+          if (!(animationEndTime && (shouldEndtimeOverride || !(shouldAutoUpdate || shouldAnimate)))) {
+            _context8.next = 120;
             break;
           }
 
           fiveMinuteDelayForAnimation = 1000 * 60 * 5;
-          _context8.next = 88;
+          _context8.next = 108;
           return delay(fiveMinuteDelayForAnimation);
 
-        case 88:
-          _context8.next = 90;
+        case 108:
+          _context8.next = 110;
           return select(getAnimationEndTime$1, mapId);
 
-        case 90:
-          _animationEnd2 = _context8.sent;
-          _context8.next = 93;
+        case 110:
+          _animationEnd3 = _context8.sent;
+          _context8.next = 113;
           return put(mapActions$1.setAnimationEndTime({
             mapId: mapId,
-            animationEndTime: moment(_animationEnd2).add(60, 'minutes').toISOString()
+            animationEndTime: moment(_animationEnd3).add(5, 'minutes').toISOString()
           }));
 
-        case 93:
-          _context8.next = 95;
+        case 113:
+          _context8.next = 115;
           return select(getAnimationStartTime, mapId);
 
-        case 95:
-          animationStart = _context8.sent;
-          _context8.next = 98;
+        case 115:
+          _animationStart = _context8.sent;
+          _context8.next = 118;
           return put(mapActions$1.setAnimationStartTime({
             mapId: mapId,
-            animationStartTime: moment(animationStart).add(60, 'minutes').toISOString()
+            animationStartTime: moment(_animationStart).add(5, 'minutes').toISOString()
           }));
 
-        case 98:
-          _context8.next = 84;
+        case 118:
+          _context8.next = 104;
           break;
 
-        case 100:
-          _context8.next = 105;
+        case 120:
+          _context8.next = 125;
           break;
 
-        case 102:
-          _context8.prev = 102;
-          _context8.t0 = _context8["catch"](1);
-          console.error(_context8.t0);
+        case 122:
+          _context8.prev = 122;
+          _context8.t2 = _context8["catch"](1);
+          console.error(_context8.t2);
 
-        case 105:
+        case 125:
         case "end":
           return _context8.stop();
       }
     }
-  }, _marked8, null, [[1, 102]]);
+  }, _marked8, null, [[1, 122]]);
 }
 function unregisterMapSaga(_ref7) {
   var payload, mapId, layerList;
@@ -9482,39 +9564,39 @@ var layerManagerStyle = Object.assign({
 }, !IS_JEST && {
   '@container (max-width: 320px)': {
     '.layermanager': {
-      '.column-1:not(.container-query-polyfill)': {
+      '.column-1': {
         width: '100%'
       },
-      '.enable-btn-mini:not(.container-query-polyfill)': {
+      '.enable-btn-mini': {
         display: 'inline-flex'
       },
-      '.activateLayer-btn:not(.container-query-polyfill), .enable-btn:not(.container-query-polyfill), .column-2:not(.container-query-polyfill), .column-3:not(.container-query-polyfill), .column-4:not(.container-query-polyfill), .column-5:not(.container-query-polyfill), .column-6:not(.container-query-polyfill), .column-7:not(.container-query-polyfill)': {
+      '.activateLayer-btn, .enable-btn, .column-2, .column-3, .column-4, .column-5, .column-6, .column-7': {
         display: 'none'
       },
-      '#mappresets-menubutton:not(.container-query-polyfill), .addLayer-column:not(.container-query-polyfill)': {
+      '#mappresets-menubutton, .addLayer-column': {
         display: 'none'
       },
-      '.descriptionRow:not(.container-query-polyfill)': {
+      '.descriptionRow': {
         height: 6,
-        '.MuiButtonBase-root:not(.container-query-polyfill)': {
+        '.MuiButtonBase-root': {
           display: 'none'
         }
       }
     },
     '.header-layermanager': {
-      '.header-left:not(.container-query-polyfill), .header-title:not(.container-query-polyfill)': {
+      '.header-left, .header-title': {
         display: 'none'
       },
-      '&>div:not(.container-query-polyfill)': {
+      '&>div': {
         justifyContent: 'flex-end',
         padding: 0,
         height: 24
       },
-      '.header-right:not(.container-query-polyfill)': {
+      '.header-right': {
         maxWidth: '100%',
         flexBasis: '100%'
       },
-      '.collapseSmall-btn:not(.container-query-polyfill)': {
+      '.collapseSmall-btn': {
         display: 'none'
       }
     }
@@ -9522,31 +9604,31 @@ var layerManagerStyle = Object.assign({
   // sizes: medium
   '@container (max-width: 600px)': {
     '.layermanager': {
-      '.column-3:not(.container-query-polyfill), .column-4:not(.container-query-polyfill), .column-5:not(.container-query-polyfill), .column-6:not(.container-query-polyfill), .column-7:not(.container-query-polyfill)': {
+      '.column-3, .column-4, .column-5, .column-6, .column-7': {
         display: 'none'
       },
-      '.column-2:not(.container-query-polyfill)': {
+      '.column-2': {
         width: "calc((100% - ".concat(iconButtonSize * 3, "px) )")
       },
       // presets
-      '.header-layer.mappresetsModule-enabled:not(.container-query-polyfill)': {
+      '.header-layer.mappresetsModule-enabled': {
         display: 'none'
       },
-      '.header-mapPresets:not(.container-query-polyfill)': {
+      '.header-mapPresets': {
         display: 'block',
-        '.MuiButtonBase-root:not(.container-query-polyfill)': {
+        '.MuiButtonBase-root': {
           height: 24,
-          '.MuiBox-root:not(.container-query-polyfill)': {
+          '.MuiBox-root': {
             textAlign: 'center'
           }
         }
       }
     },
     '.header-layermanager': {
-      '.mapPresets-btn:not(.container-query-polyfill)': {
+      '.mapPresets-btn': {
         display: 'none'
       },
-      '.collapseLarge-btn:not(.container-query-polyfill)': {
+      '.collapseLarge-btn': {
         display: 'inline-flex'
       }
     }
@@ -9554,26 +9636,26 @@ var layerManagerStyle = Object.assign({
   // specific queries for medium layermanager
   '@container (max-width: 600px) and (min-width: 321px)': {
     '.layermanager': {
-      '.medium-layermanager:not(.container-query-polyfill)': {
+      '.medium-layermanager': {
         display: 'block'
       }
     },
-    '.deleteBtnMedium:not(.container-query-polyfill)': {
+    '.deleteBtnMedium': {
       display: 'inline-flex!important',
-      '&+button:not(.container-query-polyfill)': {
+      '&+button': {
         display: 'none'
       }
     },
     '.layerRow': {
-      '.column-1:not(.container-query-polyfill)': {
+      '.column-1': {
         display: 'none'
       },
-      '.column-2:not(.container-query-polyfill)': {
+      '.column-2': {
         display: 'none'
       }
     },
     '.header-layermanager': {
-      '.collapseMedium-btn:not(.container-query-polyfill)': {
+      '.collapseMedium-btn': {
         display: 'none'
       }
     }
@@ -14326,12 +14408,20 @@ var ServiceOptionsDialog = function ServiceOptionsDialog(_ref) {
     });
   };
 
+  var dialogRef = React.useRef(null);
+  React.useEffect(function () {
+    var _a;
+
+    (_a = dialogRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+  }, []);
   return /*#__PURE__*/React.createElement(Box, {
     sx: styles$1.servicesContainer,
     "data-testid": "ServiceDialog",
     onKeyDown: function onKeyDown(event) {
-      event.stopPropagation();
-    }
+      if (event.key !== 'Escape') event.stopPropagation();
+    },
+    tabIndex: -1,
+    ref: dialogRef
   }, /*#__PURE__*/React.createElement(Box, {
     sx: styles$1.header
   }, "Services"), /*#__PURE__*/React.createElement(Backdrop, {
@@ -14371,10 +14461,7 @@ var Rows = function Rows(_ref2) {
   };
 
   return /*#__PURE__*/React.createElement(List, {
-    disablePadding: true,
-    onKeyDown: function onKeyDown(event) {
-      event.stopPropagation();
-    }
+    disablePadding: true
   }, Object.keys(sortByService(services)).map(function (serviceId) {
     var _services$serviceId = services[serviceId],
         serviceUrl = _services$serviceId.serviceUrl,
@@ -26448,4 +26535,4 @@ var MapWarningProperties = function MapWarningProperties(_ref) {
  * */
 var mapActions = Object.assign(Object.assign(Object.assign({}, layerActions), mapActions$1), serviceActions);
 
-export { AppWrapperConnect, ConfigurableMapConnect, CoreThemeProvider, CoreThemeStoreProvider, DockedLayerManagerConnect, HarmonieTempAndPrecipPreset, LayerManager, LayerManagerConnect, LayerManagerMapButtonConnect, LayerSelectConnect, Legend, LegendConnect, LegendMapButtonConnect, MapControls, MapView, MapViewConnect, MapViewLayer, MapWarningProperties, MultiDimensionSelectMapButtonsConnect, MultiMapMultiDimensionSelectConnect as MultiMapDimensionSelectConnect, MultiMapViewConnect, ReactMapView, ReactMapViewLayer, SnackbarWrapperConnect, SyncGroupViewerConnect, index as SyncGroups, TimeSliderConnect, ZoomControlConnect, ZoomControls, appActions, componentsLookUp, coreModuleConfig, dateFormat, defaultBbox, defaultConfigurations, filterLayers, filterMapPresets, filterNonTimeDimensions, filterServices, generateLayerId, generateMapId, generateTimesliderId, getDrawFunctionFromStore, getFirstTimeStepForLayerId, getInitialAppPresets, getLastTimeStepForLayerId, getNextTimeStepForLayerId, getPreviousTimeStepForLayerId, getWMJSDimensionForLayerAndDimension, getWMJSMapById, getWMJSTimeDimensionForLayerId, getWMLayerById, layerActions, reducer$7 as layerReducer, selectors$2 as layerSelectors, types$3 as layerTypes, mapActions, moduleConfig as mapModuleConfig, selectors as mapSelectors, types$2 as mapTypes, utils as mapUtils, parseBoolean, parseLayer, publicLayers, publicServices, registerDrawFunction, registerWMJSMap, registerWMLayer, snackbarActions, store, genericActions as syncGroupActions, synchronizationGroupConfig as synchronizationGroupModuleConfig, synchronizationGroupConfig as synchronizationGroupsConfig, testLayers, timeSliderUtils, uiActions, uiModuleConfig, selectors$1 as uiSelectors, types as uiTypes, unRegisterWMJSLayer, unRegisterWMJSMap, useSetupDialog };
+export { AppWrapperConnect, ConfigurableMapConnect, CoreThemeProvider, CoreThemeStoreProvider, DockedLayerManagerConnect, HarmonieTempAndPrecipPreset, LayerManager, BaseLayerRow as LayerManagerBaseLayerRow, LayerManagerConnect, DescriptionRow as LayerManagerDescriptionRow, HeaderOptions as LayerManagerHeaderOptions, LayerContainerRow as LayerManagerLayerContainerRow, LayerManagerMapButtonConnect, LayerSelectConnect, Legend, LegendConnect, LegendMapButtonConnect, MapControls, MapView, MapViewConnect, MapViewLayer, MapWarningProperties, MultiDimensionSelectMapButtonsConnect, MultiMapMultiDimensionSelectConnect as MultiMapDimensionSelectConnect, MultiMapViewConnect, ReactMapView, ReactMapViewLayer, SnackbarWrapperConnect, SyncGroupViewerConnect, index as SyncGroups, TimeSlider, BackwardForwardStepButtonConnect as TimeSliderBackwardForwardStepButtonConnect, TimeSliderButtonsConnect, TimeSliderConnect, OptionsMenuButtonConnect as TimeSliderOptionsMenuButtonConnect, PlayButtonConnect as TimeSliderPlayButtonConnect, ZoomControlConnect, ZoomControls, appActions, componentsLookUp, coreModuleConfig, dateFormat, defaultBbox, defaultConfigurations, filterLayers, filterMapPresets, filterNonTimeDimensions, filterServices, generateLayerId, generateMapId, generateTimesliderId, getDrawFunctionFromStore, getFirstTimeStepForLayerId, getInitialAppPresets, getLastTimeStepForLayerId, getNextTimeStepForLayerId, getPreviousTimeStepForLayerId, getWMJSDimensionForLayerAndDimension, getWMJSMapById, getWMJSTimeDimensionForLayerId, getWMLayerById, layerActions, reducer$7 as layerReducer, selectors$2 as layerSelectors, types$3 as layerTypes, mapActions, moduleConfig as mapModuleConfig, selectors as mapSelectors, types$2 as mapTypes, utils as mapUtils, parseBoolean, parseLayer, publicLayers, publicServices, registerDrawFunction, registerWMJSMap, registerWMLayer, snackbarActions, store, genericActions as syncGroupActions, synchronizationGroupConfig as synchronizationGroupModuleConfig, synchronizationGroupConfig as synchronizationGroupsConfig, testLayers, timeSliderUtils, uiActions, uiModuleConfig, selectors$1 as uiSelectors, types as uiTypes, unRegisterWMJSLayer, unRegisterWMJSMap, useSetupDialog };