@opengeoweb/store 9.12.0 → 9.13.0

package/index.esm.js

@@ -8,7 +8,7 @@ import { produce } from 'immer';
 import { isEqual, compact } from 'lodash';
 import { createStore as createStore$1 } from '@redux-eggs/redux-toolkit';
 import { getSagaExtension } from '@redux-eggs/saga-extension';
-import { takeLatest, takeEvery, select, put, call as call$b, all, delay } from 'redux-saga/effects';
+import { takeLatest, takeEvery, select, put, all, call as call$b, delay } from 'redux-saga/effects';
 import { metronome } from '@opengeoweb/metronome';
 import React, { useCallback, useEffect } from 'react';
 import { Provider, useDispatch, useSelector } from 'react-redux';
@@ -2258,13 +2258,26 @@ const filterNonTimeDimensions = dimensions => {
   var _a;
   return (_a = dimensions === null || dimensions === void 0 ? void 0 : dimensions.filter(dim => dim.name !== 'time')) !== null && _a !== void 0 ? _a : [];
 };
+/**
+ * Returns the list of dimensions without the time dimension
+ * @param dimensions Dimension[]
+ */
+const filterCurrentValueFromDimensions = dimensions => {
+  var _a;
+  return (_a = dimensions === null || dimensions === void 0 ? void 0 : dimensions.map(dim => {
+    // eslint-disable-next-line no-param-reassign
+    dim.currentValue = '';
+    return dim;
+  })) !== null && _a !== void 0 ? _a : [];
+};
 
 var utils$2 = /*#__PURE__*/Object.freeze({
 	__proto__: null,
 	isActionLayerSynced: isActionLayerSynced,
 	produceDimensionActionForMapLayer: produceDimensionActionForMapLayer,
 	produceDraftStateForAllLayersForDimensionWithinMap: produceDraftStateForAllLayersForDimensionWithinMap,
-	filterNonTimeDimensions: filterNonTimeDimensions
+	filterNonTimeDimensions: filterNonTimeDimensions,
+	filterCurrentValueFromDimensions: filterCurrentValueFromDimensions
 });
 
 /* *
@@ -3231,6 +3244,7 @@ const getSelectedFeatureIndex = createSelector(getLayerById, layer => layer ===
  */
 const getIsLayerInEditMode = createSelector(getLayerById, layer => (layer === null || layer === void 0 ? void 0 : layer.isInEditMode) || false, selectorMemoizationOptions);
 const getFeatureLayerGeoJSON = createSelector(getLayerById, layer => (layer === null || layer === void 0 ? void 0 : layer.geojson) || undefined, selectorMemoizationOptions);
