@opengeoweb/core 4.11.0 → 4.12.0

package/index.umd.js

@@ -946,57 +946,60 @@
           animationEndTime = _d === void 0 ? moment__default["default"].utc(moment__default["default"]().unix() * 1000).subtract(10, 'm').format(dateFormat) : _d,
           _e = _a.isAutoUpdating,
           isAutoUpdating = _e === void 0 ? false : _e,
-          _f = _a.bbox,
-          bbox = _f === void 0 ? {
+          _f = _a.isEndTimeOverriding,
+          isEndTimeOverriding = _f === void 0 ? false : _f,
+          _g = _a.bbox,
+          bbox = _g === void 0 ? {
         left: -19000000,
         bottom: -19000000,
         right: 19000000,
         top: 19000000
-      } : _f,
-          _g = _a.srs,
-          srs = _g === void 0 ? 'EPSG:3857' : _g,
-          _h = _a.baseLayers,
-          baseLayers = _h === void 0 ? [] : _h,
-          _j = _a.overLayers,
-          overLayers = _j === void 0 ? [] : _j,
-          _k = _a.mapLayers,
-          mapLayers = _k === void 0 ? [] : _k,
-          _l = _a.featureLayers,
-          featureLayers = _l === void 0 ? [] : _l,
-          _m = _a.dimensions,
-          dimensions = _m === void 0 ? [] : _m,
-          _o = _a.activeLayerId,
-          activeLayerId = _o === void 0 ? '' : _o,
-          _p = _a.timeSliderScale,
-          timeSliderScale = _p === void 0 ? Scale.Hour : _p,
-          _q = _a.timeStep,
-          timeStep = _q === void 0 ? 5 : _q,
-          _r = _a.animationDelay,
-          animationDelay = _r === void 0 ? defaultAnimationDelayAtStart : _r,
-          _s = _a.timeSliderCenterTime,
-          timeSliderCenterTime = _s === void 0 ? moment__default["default"].utc().unix() : _s,
-          _t = _a.timeSliderSecondsPerPx,
-          timeSliderSecondsPerPx = _t === void 0 ? 30 : _t,
-          _u = _a.timeSliderDataScaleToSecondsPerPx,
-          timeSliderDataScaleToSecondsPerPx = _u === void 0 ? defaultDataScaleToSecondsPerPx : _u,
-          _v = _a.isTimestepAuto,
-          isTimestepAuto = _v === void 0 ? true : _v,
-          _w = _a.isTimeSliderHoverOn,
-          isTimeSliderHoverOn = _w === void 0 ? false : _w,
-          _x = _a.isTimeSliderVisible,
-          isTimeSliderVisible = _x === void 0 ? true : _x,
-          _y = _a.displayMapPin,
-          displayMapPin = _y === void 0 ? false : _y,
-          _z = _a.disableMapPin,
-          disableMapPin = _z === void 0 ? false : _z,
-          _0 = _a.shouldShowZoomControls,
-          shouldShowZoomControls = _0 === void 0 ? true : _0;
+      } : _g,
+          _h = _a.srs,
+          srs = _h === void 0 ? 'EPSG:3857' : _h,
+          _j = _a.baseLayers,
+          baseLayers = _j === void 0 ? [] : _j,
+          _k = _a.overLayers,
+          overLayers = _k === void 0 ? [] : _k,
+          _l = _a.mapLayers,
+          mapLayers = _l === void 0 ? [] : _l,
+          _m = _a.featureLayers,
+          featureLayers = _m === void 0 ? [] : _m,
+          _o = _a.dimensions,
+          dimensions = _o === void 0 ? [] : _o,
+          _p = _a.activeLayerId,
+          activeLayerId = _p === void 0 ? '' : _p,
+          _q = _a.timeSliderScale,
+          timeSliderScale = _q === void 0 ? Scale.Hour : _q,
+          _r = _a.timeStep,
+          timeStep = _r === void 0 ? 5 : _r,
+          _s = _a.animationDelay,
+          animationDelay = _s === void 0 ? defaultAnimationDelayAtStart : _s,
+          _t = _a.timeSliderCenterTime,
+          timeSliderCenterTime = _t === void 0 ? moment__default["default"].utc().unix() : _t,
+          _u = _a.timeSliderSecondsPerPx,
+          timeSliderSecondsPerPx = _u === void 0 ? 30 : _u,
+          _v = _a.timeSliderDataScaleToSecondsPerPx,
+          timeSliderDataScaleToSecondsPerPx = _v === void 0 ? defaultDataScaleToSecondsPerPx : _v,
+          _w = _a.isTimestepAuto,
+          isTimestepAuto = _w === void 0 ? true : _w,
+          _x = _a.isTimeSliderHoverOn,
+          isTimeSliderHoverOn = _x === void 0 ? false : _x,
+          _y = _a.isTimeSliderVisible,
+          isTimeSliderVisible = _y === void 0 ? true : _y,
+          _z = _a.displayMapPin,
+          displayMapPin = _z === void 0 ? false : _z,
+          _0 = _a.disableMapPin,
+          disableMapPin = _0 === void 0 ? false : _0,
+          _1 = _a.shouldShowZoomControls,
+          shouldShowZoomControls = _1 === void 0 ? true : _1;
       return {
         id: id,
         isAnimating: isAnimating,
         animationStartTime: animationStartTime,
         animationEndTime: animationEndTime,
         isAutoUpdating: isAutoUpdating,
+        isEndTimeOverriding: isEndTimeOverriding,
         srs: srs,
         bbox: bbox,
         baseLayers: baseLayers,
@@ -2473,6 +2476,17 @@
 
           draft.byId[mapId].isAutoUpdating = shouldAutoUpdate;
         },
