@opengeoweb/store 19.5.0 → 19.5.1

package/dist/index.esm.js

@@ -7,6 +7,7 @@ import { secondsPerPxFromCanvasWidth, defaultTimeSpan, defaultSecondsPerPx, defa
 import { produce } from 'immer';
 import { getLastEmptyFeatureIndex, getGeoJson, moveFeature, createInterSections, defaultLayers, fetchStacCatalogRoot, stacCatalogCollectionToLayerProps, fetchStacCatalogCollections, emptyGeoJSON, defaultIntersectionStyleProperties, addSelectionTypeToGeoJSON, getFeatureCollection } from '@opengeoweb/webmap-react';
 export { defaultLayers } from '@opengeoweb/webmap-react';
+import { v4 } from 'uuid';
 import React, { useEffect, useRef, useCallback } from 'react';
 import { useDispatch, useSelector, shallowEqual, useStore } from 'react-redux';
 import { center } from '@turf/turf';
@@ -1282,6 +1283,39 @@ var getSTACServiceRootUrl = function getSTACServiceRootUrl(serviceUrl) {
 var getTrailingSlashVariant = function getTrailingSlashVariant(url) {
   return url.endsWith('/') ? url.slice(0, -1) : "".concat(url, "/");
 };
+/**
+ * Generates a unique id for a geoJSON feature. Feature ids need to be stable
+ * over the lifetime of a feature (also when other features are added or
+ * removed), because they are used to select features and to link feature
+ * properties (eg objectName) to form fields.
+ * @returns unique feature id
+ */
+var generateFeatureId = function generateFeatureId() {
+  return "drawFeature-".concat(v4());
+};
+/**
+ * Makes sure every feature in the featurecollection has a unique id. Existing
+ * unique ids are preserved, missing or duplicate ids are (re)generated.
+ * @param geojson The featurecollection to add ids to
+ * @returns featurecollection where every feature has a unique id
+ */
+var ensureFeatureIds = function ensureFeatureIds(geojson) {
+  var usedIds = new Set();
+  return _objectSpread2(_objectSpread2({}, geojson), {}, {
+    features: geojson.features.map(function (feature) {
+      var currentId = feature.id !== undefined && feature.id !== null ? String(feature.id) : undefined;
+      if (currentId !== undefined && !usedIds.has(currentId)) {
+        usedIds.add(currentId);
+        return feature;
+      }
+      var newId = generateFeatureId();
+      usedIds.add(newId);
+      return _objectSpread2(_objectSpread2({}, feature), {}, {
+        id: newId
+      });
+    })
+  });
+};
 var getFeatureSelectionKey = function getFeatureSelectionKey(feature) {
   var _feature$properties;
   if (!feature) {
@@ -1505,8 +1539,10 @@ var updateMinMaxValueWhenReferenceTimeChanges = function updateMinMaxValueWhenRe
 
 var utils$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
+  ensureFeatureIds: ensureFeatureIds,
   filterCurrentValueFromDimensions: filterCurrentValueFromDimensions,
   filterNonTimeDimensions: filterNonTimeDimensions,
+  generateFeatureId: generateFeatureId,
   getFeatureSelectionKey: getFeatureSelectionKey,
   getSTACServiceRootUrl: getSTACServiceRootUrl,
   getSelectedFeatureIndexByIds: getSelectedFeatureIndexByIds,
@@ -2041,14 +2077,7 @@ var slice$7 = createSlice({
           nextSelectedFeatureIndex = newFeatureIndex;
         }
       }
-      var updatedGeoJSONWithIds = shouldAllowMultipleShapes ? _objectSpread2(_objectSpread2({}, updatedGeoJSON), {}, {
-        features: updatedGeoJSON.features.map(function (feature, index) {
-          return _objectSpread2(_objectSpread2({}, feature), {}, {
-            // Save the index as id so we can use it to select features
-            id: index
-          });
-        })
-      }) : updatedGeoJSON;
+      var updatedGeoJSONWithIds = shouldAllowMultipleShapes ? ensureFeatureIds(updatedGeoJSON) : updatedGeoJSON;
       currentLayer.geojson = updatedGeoJSONWithIds;
       if (nextSelectedFeatureIndex !== undefined) {
         var selectedFeature = updatedGeoJSONWithIds.features[nextSelectedFeatureIndex];
@@ -2087,11 +2116,47 @@ var slice$7 = createSlice({
         });
       }
     },
-    toggleFeatureMode: function toggleFeatureMode(draft, action) {
+    deleteFeature: function deleteFeature(draft, action) {
+      var _currentLayer$geojson3, _currentLayer$selecte, _currentLayer$hovered;
       var _action$payload21 = action.payload,
         layerId = _action$payload21.layerId,
-        isInEditMode = _action$payload21.isInEditMode,
-        drawMode = _action$payload21.drawMode;
+        featureId = _action$payload21.featureId;
+      var currentLayer = draft.byId[layerId];
+      if (!(currentLayer !== null && currentLayer !== void 0 && (_currentLayer$geojson3 = currentLayer.geojson) !== null && _currentLayer$geojson3 !== void 0 && _currentLayer$geojson3.features.length)) {
+        return;
+      }
+      var features = currentLayer.geojson.features;
+      var featureIndex = features.findIndex(function (feature) {
+        return getFeatureSelectionKey(feature) === featureId;
+      });
+      if (featureIndex < 0) {
+        return;
+      }
+      currentLayer.geojson = _objectSpread2(_objectSpread2({}, currentLayer.geojson), {}, {
+        features: features.filter(function (_feature, index) {
+          return index !== featureIndex;
+        })
+      });
+      var wasSelected = !!((_currentLayer$selecte = currentLayer.selectedFeatureIds) !== null && _currentLayer$selecte !== void 0 && _currentLayer$selecte.includes(featureId));
+      if (wasSelected) {
+        currentLayer.selectedFeatureIds = currentLayer.selectedFeatureIds.filter(function (selectedFeatureId) {
+          return selectedFeatureId !== featureId;
+        });
+        // deleting the feature being edited should also end the edit mode
+        if (!currentLayer.selectedFeatureIds.length) {
+          currentLayer.isInEditMode = false;
+          currentLayer.drawMode = '';
+        }
+      }
+      currentLayer.hoveredFeatureIds = (_currentLayer$hovered = currentLayer.hoveredFeatureIds) === null || _currentLayer$hovered === void 0 ? void 0 : _currentLayer$hovered.filter(function (hoveredFeatureId) {
+        return hoveredFeatureId !== featureId;
+      });
+    },
+    toggleFeatureMode: function toggleFeatureMode(draft, action) {
+      var _action$payload22 = action.payload,
+        layerId = _action$payload22.layerId,
+        isInEditMode = _action$payload22.isInEditMode,
+        drawMode = _action$payload22.drawMode;
       if (!draft.byId[layerId]) {
         return;
       }
@@ -2103,10 +2168,10 @@ var slice$7 = createSlice({
       }
     },
     exitFeatureDrawMode: function exitFeatureDrawMode(draft, action) {
-      var _action$payload22 = action.payload,
-        layerId = _action$payload22.layerId,
-        shouldAllowMultipleShapes = _action$payload22.shouldAllowMultipleShapes,
-        reason = _action$payload22.reason;
+      var _action$payload23 = action.payload,
+        layerId = _action$payload23.layerId,
+        shouldAllowMultipleShapes = _action$payload23.shouldAllowMultipleShapes,
+        reason = _action$payload23.reason;
       if (!draft.byId[layerId]) {
         return;
       }
@@ -2142,10 +2207,10 @@ var slice$7 = createSlice({
     },
     // layer info actions
     showLayerInfo: function showLayerInfo(draft, action) {
-      var _action$payload23 = action.payload,
-        serviceUrl = _action$payload23.serviceUrl,
-        layerName = _action$payload23.layerName,
-        style = _action$payload23.style;
+      var _action$payload24 = action.payload,
+        serviceUrl = _action$payload24.serviceUrl,
+        layerName = _action$payload24.layerName,
+        style = _action$payload24.style;
       draft.activeLayerInfo = {
         serviceUrl: serviceUrl,
         layerName: layerName,
@@ -2156,9 +2221,9 @@ var slice$7 = createSlice({
       delete draft.activeLayerInfo;
     },
     SetLayerLegendVisibilityPayload: function SetLayerLegendVisibilityPayload(draft, action) {
-      var _action$payload24 = action.payload,
-        layerId = _action$payload24.layerId,
-        showLayerLegend = _action$payload24.showLayerLegend;
+      var _action$payload25 = action.payload,
+        layerId = _action$payload25.layerId,
+        showLayerLegend = _action$payload25.showLayerLegend;
       var layer = draft.byId[layerId];
       if (!layer) {
         return;
@@ -2171,9 +2236,9 @@ var slice$7 = createSlice({
   },
   extraReducers: function extraReducers(builder) {
     builder.addCase(setTimeSync, function (draft, action) {
-      var _action$payload25 = action.payload,
-        targetsFromAction = _action$payload25.targets,
-        source = _action$payload25.source;
+      var _action$payload26 = action.payload,
+        targetsFromAction = _action$payload26.targets,
+        source = _action$payload26.source;
       /* Because we want backwards compatibility with the previous code, we also need to listen to the original source action */
       var targets = [];
       if (source) {
@@ -2203,9 +2268,9 @@ var slice$7 = 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$payload26 = action.payload,
-        targets = _action$payload26.targets,
-        source = _action$payload26.source;
+      var _action$payload27 = action.payload,
+        targets = _action$payload27.targets,
+        source = _action$payload27.source;
       return targets.reduce(function (prevState, target) {
         var actionType = (source === null || source === void 0 ? void 0 : source.type) || 'GENERIC_SYNC_SETLAYERACTIONS';
         var action = {
@@ -9796,7 +9861,7 @@ drawingToolListener.startListening({
   actionCreator: drawingToolActions.changeDrawToolMode,
   effect: function () {
     var _effect2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref2, listenerApi) {
-      var payload, _layerSelectors$getAc, _currentGeoJSON$featu, _currentGeoJSON$featu2, drawModeId, drawToolId, _payload$shouldUpdate, shouldUpdateShape, drawingTool, _drawingTool$shouldAl, shouldAllowMultipleShapes, geoJSONIntersectionLayerId, geoJSONIntersectionBoundsLayerId, newDrawMode, geoJSONLayer, geoJSON, lastFeatureIndex, newGeoJSON, selectedFeature, _selectedFeatureIndex, isLayerInEditMode, _newGeoJSON, currentGeoJSONLayer, _ref3, currentGeoJSON, selectedFeatureIndex, currentSelectionType, newSelectionType, isNewToolSelected, shouldUpdateNewShape, shapeWithSelectionType, geoJSONFeatureCollection, _newGeoJSON2, _selectedFeature, _t;
+      var payload, _layerSelectors$getAc, _currentGeoJSON$featu, _currentGeoJSON$featu2, drawModeId, drawToolId, _payload$shouldUpdate, shouldUpdateShape, drawingTool, _drawingTool$shouldAl, shouldAllowMultipleShapes, geoJSONIntersectionLayerId, geoJSONIntersectionBoundsLayerId, newDrawMode, geoJSONLayer, geoJSON, lastFeatureIndex, newGeoJSON, selectedFeature, _selectedFeatureIndex, isLayerInEditMode, _selectedFeature, selectedFeatureId, currentGeoJSONLayer, _ref3, currentGeoJSON, selectedFeatureIndex, currentSelectionType, newSelectionType, isNewToolSelected, shouldUpdateNewShape, shapeWithSelectionType, geoJSONFeatureCollection, _newGeoJSON, _selectedFeature2, _t;
       return _regenerator().w(function (_context2) {
         while (1) switch (_context2.p = _context2.n) {
           case 0:
@@ -9849,20 +9914,12 @@ drawingToolListener.startListening({
             }
             _selectedFeatureIndex = getActiveFeatureIndex(listenerApi.getState(), drawingTool.geoJSONLayerId);
             isLayerInEditMode = getIsLayerInEditMode(listenerApi.getState(), drawingTool.geoJSONLayerId);
-            if (_selectedFeatureIndex !== undefined && isLayerInEditMode && geoJSON) {
-              // delete selected feature
-              _newGeoJSON = _objectSpread2(_objectSpread2({}, geoJSON), {}, {
-                features: geoJSON.features.filter(function (_feature, index) {
-                  return index !== _selectedFeatureIndex;
-                })
-              });
-              listenerApi.dispatch(layerActions.updateFeature({
-                layerId: drawingTool.geoJSONLayerId,
-                geojson: _newGeoJSON
-              }));
-              listenerApi.dispatch(layerActions.setSelectedFeatures({
+            _selectedFeature = _selectedFeatureIndex !== undefined && geoJSON ? geoJSON.features[_selectedFeatureIndex] : undefined;
+            selectedFeatureId = getFeatureSelectionKey(_selectedFeature);
+            if (isLayerInEditMode && selectedFeatureId) {
+              listenerApi.dispatch(layerActions.deleteFeature({
                 layerId: drawingTool.geoJSONLayerId,
-                selectedFeatureIds: []
+                featureId: selectedFeatureId
               }));
             } else {
               // if nothing selected, delete all
@@ -9912,18 +9969,18 @@ drawingToolListener.startListening({
             if (shouldUpdateNewShape && shouldUpdateShape) {
               shapeWithSelectionType = addSelectionTypeToGeoJSON(newDrawMode.shape, newDrawMode.selectionType);
               geoJSONFeatureCollection = getFeatureCollection(shapeWithSelectionType, shouldAllowMultipleShapes, currentGeoJSON);
-              _newGeoJSON2 = getGeoJson(geoJSONFeatureCollection, shouldAllowMultipleShapes);
+              _newGeoJSON = getGeoJson(geoJSONFeatureCollection, shouldAllowMultipleShapes);
               if (shouldAllowMultipleShapes) {
-                moveFeature(currentGeoJSON, _newGeoJSON2, selectedFeatureIndex, '');
+                moveFeature(currentGeoJSON, _newGeoJSON, selectedFeatureIndex, '');
               }
-              _selectedFeature = shouldAllowMultipleShapes ? _objectSpread2(_objectSpread2({}, _newGeoJSON2.features[_newGeoJSON2.features.length - 1]), {}, {
+              _selectedFeature2 = shouldAllowMultipleShapes ? _objectSpread2(_objectSpread2({}, _newGeoJSON.features[_newGeoJSON.features.length - 1]), {}, {
                 // Keep this in sync with layerReducer.updateFeature, which
                 // materializes multi-shape feature ids from their array index.
-                id: _newGeoJSON2.features.length - 1
-              }) : _newGeoJSON2.features[_newGeoJSON2.features.length - 1];
+                id: _newGeoJSON.features.length - 1
+              }) : _newGeoJSON.features[_newGeoJSON.features.length - 1];
               listenerApi.dispatch(layerActions.updateFeature(_objectSpread2(_objectSpread2({
                 layerId: drawingTool.geoJSONLayerId,
-                geojson: _newGeoJSON2
+                geojson: _newGeoJSON
               }, geoJSONIntersectionLayerId && {
                 geoJSONIntersectionLayerId: geoJSONIntersectionLayerId
               }), geoJSONIntersectionBoundsLayerId && {
@@ -9931,7 +9988,7 @@ drawingToolListener.startListening({
               })));
               listenerApi.dispatch(layerActions.setSelectedFeatures({
                 layerId: drawingTool.geoJSONLayerId,
-                selectedFeatureIds: getSelectedFeatureIds(_selectedFeature)
+                selectedFeatureIds: getSelectedFeatureIds(_selectedFeature2)
               }));
             }
             listenerApi.dispatch(layerActions.toggleFeatureMode({

package/dist/src/store/map/layer/reducer.d.ts

@@ -1,6 +1,6 @@
 import type { Draft, PayloadAction } from '@reduxjs/toolkit';
 import type { SetLayerAcceptanceTimePayload, SetLayerDimensionsPayload, SetLayerStylePayload, UpdateLayerInfoPayload } from '@opengeoweb/webmap-react';
-import type { LayerState, Layer, AddLayerPayload, SetLayerDimensionPayload, SetLayerEnabledPayload, SetLayerOpacityPayload, SetLayerNamePayload, SetLayerServicePayload, SetLayerGeojsonPayload, DeleteLayerPayload, ErrorLayerPayload, SetLayersPayload, SetBaseLayersPayload, AddBaseLayerPayload, AddAvailableBaseLayerPayload, AddAvailableBaseLayersPayload, SetAvailableBaseLayersPayload, SetSelectedFeaturesPayload, SetHoveredFeaturesPayload, UpdateFeaturePayload, ExitFeatureDrawModePayload, ToggleFeatureModePayload, UpdateFeaturePropertiesPayload, DuplicateMapLayerPayload, ShowLayerInfoPayload, SetLayerGeojsonFromLayerPayload, SetLayerOptionsPayload, SetLayerLegendVisibilityPayload } from './types';
+import type { LayerState, Layer, AddLayerPayload, SetLayerDimensionPayload, SetLayerEnabledPayload, SetLayerOpacityPayload, SetLayerNamePayload, SetLayerServicePayload, SetLayerGeojsonPayload, DeleteLayerPayload, ErrorLayerPayload, SetLayersPayload, SetBaseLayersPayload, AddBaseLayerPayload, AddAvailableBaseLayerPayload, AddAvailableBaseLayersPayload, SetAvailableBaseLayersPayload, SetSelectedFeaturesPayload, SetHoveredFeaturesPayload, UpdateFeaturePayload, ExitFeatureDrawModePayload, ToggleFeatureModePayload, UpdateFeaturePropertiesPayload, DeleteFeaturePayload, DuplicateMapLayerPayload, ShowLayerInfoPayload, SetLayerGeojsonFromLayerPayload, SetLayerOptionsPayload, SetLayerLegendVisibilityPayload } from './types';
 export declare const createLayer: ({ id, opacity, acceptanceTimeInMinutes, enabled, layerType, status, useLatestReferenceTime, ...props }: Layer) => Layer;
 export declare const initialState: LayerState;
 export declare const slice: import("@reduxjs/toolkit").Slice<LayerState, {
@@ -38,6 +38,7 @@ export declare const slice: import("@reduxjs/toolkit").Slice<LayerState, {
     setHoveredFeatures: (draft: Draft<LayerState>, action: PayloadAction<SetHoveredFeaturesPayload>) => void;
     updateFeature: (draft: Draft<LayerState>, action: PayloadAction<UpdateFeaturePayload>) => void;
     updateFeatureProperties: (draft: Draft<LayerState>, action: PayloadAction<UpdateFeaturePropertiesPayload>) => void;
+    deleteFeature: (draft: Draft<LayerState>, action: PayloadAction<DeleteFeaturePayload>) => void;
     toggleFeatureMode: (draft: Draft<LayerState>, action: PayloadAction<ToggleFeatureModePayload>) => void;
     exitFeatureDrawMode: (draft: Draft<LayerState>, action: PayloadAction<ExitFeatureDrawModePayload>) => void;
     toggleSelectableFeatures: (draft: Draft<LayerState>, action: PayloadAction<{
@@ -82,6 +83,7 @@ export declare const layerReducer: import("redux").Reducer<LayerState>, layerAct
     setHoveredFeatures: (draft: Draft<LayerState>, action: PayloadAction<SetHoveredFeaturesPayload>) => void;
     updateFeature: (draft: Draft<LayerState>, action: PayloadAction<UpdateFeaturePayload>) => void;
     updateFeatureProperties: (draft: Draft<LayerState>, action: PayloadAction<UpdateFeaturePropertiesPayload>) => void;
+    deleteFeature: (draft: Draft<LayerState>, action: PayloadAction<DeleteFeaturePayload>) => void;
     toggleFeatureMode: (draft: Draft<LayerState>, action: PayloadAction<ToggleFeatureModePayload>) => void;
     exitFeatureDrawMode: (draft: Draft<LayerState>, action: PayloadAction<ExitFeatureDrawModePayload>) => void;
     toggleSelectableFeatures: (draft: Draft<LayerState>, action: PayloadAction<{

package/dist/src/store/map/layer/types.d.ts

@@ -175,6 +175,9 @@ export interface UpdateFeaturePropertiesPayload extends LayerPayload {
     properties: GeoJSON.GeoJsonProperties;
     targetFeatureIndex?: number;
 }
+export interface DeleteFeaturePayload extends LayerPayload {
+    featureId: string;
+}
 export interface ToggleFeatureModePayload extends LayerPayload {
     isInEditMode?: boolean;
     drawMode?: string;

package/dist/src/store/map/layer/utils.d.ts

@@ -5,6 +5,21 @@ import type { LayerState } from './types';
 export declare const trimTrailingSlashes: (url: string) => string;
 export declare const getSTACServiceRootUrl: (serviceUrl: string) => string;
 export declare const getTrailingSlashVariant: (url: string) => string;
+/**
+ * Generates a unique id for a geoJSON feature. Feature ids need to be stable
+ * over the lifetime of a feature (also when other features are added or
+ * removed), because they are used to select features and to link feature
+ * properties (eg objectName) to form fields.
+ * @returns unique feature id
+ */
+export declare const generateFeatureId: () => string;
+/**
+ * Makes sure every feature in the featurecollection has a unique id. Existing
+ * unique ids are preserved, missing or duplicate ids are (re)generated.
+ * @param geojson The featurecollection to add ids to
+ * @returns featurecollection where every feature has a unique id
+ */
+export declare const ensureFeatureIds: (geojson: GeoJSON.FeatureCollection) => GeoJSON.FeatureCollection;
 export declare const getFeatureSelectionKey: (feature?: GeoJSON.Feature) => string | undefined;
 export declare const getSelectedFeatureIndexByIds: (geojson: GeoJSON.FeatureCollection | undefined, selectedFeatureIds: string[] | undefined) => number | undefined;
 export declare const isActionLayerSynced: (state: LayerState, layerIdFromAction: string, dimension: Dimension) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/store",
-  "version": "19.5.0",
+  "version": "19.5.1",
   "description": "GeoWeb Store library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -32,7 +32,8 @@
     "ol": "^10.4.0",
     "@turf/turf": "^7.2.0",
     "@types/geojson": "^7946.0.14",
-    "react-router": "^7.15.1"
+    "react-router": "^7.15.1",
+    "uuid": "^11.0.0"
   },
   "peerDependencies": {
     "react": "19"