@opengeoweb/store 14.3.0 → 14.4.0

package/index.esm.js

@@ -5744,23 +5744,32 @@ var getLegendId = createSelector(getMapById, function (store) {
  * Example getMapPreset(store, mapId);
  * @param {object} store store: object - store object
  * @param {string} mapId mapId: string - Id of the map
+ * @param {boolean} keepAllDims? keepAllDims: boolean - default false: whether or not to leave the time and reference_time dimentions
  * @returns {MapPreset} returnType: MapPreset
  */
-var getMapPreset = createSelector(getMapLayers, getMapBaseLayers, getMapOverLayers, getBbox, getSrs, getActiveLayerId, getAutoTimeStepLayerId, getAutoUpdateLayerId, isAnimating, isAutoUpdating, isTimeSliderVisible, getDisplayMapPin, isZoomControlsVisible, getMapTimeStep, getMapAnimationDelay, getAnimationStartTime, getAnimationEndTime, getMapTimeSliderSpan, isTimestepAuto, isTimeSpanAuto, getLegendId, getUiStore, function (_store, mapId) {
+var getMapPreset = createSelector(getMapLayers, getMapBaseLayers, getMapOverLayers, getBbox, getSrs, getActiveLayerId, getAutoTimeStepLayerId, getAutoUpdateLayerId, isAnimating, isAutoUpdating, isTimeSliderVisible, getDisplayMapPin, isZoomControlsVisible, getMapTimeStep, getMapAnimationDelay, getAnimationStartTime, getAnimationEndTime, getMapTimeSliderSpan, getMapDimensions, isTimestepAuto, isTimeSpanAuto, getLegendId, getUiStore, function (_store, mapId) {
   return mapId;
-}, function (mapLayers, baseLayers, overLayers, bbox, srs, activeLayerId, autoTimeStepLayerId, autoUpdateLayerId, isAnimating, isAutoUpdating, isTimeSliderVisible, displayMapPin, isZoomControlsVisible, mapTimeStep, mapAnimationDelay, animationStartTime, animationEndTime, timeSliderSpan, isTimestepAuto, isTimeSpanAuto, legendId, uiStore, mapId) {
+}, function (_store, _mapId) {
+  var keepAllDims = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  return keepAllDims;
+}, function (mapLayers, baseLayers, overLayers, bbox, srs, activeLayerId, autoTimeStepLayerId, autoUpdateLayerId, isAnimating, isAutoUpdating, isTimeSliderVisible, displayMapPin, isZoomControlsVisible, mapTimeStep, mapAnimationDelay, animationStartTime, animationEndTime, timeSliderSpan, mapDimensions, isTimestepAuto, isTimeSpanAuto, legendId, uiStore, mapId, keepAllDims) {
   var _overLayers$, _uiStore$dialogs$lege;
-  var defaultOverlayer = arguments.length > 23 && arguments[23] !== undefined ? arguments[23] : ((_overLayers$ = overLayers[0]) === null || _overLayers$ === void 0 ? void 0 : _overLayers$.name) || 'none';
+  var defaultOverlayer = arguments.length > 25 && arguments[25] !== undefined ? arguments[25] : ((_overLayers$ = overLayers[0]) === null || _overLayers$ === void 0 ? void 0 : _overLayers$.name) || 'none';
   var allLayers = [].concat(_toConsumableArray(baseLayers), _toConsumableArray(overLayers), _toConsumableArray(mapLayers)).map(function (_ref3) {
     _ref3.mapId;
       var layer = _objectWithoutProperties(_ref3, _excluded$2);
     if (layer.dimensions !== undefined) {
-      // Filter out time dimension as this should not be part of the preset for now
-      var dimensions = layer.dimensions.filter(function (dimension) {
-        return dimension.name !== 'time';
-      });
+      if (!keepAllDims) {
+        // Filter out time dimension as this should not be part of the preset for now
+        var dimensions = layer.dimensions.filter(function (dimension) {
+          return dimension.name !== 'time';
+        });
+        return _objectSpread2(_objectSpread2({}, layer), {}, {
+          dimensions: dimensions
+        });
+      }
       return _objectSpread2(_objectSpread2({}, layer), {}, {
-        dimensions: dimensions
+        dimensions: layer.dimensions
       });
     }
     return layer;
@@ -5798,6 +5807,8 @@ var getMapPreset = createSelector(getMapLayers, getMapBaseLayers, getMapOverLaye
     timeSliderSpan: timeSliderSpan,
     shouldShowDataExplorer: shouldShowDataExplorer,
     defaultOverlayer: defaultOverlayer
+  }, keepAllDims && {
+    dimensions: mapDimensions
   });
 }, selectorMemoizationOptions);
 var getMultiMapInitialProps = function getMultiMapInitialProps(store, panelId) {
@@ -7315,7 +7326,7 @@ mapListener.startListening({
   actionCreator: mapActions.setMapPreset,
   effect: function () {
     var _effect2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref6, listenerApi) {
-      var payload, mapId, initialProps, mapPreset, layers, activeLayerId, autoTimeStepLayerId, autoUpdateLayerId, proj, shouldAutoUpdate, shouldAnimate, animationPayload, toggleTimestepAuto, showTimeSlider, displayMapPin, shouldShowZoomControls, shouldShowLegend, shouldShowDataExplorer, dockedLayerManagerSize, timeSliderSpan, toggleTimeSpanAuto, defaultOverlayer, _filterLayers, mapLayers, baseLayers, overLayers, _newLayerIds$layers$f, _newLayerIds$layers$f2, autoTimeStepLayerIdNew, autoUpdateLayerIdNew, onlyActiveLayerIdIsSet, newLayerIds, newAutoTimeStepLayerId, newAutoUpdateLayerId, customLayers, customBaseLayer, customOverLayer, baseLayersWithDefaultLayer, overLayersWithDefaultLayer, allBaseLayers, _overlayersFromStore$, overlayersFromStore, foundOverlayerId, checkIsprojectionSupported, animationLength, animationEndTime, shouldEndtimeOverride, interval, endTime, startTime, centerTimeInSeconds, animationEnd, _startTime, duration, _animationEnd, animationStart, shouldOpenLegend, legendId, fiveMinuteDelayForAnimation, _animationEnd2, _animationStart;
+      var payload, mapId, initialProps, mapPreset, _mapPreset$dimensions, layers, activeLayerId, autoTimeStepLayerId, autoUpdateLayerId, proj, shouldAutoUpdate, shouldAnimate, animationPayload, toggleTimestepAuto, showTimeSlider, displayMapPin, shouldShowZoomControls, shouldShowLegend, shouldShowDataExplorer, dockedLayerManagerSize, timeSliderSpan, toggleTimeSpanAuto, defaultOverlayer, _filterLayers, mapLayers, baseLayers, overLayers, _newLayerIds$layers$f, _newLayerIds$layers$f2, autoTimeStepLayerIdNew, autoUpdateLayerIdNew, onlyActiveLayerIdIsSet, newLayerIds, newAutoTimeStepLayerId, newAutoUpdateLayerId, customLayers, customBaseLayer, customOverLayer, baseLayersWithDefaultLayer, overLayersWithDefaultLayer, allBaseLayers, _overlayersFromStore$, overlayersFromStore, foundOverlayerId, checkIsprojectionSupported, animationLength, animationEndTime, shouldEndtimeOverride, interval, timeAlreadySet, endTime, startTime, centerTimeInSeconds, animationEnd, _startTime, duration, _animationEnd, animationStart, shouldOpenLegend, legendId, fiveMinuteDelayForAnimation, _animationEnd2, _animationStart;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -7324,7 +7335,7 @@ mapListener.startListening({
             mapId = payload.mapId, initialProps = payload.initialProps;
             mapPreset = initialProps.mapPreset;
             if (!mapPreset) {
-              _context2.next = 52;
+              _context2.next = 53;
               break;
             }
             layers = mapPreset.layers, activeLayerId = mapPreset.activeLayerId, autoTimeStepLayerId = mapPreset.autoTimeStepLayerId, autoUpdateLayerId = mapPreset.autoUpdateLayerId, 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, shouldShowDataExplorer = mapPreset.shouldShowDataExplorer, dockedLayerManagerSize = mapPreset.dockedLayerManagerSize, timeSliderSpan = mapPreset.timeSliderSpan, toggleTimeSpanAuto = mapPreset.toggleTimeSpanAuto, defaultOverlayer = mapPreset.defaultOverlayer;
@@ -7461,7 +7472,11 @@ mapListener.startListening({
                 timeStep: interval
               }));
             }
-            // sets animationEndTime by endTime of animationPayload
+            // Check if time dim already set (this is the case when duplicating view via Shift + split window)
+            // If set, don't dispatch setTime action
+            timeAlreadySet = (_mapPreset$dimensions = mapPreset.dimensions) === null || _mapPreset$dimensions === void 0 ? void 0 : _mapPreset$dimensions.find(function (dimension) {
+              return dimension.name === 'time';
+            }); // sets animationEndTime by endTime of animationPayload
             if (animationEndTime) {
               endTime = animationEndTime.includes('NOW') || animationEndTime.includes('TODAY') ? dateUtils.convertNOWandTODAYFormatsToUTC(animationEndTime) : animationEndTime;
               listenerApi.dispatch(mapActions.setAnimationEndTime({
@@ -7475,13 +7490,15 @@ mapListener.startListening({
                 mapId: mapId,
                 animationStartTime: startTime
               }));
-              listenerApi.dispatch(genericActions.setTime({
-                origin: 'map/listener.ts, setMapPreset',
-                sourceId: mapId,
-                value: {
-                  currentTime: startTime
-                }
-              }));
+              if (timeAlreadySet === undefined) {
+                listenerApi.dispatch(genericActions.setTime({
+                  origin: 'map/listener.ts, setMapPreset',
+                  sourceId: mapId,
+                  value: {
+                    currentTime: startTime
+                  }
+                }));
+              }
               centerTimeInSeconds = new Date(handleDateUtilsISOString(endTime)).getTime();
               listenerApi.dispatch(mapActions.setTimeSliderCenterTime({
                 mapId: mapId,
@@ -7498,13 +7515,15 @@ mapListener.startListening({
                 mapId: mapId,
                 animationStartTime: _startTime
               }));
-              listenerApi.dispatch(genericActions.setTime({
-                origin: 'map/listener.ts, setAnimationStartTime',
-                sourceId: mapId,
-                value: {
-                  currentTime: _startTime
-                }
-              }));
+              if (timeAlreadySet === undefined) {
+                listenerApi.dispatch(genericActions.setTime({
+                  origin: 'map/listener.ts, setAnimationStartTime',
+                  sourceId: mapId,
+                  value: {
+                    currentTime: _startTime
+                  }
+                }));
+              }
             }
             // sets animationDelay by speed of animationPayload
             if (animationPayload && animationPayload.speed) {
@@ -7564,15 +7583,15 @@ mapListener.startListening({
                 dockedLayerManagerSize: dockedLayerManagerSize
               }));
             }
-          case 42:
+          case 43:
             if (!(animationEndTime && (shouldEndtimeOverride || !(shouldAutoUpdate || shouldAnimate)))) {
-              _context2.next = 52;
+              _context2.next = 53;
               break;
             }
             fiveMinuteDelayForAnimation = 1000 * 60 * 5; // eslint-disable-next-line no-await-in-loop
-            _context2.next = 46;
+            _context2.next = 47;
             return listenerApi.delay(fiveMinuteDelayForAnimation);
-          case 46:
+          case 47:
             _animationEnd2 = getAnimationEndTime(listenerApi.getState(), mapId);
             listenerApi.dispatch(mapActions.setAnimationEndTime({
               mapId: mapId,
@@ -7587,13 +7606,13 @@ mapListener.startListening({
                 minutes: 5
               }).toISOString()
             }));
-            _context2.next = 42;
+            _context2.next = 43;
             break;
-          case 52:
-            _context2.next = 57;
+          case 53:
+            _context2.next = 58;
             break;
-          case 54:
-            _context2.prev = 54;
+          case 55:
+            _context2.prev = 55;
             _context2.t0 = _context2["catch"](1);
             if (_context2.t0 instanceof Error) {
               listenerApi.dispatch(mapActions.setMapPresetError({
@@ -7601,11 +7620,11 @@ mapListener.startListening({
                 error: _context2.t0.message
               }));
             }
-          case 57:
+          case 58:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[1, 54]]);
+      }, _callee2, null, [[1, 55]]);
     }));
     function effect(_x3, _x4) {
       return _effect2.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/store",
-  "version": "14.3.0",
+  "version": "14.4.0",
   "description": "GeoWeb Store library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,15 +8,15 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/shared": "14.3.0",
+    "@opengeoweb/shared": "14.4.0",
     "react-redux": "^9.2.0",
     "@reduxjs/toolkit": "^2.6.1",
-    "@opengeoweb/webmap-react": "14.3.0",
-    "@opengeoweb/webmap": "14.3.0",
+    "@opengeoweb/webmap-react": "14.4.0",
+    "@opengeoweb/webmap": "14.4.0",
     "immer": "^10.0.3",
     "lodash": "^4.17.21",
-    "@opengeoweb/metronome": "14.3.0",
-    "@opengeoweb/time-slider": "14.3.0",
+    "@opengeoweb/metronome": "14.4.0",
+    "@opengeoweb/time-slider": "14.4.0",
     "react-router-dom": "^6.23.1",
     "ol": "^10.4.0",
     "@turf/turf": "^7.2.0",

package/src/store/map/map/selectors.d.ts

@@ -2073,15 +2073,16 @@ export declare const getLegendId: ((state: CoreAppStore, mapId: string) => strin
  * Example getMapPreset(store, mapId);
  * @param {object} store store: object - store object
  * @param {string} mapId mapId: string - Id of the map
+ * @param {boolean} keepAllDims? keepAllDims: boolean - default false: whether or not to leave the time and reference_time dimentions
  * @returns {MapPreset} returnType: MapPreset
  */
-export declare const getMapPreset: ((state: CoreAppStore & uiTypes.UIModuleState, mapId: string) => MapPreset) & {
+export declare const getMapPreset: ((state: CoreAppStore & uiTypes.UIModuleState, _mapId: string, keepAllDims?: any) => MapPreset) & {
     clearCache: () => void;
     resultsCount: () => number;
     resetResultsCount: () => void;
 } & {
-    resultFunc: (resultFuncArgs_0: ReduxLayer[], resultFuncArgs_1: ReduxLayer[], resultFuncArgs_2: ReduxLayer[], resultFuncArgs_3: Bbox, resultFuncArgs_4: string, resultFuncArgs_5: string | undefined, resultFuncArgs_6: string | undefined, resultFuncArgs_7: string | undefined, resultFuncArgs_8: boolean, resultFuncArgs_9: boolean, resultFuncArgs_10: boolean | undefined, resultFuncArgs_11: boolean | undefined, resultFuncArgs_12: boolean | undefined, resultFuncArgs_13: number, resultFuncArgs_14: number | undefined, resultFuncArgs_15: string | undefined, resultFuncArgs_16: string | undefined, resultFuncArgs_17: number | undefined, resultFuncArgs_18: boolean | undefined, resultFuncArgs_19: boolean | undefined, resultFuncArgs_20: string | undefined, resultFuncArgs_21: uiTypes.UIStoreType, resultFuncArgs_22: string) => MapPreset;
-    memoizedResultFunc: ((resultFuncArgs_0: ReduxLayer[], resultFuncArgs_1: ReduxLayer[], resultFuncArgs_2: ReduxLayer[], resultFuncArgs_3: Bbox, resultFuncArgs_4: string, resultFuncArgs_5: string | undefined, resultFuncArgs_6: string | undefined, resultFuncArgs_7: string | undefined, resultFuncArgs_8: boolean, resultFuncArgs_9: boolean, resultFuncArgs_10: boolean | undefined, resultFuncArgs_11: boolean | undefined, resultFuncArgs_12: boolean | undefined, resultFuncArgs_13: number, resultFuncArgs_14: number | undefined, resultFuncArgs_15: string | undefined, resultFuncArgs_16: string | undefined, resultFuncArgs_17: number | undefined, resultFuncArgs_18: boolean | undefined, resultFuncArgs_19: boolean | undefined, resultFuncArgs_20: string | undefined, resultFuncArgs_21: uiTypes.UIStoreType, resultFuncArgs_22: string) => MapPreset) & {
+    resultFunc: (resultFuncArgs_0: ReduxLayer[], resultFuncArgs_1: ReduxLayer[], resultFuncArgs_2: ReduxLayer[], resultFuncArgs_3: Bbox, resultFuncArgs_4: string, resultFuncArgs_5: string | undefined, resultFuncArgs_6: string | undefined, resultFuncArgs_7: string | undefined, resultFuncArgs_8: boolean, resultFuncArgs_9: boolean, resultFuncArgs_10: boolean | undefined, resultFuncArgs_11: boolean | undefined, resultFuncArgs_12: boolean | undefined, resultFuncArgs_13: number, resultFuncArgs_14: number | undefined, resultFuncArgs_15: string | undefined, resultFuncArgs_16: string | undefined, resultFuncArgs_17: number | undefined, resultFuncArgs_18: Dimension[] | undefined, resultFuncArgs_19: boolean | undefined, resultFuncArgs_20: boolean | undefined, resultFuncArgs_21: string | undefined, resultFuncArgs_22: uiTypes.UIStoreType, resultFuncArgs_23: string, resultFuncArgs_24: any) => MapPreset;
+    memoizedResultFunc: ((resultFuncArgs_0: ReduxLayer[], resultFuncArgs_1: ReduxLayer[], resultFuncArgs_2: ReduxLayer[], resultFuncArgs_3: Bbox, resultFuncArgs_4: string, resultFuncArgs_5: string | undefined, resultFuncArgs_6: string | undefined, resultFuncArgs_7: string | undefined, resultFuncArgs_8: boolean, resultFuncArgs_9: boolean, resultFuncArgs_10: boolean | undefined, resultFuncArgs_11: boolean | undefined, resultFuncArgs_12: boolean | undefined, resultFuncArgs_13: number, resultFuncArgs_14: number | undefined, resultFuncArgs_15: string | undefined, resultFuncArgs_16: string | undefined, resultFuncArgs_17: number | undefined, resultFuncArgs_18: Dimension[] | undefined, resultFuncArgs_19: boolean | undefined, resultFuncArgs_20: boolean | undefined, resultFuncArgs_21: string | undefined, resultFuncArgs_22: uiTypes.UIStoreType, resultFuncArgs_23: string, resultFuncArgs_24: any) => MapPreset) & {
         clearCache: () => void;
         resultsCount: () => number;
         resetResultsCount: () => void;
@@ -2547,6 +2548,26 @@ export declare const getMapPreset: ((state: CoreAppStore & uiTypes.UIModuleState
     } & {
         memoize: typeof import("reselect").weakMapMemoize;
         argsMemoize: typeof import("reselect").weakMapMemoize;
+    }, ((state: CoreAppStore, mapId: string) => Dimension[] | undefined) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    } & {
+        resultFunc: (resultFuncArgs_0: WebMap | undefined) => Dimension[] | undefined;
+        memoizedResultFunc: ((resultFuncArgs_0: WebMap | undefined) => Dimension[] | undefined) & {
+            clearCache: () => void;
+            resultsCount: () => number;
+            resetResultsCount: () => void;
+        };
+        lastResult: () => Dimension[] | undefined;
+        dependencies: [(store: CoreAppStore, mapId: string) => WebMap | undefined];
+        recomputations: () => number;
+        resetRecomputations: () => void;
+        dependencyRecomputations: () => number;
+        resetDependencyRecomputations: () => void;
+    } & {
+        memoize: typeof import("reselect").weakMapMemoize;
+        argsMemoize: typeof import("reselect").weakMapMemoize;
     }, ((state: CoreAppStore, mapId: string) => boolean | undefined) & {
         clearCache: () => void;
         resultsCount: () => number;
@@ -2607,7 +2628,7 @@ export declare const getMapPreset: ((state: CoreAppStore & uiTypes.UIModuleState
     } & {
         memoize: typeof import("reselect").weakMapMemoize;
         argsMemoize: typeof import("reselect").weakMapMemoize;
-    }, (store: uiTypes.UIModuleState) => uiTypes.UIStoreType, (_store: CoreAppStore, mapId: string) => string];
+    }, (store: uiTypes.UIModuleState) => uiTypes.UIStoreType, (_store: CoreAppStore, mapId: string) => string, (_store: CoreAppStore, _mapId: string, keepAllDims?: any) => any];
     recomputations: () => number;
     resetRecomputations: () => void;
     dependencyRecomputations: () => number;