+        setEndTimeOverriding: function setEndTimeOverriding(draft, action) {
+          var _a = action.payload,
+              mapId = _a.mapId,
+              shouldEndtimeOverride = _a.shouldEndtimeOverride;
+
+          if (!draft.byId[mapId]) {
+            return;
+          }
+
+          draft.byId[mapId].isEndTimeOverriding = shouldEndtimeOverride;
+        },
         toggleTimestepAuto: function toggleTimestepAuto(draft, action) {
           var _a = action.payload,
               mapId = _a.mapId,
@@ -4086,6 +4100,18 @@
     var isAutoUpdating = toolkit.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 = toolkit.createSelector(getMapById, function (store) {
+      return store ? store.isEndTimeOverriding : false;
+    });
     /**
      * Gets activeLayerId for map
      *
@@ -4516,6 +4542,7 @@
         getAnimationStartTime: getAnimationStartTime,
         getAnimationEndTime: getAnimationEndTime$1,
         isAutoUpdating: isAutoUpdating,
+        isEndTimeOverriding: isEndTimeOverriding,
         getActiveLayerId: getActiveLayerId,
         getMapTimeSliderScale: getMapTimeSliderScale,
         getMapTimeStep: getMapTimeStep,
@@ -8320,12 +8347,12 @@
       });
     }
     function setLayerDimensionsSaga(_a) {
-      var layerDimensions, dimensions, layerId, layer, newTimeDimension, mapId, activeLayerId, shouldAutoUpdate, prevTimeDimension, isAnimating$1, webmapInstance, isActiveLayer, timeStep, isTimestepAuto$1, newTimeStep, error_1;
+      var layerDimensions, dimensions, layerId, layer, newTimeDimension, mapId, activeLayerId, shouldAutoUpdate, shouldEndTimeOverride, prevTimeDimension, isAnimating$1, webmapInstance, isActiveLayer, timeStep, isTimestepAuto$1, newTimeStep, error_1;
       var payload = _a.payload;
       return __generator(this, function (_b) {
         switch (_b.label) {
           case 0:
-            _b.trys.push([0, 16,, 17]);
+            _b.trys.push([0, 17,, 18]);
 
             layerDimensions = payload.layerDimensions;
             if (!layerDimensions) return [2
@@ -8359,15 +8386,21 @@
             shouldAutoUpdate = _b.sent();
             return [4
             /*yield*/
-            , effects.select(getLayerTimeDimension, layerId)];
+            , effects.select(isEndTimeOverriding, mapId)];
 
           case 4:
+            shouldEndTimeOverride = _b.sent();
+            return [4
+            /*yield*/
+            , effects.select(getLayerTimeDimension, layerId)];
+
+          case 5:
             prevTimeDimension = _b.sent();
             return [4
             /*yield*/
             , effects.select(isAnimating, mapId)];
 
