@opengeoweb/store 8.3.1 → 8.4.0

package/index.esm.js

@@ -9598,9 +9598,10 @@ var produceDraftStateForAllLayersForDimensionWithinMap = function produceDraftSt
  * @param dimensions Dimension[]
  */
 var filterNonTimeDimensions = function filterNonTimeDimensions(dimensions) {
-  return dimensions && dimensions.length ? dimensions.filter(function (dim) {
+  var _a;
+  return (_a = dimensions === null || dimensions === void 0 ? void 0 : dimensions.filter(function (dim) {
     return dim.name !== 'time';
-  }) : [];
+  })) !== null && _a !== void 0 ? _a : [];
 };
 
 var utils$2 = /*#__PURE__*/Object.freeze({
@@ -10033,62 +10034,55 @@ var slice$9 = createSlice({
       var _action$payload14 = action.payload,
         layerStyle = _action$payload14.layerStyle,
         layerDimensions = _action$payload14.layerDimensions;
-      /* Set style */
       if (layerStyle && draft.byId[layerStyle.layerId]) {
         draft.byId[layerStyle.layerId].style = layerStyle === null || layerStyle === void 0 ? void 0 : layerStyle.style;
       }
-      /* Set layer dimensions */
-      if (layerDimensions) {
-        /* Find the corresponding layer we want to update */
-        var currentLayer = draft.byId[layerDimensions.layerId];
-        /* Find all other layers with the same name and service, and update these at once (atomic update) */
-        Object.values(draft.byId).filter(function (draftLayer) {
-          return draftLayer.name === currentLayer.name && draftLayer.service === currentLayer.service;
-        }).forEach(function (draftLayer) {
-          var layerId = draftLayer.id;
-          if (layerId && draft.byId[layerId]) {
-            if (!draft.byId[layerId].dimensions) {
-              draft.byId[layerId].dimensions = [];
+      if (!layerDimensions) {
+        return;
+      }
+      var layer = draft.byId[layerDimensions.layerId];
+      var incomingDimensionNames = layerDimensions.dimensions.map(function (dimension) {
+        return dimension.name;
+      });
+      /* Find all other layers with the same name and service, and update these at once (atomic update) */
+      var layersToUpdate = Object.values(draft.byId).filter(function (otherLayer) {
+        return otherLayer.name === layer.name && otherLayer.service === layer.service && otherLayer.id;
+      });
+      layersToUpdate.forEach(function (layerToUpdate) {
+        var _a;
+        var layerId = layerToUpdate.id;
+        var reduxLayer = draft.byId[layerId];
+        (_a = reduxLayer.dimensions) !== null && _a !== void 0 ? _a : reduxLayer.dimensions = [];
+        // remove dimensions not in incoming list of dimensions
+        reduxLayer.dimensions = reduxLayer.dimensions.filter(function (dimension) {
+          return incomingDimensionNames.includes(dimension.name);
+        });
+        var reduxDimensions = reduxLayer.dimensions;
+        /* Now update or insert the dimension for each layer */
+        layerDimensions.dimensions.forEach(function (newLayerDimension) {
+          /* Find the wmLayer */
+          var wmLayer = webmapUtils.getWMLayerById(layerId);
+          /* Find the wmDimension */
+          var wmDimension = wmLayer === null || wmLayer === void 0 ? void 0 : wmLayer.getDimension(newLayerDimension.name);
+          /* This will set the new range of start/stop values for this dimension, making getClosestValue work properly */
+          wmDimension === null || wmDimension === void 0 ? void 0 : wmDimension.reInitializeValues(newLayerDimension.values);
+          var existingDimension = reduxDimensions.find(function (d) {
+            return d.name === newLayerDimension.name;
+          });
+          if (existingDimension) {
+            /* If found update only minValue, maxValue and values */
+            existingDimension.maxValue = newLayerDimension.maxValue;
+            existingDimension.minValue = newLayerDimension.minValue;
+            existingDimension.values = newLayerDimension.values;
+            if (!existingDimension.units) {
+              existingDimension.units = newLayerDimension.units;
             }
-            var draftLayerDimensions = draft.byId[layerId].dimensions;
-            /* Now update the dimension for each layer */
-            layerDimensions.dimensions.forEach(function (newLayerDimension) {
-              /* Find the wmLayer */
-              var wmLayer = webmapUtils.getWMLayerById(layerId);
-              /* Find the wmDimension */
-              var wmDimension = wmLayer && wmLayer.getDimension(newLayerDimension.name);
-              /* This will set the new range of start/stop values for this dimension, making getClosestValue work properly */
-              wmDimension && wmDimension.reInitializeValues(newLayerDimension.values);
-              /* Find corresponding draftLayerDimensions */
-              var draftLayerDimension = draftLayerDimensions === null || draftLayerDimensions === void 0 ? void 0 : draftLayerDimensions.find(function (d) {
-                return d.name === newLayerDimension.name;
-              });
-              if (draftLayerDimension) {
-                /* If found update only minValue, maxValue and values */
-                draftLayerDimension.maxValue = newLayerDimension.maxValue;
-                draftLayerDimension.minValue = newLayerDimension.minValue;
-                draftLayerDimension.values = newLayerDimension.values;
-                if (!draftLayerDimension.units) {
-                  draftLayerDimension.units = newLayerDimension.units;
-                }
-              } else if (layerId === layerDimensions.layerId) {
-                /* Otherwise add a new one, but only for this layer. */
-                draftLayerDimensions.push({
-                  name: newLayerDimension.name,
-                  units: newLayerDimension.units,
-                  currentValue: newLayerDimension.currentValue,
-                  minValue: newLayerDimension.minValue,
-                  maxValue: newLayerDimension.maxValue,
-                  validSyncSelection: newLayerDimension.validSyncSelection,
-                  values: newLayerDimension.values,
-                  timeInterval: newLayerDimension.timeInterval,
-                  synced: newLayerDimension.synced
-                });
-              }
-            });
+          } else if (layerId === layerDimensions.layerId) {
+            /* Otherwise add a new one, but only for this layer. */
+            reduxDimensions.push(Object.assign({}, newLayerDimension));
           }
         });
-      }
+      });
     },
     // feature layer actions
     setSelectedFeature: function setSelectedFeature(draft, action) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/store",
-  "version": "8.3.1",
+  "version": "8.4.0",
   "description": "GeoWeb Store library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -12,9 +12,9 @@
   "main": "./index.esm.js",
   "dependencies": {},
   "peerDependencies": {
-    "@opengeoweb/shared": "8.3.1",
-    "@opengeoweb/webmap": "8.3.1",
-    "@opengeoweb/webmap-react": "8.3.1",
+    "@opengeoweb/shared": "8.4.0",
+    "@opengeoweb/webmap": "8.4.0",
+    "@opengeoweb/webmap-react": "8.4.0",
     "@redux-eggs/core": "2.2.0",
     "@redux-eggs/redux-toolkit": "2.2.0",
     "@redux-eggs/saga-extension": "2.2.0",