+const getHasFeatureLayerGeoJSON = createSelector(getFeatureLayerGeoJSON, geojson => !!geojson, selectorMemoizationOptions);
 const getFeatureLayerGeoJSONProperties = createSelector(getLayerById, getSelectedFeatureIndex, (layer, selecteFeatureIndex = 0) => {
   var _a, _b;
   return ((_b = (_a = layer === null || layer === void 0 ? void 0 : layer.geojson) === null || _a === void 0 ? void 0 : _a.features[selecteFeatureIndex]) === null || _b === void 0 ? void 0 : _b.properties) || {};
@@ -3313,6 +3327,7 @@ var selectors$7 = /*#__PURE__*/Object.freeze({
 	getSelectedFeatureIndex: getSelectedFeatureIndex,
 	getIsLayerInEditMode: getIsLayerInEditMode,
 	getFeatureLayerGeoJSON: getFeatureLayerGeoJSON,
+	getHasFeatureLayerGeoJSON: getHasFeatureLayerGeoJSON,
 	getFeatureLayerGeoJSONProperties: getFeatureLayerGeoJSONProperties,
 	getDimensionLayerIds: getDimensionLayerIds,
 	getAcceptanceTimeInMinutes: getAcceptanceTimeInMinutes,
@@ -5251,6 +5266,25 @@ const getMapLayers = createSelector(getLayerIds, getLayersById, (layerIdsInMap,
   const layersWithoutUndefined = compact(layersWithUndefined);
   return layersWithoutUndefined;
 }, selectorMemoizationOptions);
+/**
+ * Gets all layer states for a map, but where Dimensions have no currentValue set
+ *
+ * Use this instead of getMapLayers to prevent unnecessary re-renders
+ *
+ * Example: layers = getMapLayers(store, 'mapid_1')
+ * @param {object} store store: object - store object
+ * @param {string} mapId mapId: string - Id of the map
+ * @returns {array} returnType: array -  array containing all layer states for the map
+ */
+const getMapLayersWithoutDimensionCurrentValue = createSelector(getLayerIds, getLayersById, (layerIdsInMap, allLayers) => {
+  const layersWithUndefined = layerIdsInMap.map(layerId => allLayers === null || allLayers === void 0 ? void 0 : allLayers[layerId]);
+  const layersWithoutUndefined = compact(layersWithUndefined);
+  const layersWithoutTimeDim = layersWithoutUndefined.map(layer => produce(layer, draftLayer => {
+    draftLayer.dimensions = filterCurrentValueFromDimensions(draftLayer.dimensions || []);
+    return draftLayer;
+  }));
+  return layersWithoutTimeDim;
+}, selectorMemoizationOptions);
 /**
  * Gets an array of baselayers ids for a map
  *
@@ -5813,6 +5847,7 @@ var selectors$2 = /*#__PURE__*/Object.freeze({
 	getIsMapPresent: getIsMapPresent,
 	getLayerIds: getLayerIds,
 	getMapLayers: getMapLayers,
+	getMapLayersWithoutDimensionCurrentValue: getMapLayersWithoutDimensionCurrentValue,
 	getMapBaseLayersIds: getMapBaseLayersIds,
 	getMapBaseLayers: getMapBaseLayers,
 	getMapOverLayersIds: getMapOverLayersIds,
@@ -7041,7 +7076,7 @@ function* deleteLayerSaga({
   const {
     mapId
   } = payload;
-  const layers = yield select(getMapLayers, mapId);
+  const layers = yield select(getMapLayersWithoutDimensionCurrentValue, mapId);
   if (!layers.length) {
     yield put(mapActions.mapStopAnimation({
       mapId
@@ -7074,7 +7109,7 @@ function* updateAnimation(mapId, maxValue) {
     animationStartTime: newAnimationStartTime
   }));
 }
-function* updateAnimationWithLatestUpdate({
+function* setLayerDimensionsSaga({
   payload
 }) {
   try {
@@ -7105,6 +7140,27 @@ function* updateAnimationWithLatestUpdate({
     if (isAutoUpdateLayer &&
     // only update the active layer
     shouldAutoUpdate && isIncomingMaxTimeLaterThanCurrentLayerTime) {
+      const isMapAnimating = yield select(isAnimating, mapId);
+      if (!isMapAnimating) {
+        yield put(layerActions.layerChangeDimension({
+          layerId,
+          origin: LayerActionOrigin.setLayerDimensionSaga,
+          dimension: {
+            name: 'time',
+            currentValue: incomingMaxTime
+          }
+        }));
+        // Each time a layer updates, set the new time for all synced timesliders
+        const syncedMapIds = yield select(getSyncedMapIdsForTimeslider);
+        if (syncedMapIds) {
+          // Change time value for all other timesliders
+          yield all(syncedMapIds.map(syncedMapId => put(setTime({
+            origin: 'mapStore saga',
+            sourceId: syncedMapId,
+            value: incomingMaxTime
+          }))));
+        }
+      }
       yield call$b(updateAnimation, mapId, incomingMaxTime);
     }
   } catch (error) {
@@ -7481,7 +7537,7 @@ function* rootSaga$4() {
   yield takeLatest(mapActions.mapStopAnimation.type, stopAnimationSaga);
   yield takeLatest(mapActions.mapStartAnimation.type, startAnimationSaga);
   yield takeLatest(layerActions.layerDelete.type, deleteLayerSaga);
-  yield takeLatest(layerActions.onUpdateLayerInformation.type, updateAnimationWithLatestUpdate);
+  yield takeLatest(layerActions.onUpdateLayerInformation.type, setLayerDimensionsSaga);
   yield takeLatest(mapActions.toggleAutoUpdate.type, toggleAutoUpdateSaga);
   yield takeEvery(mapActions.setMapPreset.type, setMapPresetSaga);
   yield takeEvery(mapActions.unregisterMap.type, unregisterMapSaga);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/store",
-  "version": "9.12.0",
+  "version": "9.13.0",
   "description": "GeoWeb Store library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {

package/src/store/mapStore/layers/selectors.d.ts

@@ -317,6 +317,11 @@ export declare const getFeatureLayerGeoJSON: ((state: any, layerId: any) => impo
 }> & {
     clearCache: () => void;
 };
+export declare const getHasFeatureLayerGeoJSON: ((state: any, layerId: any) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("geojson").FeatureCollection<import("geojson").Geometry, import("geojson").GeoJsonProperties> | undefined) => boolean, {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};
 export declare const getFeatureLayerGeoJSONProperties: ((state: any, layerId: any) => {
     [name: string]: any;
 }) & import("reselect").OutputSelectorFields<(args_0: ReduxLayer | undefined, args_1: number | undefined) => {

package/src/store/mapStore/layers/utils.d.ts

@@ -16,3 +16,8 @@ export declare const produceDraftStateForAllLayersForDimensionWithinMap: (draft:
  * @param dimensions Dimension[]
  */
 export declare const filterNonTimeDimensions: (dimensions: Dimension[]) => Dimension[];
+/**
+ * Returns the list of dimensions without the time dimension
+ * @param dimensions Dimension[]
+ */
+export declare const filterCurrentValueFromDimensions: (dimensions: Dimension[]) => Dimension[];

package/src/store/mapStore/map/sagas.d.ts

@@ -8,7 +8,7 @@ export declare function startAnimationSaga({ payload, }: ReturnType<typeof mapAc
 export declare function stopAnimationSaga({ payload, }: ReturnType<typeof mapActions.mapStopAnimation>): Generator;
 export declare function deleteLayerSaga({ payload, }: ReturnType<typeof layerActions.layerDelete>): SagaIterator;
 export declare function updateAnimation(mapId: string, maxValue: string): SagaIterator;
-export declare function updateAnimationWithLatestUpdate({ payload, }: ReturnType<typeof layerActions.onUpdateLayerInformation>): SagaIterator;
+export declare function setLayerDimensionsSaga({ payload, }: ReturnType<typeof layerActions.onUpdateLayerInformation>): SagaIterator;
 export declare function toggleAutoUpdateSaga({ payload, }: ReturnType<typeof mapActions.toggleAutoUpdate>): SagaIterator;
 export declare function handleBaseLayersSaga(mapId: string, baseLayers: Layer[]): SagaIterator;
 export declare function setMapPresetSaga({ payload, }: ReturnType<typeof mapActions.setMapPreset>): SagaIterator;

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

@@ -1,6 +1,6 @@
 import type { Bbox, MapPreset, WebMap, WebMapState } from './types';
 import type { CoreAppStore } from '../../types';
-import type { Dimension, Layer, WebMapAnimationList } from '../types';
+import type { Dimension, Layer, ReduxLayer, WebMapAnimationList } from '../types';
 import type { uiTypes } from '../../ui';
 /**
  * Gets the map state by mapId
@@ -89,7 +89,22 @@ export declare const getLayerIds: ((state: any, mapId: any) => string[]) & impor
  * @param {string} mapId mapId: string - Id of the map
  * @returns {array} returnType: array -  array containing all layer states for the map
  */
-export declare const getMapLayers: ((state: any, mapId: any) => import("../types").ReduxLayer[]) & import("reselect").OutputSelectorFields<(args_0: string[], args_1: Record<string, import("../types").ReduxLayer> | null) => import("../types").ReduxLayer[], {
+export declare const getMapLayers: ((state: any, mapId: any) => ReduxLayer[]) & import("reselect").OutputSelectorFields<(args_0: string[], args_1: Record<string, ReduxLayer> | null) => ReduxLayer[], {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};
+/**
+ * Gets all layer states for a map, but where Dimensions have no currentValue set
+ *
+ * Use this instead of getMapLayers to prevent unnecessary re-renders
+ *
+ * Example: layers = getMapLayers(store, 'mapid_1')
+ * @param {object} store store: object - store object
+ * @param {string} mapId mapId: string - Id of the map
+ * @returns {array} returnType: array -  array containing all layer states for the map
+ */
+export declare const getMapLayersWithoutDimensionCurrentValue: ((state: any, mapId: any) => ReduxLayer[]) & import("reselect").OutputSelectorFields<(args_0: string[], args_1: Record<string, ReduxLayer> | null) => ReduxLayer[], {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -115,7 +130,7 @@ export declare const getMapBaseLayersIds: ((state: any, mapId: any) => string[])
  * @param {string} mapId mapId: string - Id of the map
  * @returns {array} returnType: array -  array containing all baselayers for the map
  */
-export declare const getMapBaseLayers: ((state: any, mapId: any) => import("../types").ReduxLayer[]) & import("reselect").OutputSelectorFields<(args_0: string[], args_1: Record<string, import("../types").ReduxLayer> | null) => import("../types").ReduxLayer[], {
+export declare const getMapBaseLayers: ((state: any, mapId: any) => ReduxLayer[]) & import("reselect").OutputSelectorFields<(args_0: string[], args_1: Record<string, ReduxLayer> | null) => ReduxLayer[], {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -133,7 +148,7 @@ export declare const getMapOverLayersIds: ((state: any, mapId: any) => string[])
 }> & {
     clearCache: () => void;
 };
-export declare const getMapFeatureLayers: ((state: any, mapId: any) => import("../types").ReduxLayer[]) & import("reselect").OutputSelectorFields<(args_0: WebMap | undefined, args_1: import("../types").ReduxLayer[]) => import("../types").ReduxLayer[], {
+export declare const getMapFeatureLayers: ((state: any, mapId: any) => ReduxLayer[]) & import("reselect").OutputSelectorFields<(args_0: WebMap | undefined, args_1: ReduxLayer[]) => ReduxLayer[], {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -146,7 +161,7 @@ export declare const getMapFeatureLayers: ((state: any, mapId: any) => import(".
  * @param {string} mapId mapId: string - Id of the map
  * @returns {array} returnType: array -  array containing all overLayers for the map
  */
-export declare const getMapOverLayers: ((state: any, mapId: any) => import("../types").ReduxLayer[]) & import("reselect").OutputSelectorFields<(args_0: string[], args_1: Record<string, import("../types").ReduxLayer> | null) => import("../types").ReduxLayer[], {
+export declare const getMapOverLayers: ((state: any, mapId: any) => ReduxLayer[]) & import("reselect").OutputSelectorFields<(args_0: string[], args_1: Record<string, ReduxLayer> | null) => ReduxLayer[], {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -190,7 +205,7 @@ export declare const getSelectedTime: ((state: CoreAppStore, mapId: string) => n
 }> & {
     clearCache: () => void;
 };
-export declare const getDataLimitsFromLayers: ((state: any, mapId: any) => number[]) & import("reselect").OutputSelectorFields<(args_0: import("../types").ReduxLayer[]) => number[], {
+export declare const getDataLimitsFromLayers: ((state: any, mapId: any) => number[]) & import("reselect").OutputSelectorFields<(args_0: ReduxLayer[]) => number[], {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -528,7 +543,7 @@ export declare const getMapIdFromLayerId: ((state: CoreAppStore, layerId?: strin
  * @param {string} layerId layerId: string - Id of the layer
  * @returns {string} returnType: string - the layerId, or null if not found
  */
-export declare const getLayerIdByLayerName: ((state: any, _mapId: any, layerName: string) => string) & import("reselect").OutputSelectorFields<(args_0: import("../types").ReduxLayer[], args_1: string) => string, {
+export declare const getLayerIdByLayerName: ((state: any, _mapId: any, layerName: string) => string) & import("reselect").OutputSelectorFields<(args_0: ReduxLayer[], args_1: string) => string, {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -542,7 +557,7 @@ export declare const getLayerIdByLayerName: ((state: any, _mapId: any, layerName
  * @param {string} layerId layerId: string - Id of the layer
  * @returns {number} returnType: index number or -1 if not found
  */
-export declare const getLayerIndexByLayerId: ((state: any, _mapId: any, layerId?: string | undefined) => number) & import("reselect").OutputSelectorFields<(args_0: import("../types").ReduxLayer[], args_1: string | undefined) => number, {
+export declare const getLayerIndexByLayerId: ((state: any, _mapId: any, layerId?: string | undefined) => number) & import("reselect").OutputSelectorFields<(args_0: ReduxLayer[], args_1: string | undefined) => number, {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -556,7 +571,7 @@ export declare const getLayerIndexByLayerId: ((state: any, _mapId: any, layerId?
  * @param {number} layerIndex layerId: number - Index of the layer in the map
  * @returns {object} returnType: layer, or null if not found
  */
-export declare const getLayerByLayerIndex: ((state: any, _mapId: any, layerIndex: number) => Layer) & import("reselect").OutputSelectorFields<(args_0: import("../types").ReduxLayer[], args_1: number) => Layer, {
+export declare const getLayerByLayerIndex: ((state: any, _mapId: any, layerIndex: number) => Layer) & import("reselect").OutputSelectorFields<(args_0: ReduxLayer[], args_1: number) => Layer, {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -633,7 +648,7 @@ export declare const getLegendId: ((state: any, mapId: any) => string | undefine
  * @param {string} mapId mapId: string - Id of the map
  * @returns {MapPreset} returnType: MapPreset
  */
-export declare const getMapPreset: ((state: any, mapId: any) => MapPreset) & import("reselect").OutputSelectorFields<(args_0: import("../types").ReduxLayer[], args_1: import("../types").ReduxLayer[], args_2: import("../types").ReduxLayer[], args_3: Bbox, args_4: string, args_5: string | undefined, args_6: string | undefined, args_7: string | undefined, args_8: boolean, args_9: boolean, args_10: boolean | undefined, args_11: boolean | undefined, args_12: boolean | undefined, args_13: number, args_14: number | undefined, args_15: string | undefined, args_16: string | undefined, args_17: boolean | undefined, args_18: string | undefined, args_19: uiTypes.UIStoreType) => MapPreset, {
+export declare const getMapPreset: ((state: any, mapId: any) => MapPreset) & import("reselect").OutputSelectorFields<(args_0: ReduxLayer[], args_1: ReduxLayer[], args_2: ReduxLayer[], args_3: Bbox, args_4: string, args_5: string | undefined, args_6: string | undefined, args_7: string | undefined, args_8: boolean, args_9: boolean, args_10: boolean | undefined, args_11: boolean | undefined, args_12: boolean | undefined, args_13: number, args_14: number | undefined, args_15: string | undefined, args_16: string | undefined, args_17: boolean | undefined, args_18: string | undefined, args_19: uiTypes.UIStoreType) => MapPreset, {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -646,7 +661,7 @@ export declare const getMapPreset: ((state: any, mapId: any) => MapPreset) & imp
  * @param {string} mapId mapId: string - Id of the map
  * @returns {string[]} returnType: string[] -  array of enabled layerIds
  */
-export declare const getMapLayerIdsEnabled: ((state: any, mapId: any) => string[]) & import("reselect").OutputSelectorFields<(args_0: string[], args_1: Record<string, import("../types").ReduxLayer> | null) => string[], {
+export declare const getMapLayerIdsEnabled: ((state: any, mapId: any) => string[]) & import("reselect").OutputSelectorFields<(args_0: string[], args_1: Record<string, ReduxLayer> | null) => string[], {
     clearCache: () => void;
 }> & {
     clearCache: () => void;