-          case 5:
+          case 6:
             isAnimating$1 = _b.sent();
             webmapInstance = getWMJSMapById(mapId);
             isActiveLayer = layerId === activeLayerId;
@@ -8375,21 +8408,21 @@
             /*yield*/
             , effects.select(getMapTimeStepWithoutDefault, mapId)];
 
-          case 6:
+          case 7:
             timeStep = _b.sent();
             return [4
             /*yield*/
             , effects.select(isTimestepAuto, mapId)];
 
-          case 7:
+          case 8:
             isTimestepAuto$1 = _b.sent();
             if (!(isTimestepAuto$1 && isActiveLayer && timeStep === undefined && newTimeDimension)) return [3
             /*break*/
-            , 9];
+            , 10];
             newTimeStep = getActiveLayerTimeStep(newTimeDimension);
             if (!newTimeStep) return [3
             /*break*/
-            , 9];
+            , 10];
             return [4
             /*yield*/
             , effects.put(mapActions$1.setTimeStep({
@@ -8397,19 +8430,19 @@
               timeStep: newTimeStep
             }))];
 
-          case 8:
+          case 9:
             _b.sent();
 
-            _b.label = 9;
+            _b.label = 10;
 
-          case 9:
+          case 10:
             if (!(isActiveLayer && // only update the active layer
-            shouldAutoUpdate && newTimeDimension && newTimeDimension.maxValue && prevTimeDimension && prevTimeDimension.currentValue && prevTimeDimension.currentValue !== newTimeDimension.maxValue)) return [3
+            shouldAutoUpdate && newTimeDimension && newTimeDimension.maxValue && prevTimeDimension && prevTimeDimension.currentValue && prevTimeDimension.currentValue !== newTimeDimension.maxValue && !shouldEndTimeOverride)) return [3
             /*break*/
-            , 13];
+            , 14];
             if (!!isAnimating$1) return [3
             /*break*/
-            , 11];
+            , 12];
             return [4
             /*yield*/
             , effects.put(layerActions.layerChangeDimension({
@@ -8421,50 +8454,50 @@
               }
             }))];
 
-          case 10:
+          case 11:
             _b.sent();
 
-            _b.label = 11;
+            _b.label = 12;
 
-          case 11:
+          case 12:
             return [4
             /*yield*/
             , effects.call(updateAnimation, mapId, newTimeDimension.maxValue)];
 
-          case 12:
+          case 13:
             _b.sent();
 
             return [3
             /*break*/
-            , 15];
+            , 16];
 
-          case 13:
-            if (!(isAnimating$1 && !webmapInstance.isAnimating && newTimeDimension && newTimeDimension.maxValue)) return [3
+          case 14:
+            if (!(isAnimating$1 && !webmapInstance.isAnimating && newTimeDimension && newTimeDimension.maxValue && !shouldEndTimeOverride)) return [3
             /*break*/
-            , 15];
+            , 16];
             return [4
             /*yield*/
             , effects.call(updateAnimation, mapId, newTimeDimension.maxValue)];
 
-          case 14:
+          case 15:
             _b.sent();
 
-            _b.label = 15;
+            _b.label = 16;
 
-          case 15:
+          case 16:
             return [3
             /*break*/
-            , 17];
+            , 18];
 
-          case 16:
+          case 17:
             error_1 = _b.sent(); // eslint-disable-next-line no-console
 
             console.warn(error_1);
             return [3
             /*break*/
-            , 17];
+            , 18];
 
-          case 17:
+          case 18:
             return [2
             /*return*/
             ];
@@ -8601,19 +8634,19 @@
       });
     }
     function setMapPresetSaga(_a) {
-      var mapId, initialProps, mapPreset, layers, activeLayerId, proj, shouldAutoUpdate, shouldAnimate, animationPayload, toggleTimestepAuto, showTimeSlider, displayMapPin, shouldShowZoomControls, shouldShowLegend, dockedLayerManagerSize, _b, mapLayers, baseLayers, overLayers, _c, layersNewIds, activeLayerNewId, newActiveLayerId, baseLayersWithDefaultLayer, overLayersWithDefaultLayer, allBaseLayers, animationLength, animationEndTime, interval, animationEnd, animationEnd, duration, shouldOpenLegend, legendId, fiveMinuteDelayForAnimation, animationEnd, animationStart, error_3;
+      var mapId, initialProps, mapPreset, layers, activeLayerId, proj, shouldAutoUpdate, shouldAnimate, animationPayload, toggleTimestepAuto, showTimeSlider, displayMapPin, shouldShowZoomControls, shouldShowLegend, dockedLayerManagerSize, _b, mapLayers, baseLayers, overLayers, _c, layersNewIds, activeLayerNewId, newActiveLayerId, baseLayersWithDefaultLayer, overLayersWithDefaultLayer, allBaseLayers, animationLength, animationEndTime, shouldEndtimeOverride, interval, animationEnd, animationEnd, duration, animationEnd, _d, animationStart, _e, shouldOpenLegend, legendId, fiveMinuteDelayForAnimation, animationEnd, animationStart, error_3;
 
       var payload = _a.payload;
-      return __generator(this, function (_d) {
-        switch (_d.label) {
+      return __generator(this, function (_f) {
+        switch (_f.label) {
           case 0:
-            _d.trys.push([0, 44,, 45]);
+            _f.trys.push([0, 52,, 53]);
 
             mapId = payload.mapId, initialProps = payload.initialProps;
             mapPreset = initialProps.mapPreset;
             if (!mapPreset) return [3
             /*break*/
-            , 43];
+            , 51];
             layers = mapPreset.layers, activeLayerId = mapPreset.activeLayerId, proj = mapPreset.proj, shouldAutoUpdate = mapPreset.shouldAutoUpdate, shouldAnimate = mapPreset.shouldAnimate, animationPayload = mapPreset.animationPayload, toggleTimestepAuto = mapPreset.toggleTimestepAuto, showTimeSlider = mapPreset.showTimeSlider, displayMapPin = mapPreset.displayMapPin, shouldShowZoomControls = mapPreset.shouldShowZoomControls, shouldShowLegend = mapPreset.shouldShowLegend, dockedLayerManagerSize = mapPreset.dockedLayerManagerSize;
             _b = filterLayers(layers), mapLayers = _b.mapLayers, baseLayers = _b.baseLayers, overLayers = _b.overLayers;
             if (!layers) return [3
@@ -8624,7 +8657,7 @@
             , effects.call(generateUniqueLayerIds, mapLayers, activeLayerId)];
 
           case 1:
-            _c = _d.sent(), layersNewIds = _c.layersNewIds, activeLayerNewId = _c.activeLayerNewId; //  set layers
+            _c = _f.sent(), layersNewIds = _c.layersNewIds, activeLayerNewId = _c.activeLayerNewId; //  set layers
 
             return [4
             /*yield*/
@@ -8635,7 +8668,7 @@
 
           case 2:
             //  set layers
-            _d.sent();
+            _f.sent();
 
             newActiveLayerId = activeLayerNewId || (layersNewIds.length ? layersNewIds[0].id : undefined);
             return [4
@@ -8646,9 +8679,9 @@
             }))];
 
           case 3:
-            _d.sent();
+            _f.sent();
 
-            _d.label = 4;
+            _f.label = 4;
 
           case 4:
             baseLayersWithDefaultLayer = baseLayers.length ? baseLayers : [baseLayerGrey$1];
@@ -8663,7 +8696,7 @@
             , effects.call(handleBaseLayersSaga, mapId, allBaseLayers)];
 
           case 5:
-            _d.sent();
+            _f.sent();
 
             if (!proj) return [3
             /*break*/
@@ -8679,34 +8712,53 @@
 
           case 6:
             //  set bbox
-            _d.sent();
+            _f.sent();
 
-            _d.label = 7;
+            _f.label = 7;
 
           case 7:
             animationLength = animationPayload && animationPayload.duration;
             animationEndTime = animationPayload && animationPayload.endTime && isAnimationEndTimeValid(animationPayload.endTime) && animationPayload.endTime;
-            if (!(shouldAutoUpdate !== undefined && !animationEndTime)) return [3
+            shouldEndtimeOverride = animationPayload ? animationPayload.shouldEndtimeOverride : false;
+            if (!shouldEndtimeOverride) return [3
             /*break*/
             , 9]; //  auto update
 
             return [4
             /*yield*/
-            , effects.put(mapActions$1.toggleAutoUpdate({
+            , effects.put(mapActions$1.setEndTimeOverriding({
               mapId: mapId,
-              shouldAutoUpdate: shouldAutoUpdate
+              shouldEndtimeOverride: shouldEndtimeOverride
             }))];
 
           case 8:
             //  auto update
-            _d.sent();
+            _f.sent();
 
-            _d.label = 9;
+            _f.label = 9;
 
           case 9:
+            if (!(shouldAutoUpdate !== undefined && !animationEndTime)) return [3
+            /*break*/
+            , 11]; //  auto update
+
+            return [4
+            /*yield*/
+            , effects.put(mapActions$1.toggleAutoUpdate({
+              mapId: mapId,
+              shouldAutoUpdate: shouldAutoUpdate
+            }))];
+
+          case 10:
+            //  auto update
+            _f.sent();
+
+            _f.label = 11;
+
+          case 11:
             if (!(showTimeSlider !== undefined)) return [3
             /*break*/
-            , 11]; // toggle timeslider
+            , 13]; // toggle timeslider
 
             return [4
             /*yield*/
@@ -8715,16 +8767,16 @@
               isTimeSliderVisible: showTimeSlider
             }))];
 
-          case 10:
+          case 12:
             // toggle timeslider
-            _d.sent();
+            _f.sent();
 
-            _d.label = 11;
+            _f.label = 13;
 
-          case 11:
+          case 13:
             if (!(shouldShowZoomControls !== undefined)) return [3
             /*break*/
-            , 13]; // toggle zoom controls
+            , 15]; // toggle zoom controls
 
             return [4
             /*yield*/
@@ -8733,16 +8785,16 @@
               shouldShowZoomControls: shouldShowZoomControls
             }))];
 
-          case 12:
+          case 14:
             // toggle zoom controls
-            _d.sent();
+            _f.sent();
 
-            _d.label = 13;
+            _f.label = 15;
 
-          case 13:
+          case 15:
             if (!(displayMapPin !== undefined)) return [3
             /*break*/
-            , 15]; //  display map pin
+            , 17]; //  display map pin
 
             return [4
             /*yield*/
@@ -8751,17 +8803,17 @@
               displayMapPin: displayMapPin
             }))];
 
-          case 14:
+          case 16:
             //  display map pin
-            _d.sent();
+            _f.sent();
 
-            _d.label = 15;
+            _f.label = 17;
 
-          case 15:
+          case 17:
             interval = animationPayload && animationPayload.interval;
             if (!interval) return [3
             /*break*/
-            , 17];
+            , 19];
             return [4
             /*yield*/
             , effects.put(mapActions$1.setTimeStep({
@@ -8769,15 +8821,15 @@
               timeStep: interval
             }))];
 
-          case 16:
-            _d.sent();
+          case 18:
+            _f.sent();
 
-            _d.label = 17;
+            _f.label = 19;
 
-          case 17:
+          case 19:
             if (!animationEndTime) return [3
             /*break*/
-            , 21];
+            , 23];
             return [4
             /*yield*/
             , effects.put(mapActions$1.setAnimationEndTime({
@@ -8785,18 +8837,18 @@
               animationEndTime: getAnimationEndTime(animationEndTime)
             }))];
 
-          case 18:
-            _d.sent();
+          case 20:
+            _f.sent();
 
             if (!!animationLength) return [3
             /*break*/
-            , 21];
+            , 23];
             return [4
             /*yield*/
             , effects.select(getAnimationEndTime$1, mapId)];
 
-          case 19:
-            animationEnd = _d.sent();
+          case 21:
+            animationEnd = _f.sent();
             return [4
             /*yield*/
             , effects.put(mapActions$1.setAnimationStartTime({
@@ -8805,21 +8857,21 @@
               .toISOString()
             }))];
 
-          case 20:
-            _d.sent();
+          case 22:
+            _f.sent();
 
-            _d.label = 21;
+            _f.label = 23;
 
-          case 21:
+          case 23:
             if (!animationLength) return [3
             /*break*/
-            , 24];
+            , 26];
             return [4
             /*yield*/
             , effects.select(getAnimationEndTime$1, mapId)];
 
-          case 22:
-            animationEnd = _d.sent();
+          case 24:
+            animationEnd = _f.sent();
             return [4
             /*yield*/
             , effects.put(mapActions$1.setAnimationStartTime({
@@ -8827,15 +8879,15 @@
               animationStartTime: moment__default["default"](animationEnd).subtract(animationLength, 'minutes').toISOString()
             }))];
 
-          case 23:
-            _d.sent();
+          case 25:
+            _f.sent();
 
-            _d.label = 24;
+            _f.label = 26;
 
-          case 24:
+          case 26:
             if (!(animationPayload && animationPayload.speed)) return [3
             /*break*/
-            , 26];
+            , 28];
             return [4
             /*yield*/
             , effects.put(mapActions$1.setAnimationDelay({
@@ -8843,31 +8895,69 @@
               animationDelay: getSpeedDelay(animationPayload.speed)
             }))];
 
-          case 25:
-            _d.sent();
+          case 27:
+            _f.sent();
 
-            _d.label = 26;
+            _f.label = 28;
 
-          case 26:
+          case 28:
             if (!(shouldAnimate === true)) return [3
             /*break*/
-            , 30];
+            , 38];
             duration = animationPayload && animationPayload.duration ? animationPayload.duration : 5 * 60;
+            if (!(shouldEndtimeOverride && animationEndTime)) return [3
+            /*break*/
+            , 30];
+            return [4
+            /*yield*/
+            , effects.select(getAnimationEndTime$1, mapId)];
+
+          case 29:
+            _d = _f.sent();
+            return [3
+            /*break*/
+            , 31];
+
+          case 30:
+            _d = moment__default["default"].utc().format(dateFormat);
+            _f.label = 31;
+
+          case 31:
+            animationEnd = _d;
+            if (!(shouldEndtimeOverride && animationLength)) return [3
+            /*break*/
+            , 33];
+            return [4
+            /*yield*/
+            , effects.select(getAnimationStartTime, mapId)];
+
+          case 32:
+            _e = _f.sent();
+            return [3
+            /*break*/
+            , 34];
+
+          case 33:
+            _e = moment__default["default"].utc().subtract(duration, 'minutes').format(dateFormat);
+            _f.label = 34;
+
+          case 34:
+            animationStart = _e;
             return [4
             /*yield*/
             , effects.put(mapActions$1.mapStartAnimation({
               mapId: mapId,
-              start: moment__default["default"].utc().subtract(duration, 'minutes').format(dateFormat),
-              end: moment__default["default"].utc().format(dateFormat),
+              start: animationStart,
+              end: animationEnd,
               interval: interval || animationIntervalDefault
             }))];
 
-          case 27:
-            _d.sent();
+          case 35:
+            _f.sent();
 
             if (!interval) return [3
             /*break*/
-            , 29];
+            , 37];
             return [4
             /*yield*/
             , effects.put(mapActions$1.toggleTimestepAuto({
@@ -8875,20 +8965,20 @@
               timestepAuto: false
             }))];
 
-          case 28:
-            _d.sent();
+          case 36:
+            _f.sent();
 
-            _d.label = 29;
+            _f.label = 37;
 
-          case 29:
+          case 37:
             return [3
             /*break*/
-            , 32];
+            , 40];
 
-          case 30:
+          case 38:
             if (!(toggleTimestepAuto !== undefined)) return [3
             /*break*/
-            , 32];
+            , 40];
             return [4
             /*yield*/
             , effects.put(mapActions$1.toggleTimestepAuto({
@@ -8896,22 +8986,22 @@
               timestepAuto: toggleTimestepAuto
             }))];
 
-          case 31:
-            _d.sent();
+          case 39:
+            _f.sent();
 
-            _d.label = 32;
+            _f.label = 40;
 
-          case 32:
+          case 40:
             shouldOpenLegend = shouldShowLegend !== undefined ? shouldShowLegend : IS_LEGEND_OPEN_BY_DEFAULT;
             return [4
             /*yield*/
             , effects.select(getLegendId, mapId)];
 
-          case 33:
-            legendId = _d.sent();
+          case 41:
+            legendId = _f.sent();
             if (!legendId) return [3
             /*break*/
-            , 35];
+            , 43];
             return [4
             /*yield*/
             , effects.put(uiActions.setToggleOpenDialog({
@@ -8919,15 +9009,15 @@
               setOpen: shouldOpenLegend
             }))];
 
-          case 34:
-            _d.sent();
+          case 42:
+            _f.sent();
 
-            _d.label = 35;
+            _f.label = 43;
 
-          case 35:
+          case 43:
             if (!dockedLayerManagerSize) return [3
             /*break*/
-            , 37];
+            , 45];
             return [4
             /*yield*/
             , effects.put(mapActions$1.setDockedLayerManagerSize({
@@ -8935,72 +9025,72 @@
               dockedLayerManagerSize: dockedLayerManagerSize
             }))];
 
-          case 36:
-            _d.sent();
+          case 44:
+            _f.sent();
 
-            _d.label = 37;
+            _f.label = 45;
 
-          case 37:
-            if (!animationEndTime) return [3
+          case 45:
+            if (!(animationEndTime && (shouldEndtimeOverride || !(shouldAutoUpdate || shouldAnimate)))) return [3
             /*break*/
-            , 43];
+            , 51];
             fiveMinuteDelayForAnimation = 1000 * 60 * 5;
             return [4
             /*yield*/
             , effects.delay(fiveMinuteDelayForAnimation)];
 
-          case 38:
-            _d.sent();
+          case 46:
+            _f.sent();
 
             return [4
             /*yield*/
             , effects.select(getAnimationEndTime$1, mapId)];
 
-          case 39:
-            animationEnd = _d.sent();
+          case 47:
+            animationEnd = _f.sent();
             return [4
             /*yield*/
             , effects.put(mapActions$1.setAnimationEndTime({
               mapId: mapId,
-              animationEndTime: moment__default["default"](animationEnd).add(60, 'minutes').toISOString()
+              animationEndTime: moment__default["default"](animationEnd).add(5, 'minutes').toISOString()
             }))];
 
-          case 40:
-            _d.sent();
+          case 48:
+            _f.sent();
 
             return [4
             /*yield*/
             , effects.select(getAnimationStartTime, mapId)];
 
-          case 41:
-            animationStart = _d.sent();
+          case 49:
+            animationStart = _f.sent();
             return [4
             /*yield*/
             , effects.put(mapActions$1.setAnimationStartTime({
               mapId: mapId,
-              animationStartTime: moment__default["default"](animationStart).add(60, 'minutes').toISOString()
+              animationStartTime: moment__default["default"](animationStart).add(5, 'minutes').toISOString()
             }))];
 
-          case 42:
-            _d.sent();
+          case 50:
+            _f.sent();
 
             return [3
             /*break*/
-            , 37];
+            , 45];
 
-          case 43:
+          case 51:
             return [3
             /*break*/
-            , 45];
+            , 53];
 
-          case 44:
-            error_3 = _d.sent();
+          case 52:
+            error_3 = _f.sent();
             console.error(error_3);
             return [3
             /*break*/
-            , 45];
+            , 53];
 
-          case 45:
+          case 53:
             return [2
             /*return*/
             ];
@@ -14919,12 +15009,20 @@
         });
       };
 
+      var dialogRef = React__namespace.useRef(null);
+      React__namespace.useEffect(function () {
+        var _a;
+
+        (_a = dialogRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+      }, []);
       return /*#__PURE__*/React__namespace.createElement(material.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__namespace.createElement(material.Box, {
         sx: styles$1.header
       }, "Services"), /*#__PURE__*/React__namespace.createElement(material.Backdrop, {
@@ -14964,10 +15062,7 @@
       };
 
       return /*#__PURE__*/React__namespace.createElement(material.List, {
-        disablePadding: true,
-        onKeyDown: function onKeyDown(event) {
-          event.stopPropagation();
-        }
+        disablePadding: true
       }, Object.keys(sortByService(services)).map(function (serviceId) {
         var _a = services[serviceId],
             serviceUrl = _a.serviceUrl,