qwc2 2025.11.5 → 2025.11.13

package/plugins/FeatureForm.js

@@ -33,7 +33,6 @@ import { connect } from 'react-redux';
 import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
 import { setEditContext, clearEditContext } from '../actions/editing';
-import { LayerRole } from '../actions/layers';
 import { setCurrentTask } from '../actions/task';
 import AttributeForm from '../components/AttributeForm';
 import ResizeableWindow from '../components/ResizeableWindow';
@@ -81,56 +80,47 @@ var FeatureForm = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_this, "queryFeatures", function (pos) {
       var pendingRequests = 0;
-      Object.entries(_this.props.theme.editConfig || {}).forEach(function (_ref) {
-        var _this$props$filter$fi;
+      Object.entries(_this.props.editConfigs).forEach(function (_ref) {
         var _ref2 = _slicedToArray(_ref, 2),
-          layerId = _ref2[0],
-          editConfig = _ref2[1];
-        if (!editConfig.geomType) {
-          // Skip geometryless datasets
-          return;
-        }
-        var path = [];
-        var sublayer = null;
-        var mapScale = MapUtils.computeForZoom(_this.props.map.scales, _this.props.map.zoom);
-        var layer = _this.props.layers.find(function (l) {
-          return l.role === LayerRole.THEME && (sublayer = LayerUtils.searchSubLayer(l, 'name', layerId, path));
-        });
-        if (!layer || !sublayer || !LayerUtils.sublayerVisible(layer, path) || !LayerUtils.layerScaleInRange(sublayer, mapScale)) {
-          return;
-        }
-        var layerOrder = layer.params.LAYERS.split(",");
-        ++pendingRequests;
-        var scale = Math.round(MapUtils.computeForZoom(_this.props.map.scales, _this.props.map.zoom));
-        _this.props.iface.getFeature(editConfig, pos, _this.props.map.projection, scale, 96, function (featureCollection) {
-          if (featureCollection && !isEmpty(featureCollection.features)) {
-            _this.setState(function (state) {
-              var newPickedFeatures = Object.fromEntries(Object.entries(_objectSpread(_objectSpread({}, state.pickedFeatures), featureCollection.features.reduce(function (res, feature) {
-                return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, layerId + "::" + feature.id, feature));
-              }, {}))).sort(function (a, b) {
-                var partsA = a[0].split("::");
-                var partsB = b[0].split("::");
-                var diff = layerOrder.indexOf(partsB[0]) - layerOrder.indexOf(partsA[0]);
-                return diff === 0 ? partsA[1].localeCompare(partsB[1]) : diff;
-              }));
-              var selectedFeature = state.pendingRequests <= 1 && !state.selectedFeature ? Object.keys(newPickedFeatures)[0] : "";
-              return {
-                pickedFeatures: newPickedFeatures,
-                pendingRequests: state.pendingRequests - 1,
-                selectedFeature: selectedFeature
-              };
-            });
-          } else {
+          mapName = _ref2[0],
+          editConfigs = _ref2[1];
+        Object.entries(editConfigs).forEach(function (_ref3) {
+          var _this$props$filter$fi;
+          var _ref4 = _slicedToArray(_ref3, 2),
+            layerName = _ref4[0],
+            editConfig = _ref4[1];
+          if (!editConfig.geomType) {
+            // Skip geometryless datasets
+            return;
+          }
+          var match = LayerUtils.searchLayer(_this.props.layers, 'wms_name', mapName, 'name', layerName);
+          var mapScale = MapUtils.computeForZoom(_this.props.map.scales, _this.props.map.zoom);
+          if (!match || !LayerUtils.sublayerVisible(match.layer, match.path) || !LayerUtils.layerScaleInRange(match.sublayer, mapScale)) {
+            return;
+          }
+          var layerOrder = match.layer.params.LAYERS.split(",");
+          ++pendingRequests;
+          var scale = Math.round(MapUtils.computeForZoom(_this.props.map.scales, _this.props.map.zoom));
+          _this.props.iface.getFeature(editConfig, pos, _this.props.map.projection, scale, 96, function (featureCollection) {
             _this.setState(function (state) {
-              var _Object$keys$;
-              var selectedFeature = state.pendingRequests <= 1 && !state.selectedFeature ? (_Object$keys$ = Object.keys(state.pickedFeatures)[0]) !== null && _Object$keys$ !== void 0 ? _Object$keys$ : "" : "";
+              var pickedFeatures = state.pickedFeatures;
+              if (!isEmpty(featureCollection === null || featureCollection === void 0 ? void 0 : featureCollection.features)) {
+                pickedFeatures = Object.fromEntries(Object.entries(_objectSpread(_objectSpread({}, state.pickedFeatures), featureCollection.features.reduce(function (res, feature) {
+                  return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, mapName + "#" + layerName + "#" + feature.id, feature));
+                }, {}))).sort(function (a, b) {
+                  var partsA = a[0].split("#");
+                  var partsB = b[0].split("#");
+                  var diff = layerOrder.indexOf(partsB[1]) - layerOrder.indexOf(partsA[1]);
+                  return diff === 0 ? partsA[1].localeCompare(partsB[1]) : diff;
+                }));
+              }
               return {
-                pendingRequests: state.pendingRequests - 1,
-                selectedFeature: selectedFeature
+                pickedFeatures: pickedFeatures,
+                pendingRequests: state.pendingRequests - 1
               };
             });
-          }
-        }, (_this$props$filter$fi = _this.props.filter.filterParams) === null || _this$props$filter$fi === void 0 ? void 0 : _this$props$filter$fi[sublayer.name], _this.props.filter.filterGeom);
+          }, (_this$props$filter$fi = _this.props.filter.filterParams) === null || _this$props$filter$fi === void 0 ? void 0 : _this$props$filter$fi[match.sublayer.name], _this.props.filter.filterGeom);
+        });
       });
       _this.setState({
         pendingRequests: pendingRequests,
@@ -138,29 +128,46 @@ var FeatureForm = /*#__PURE__*/function (_React$Component) {
         selectedFeature: ""
       });
     });
-    _defineProperty(_this, "setSelectedFeature", function (ev) {
+    _defineProperty(_this, "setSelectedFeature", function (selectedFeature) {
+      if (selectedFeature) {
+        var _selectedFeature$spli = selectedFeature.split("#", 2),
+          _selectedFeature$spli2 = _slicedToArray(_selectedFeature$spli, 2),
+          mapName = _selectedFeature$spli2[0],
+          layerName = _selectedFeature$spli2[1];
+        var editConfig = _this.props.editConfigs[mapName][layerName];
+        _this.props.setEditContext('FeatureForm', {
+          action: 'Pick',
+          feature: _this.state.pickedFeatures[selectedFeature],
+          changed: false,
+          mapPrefix: mapName,
+          editConfig: editConfig
+        });
+      } else {
+        _this.props.clearEditContext('FeatureForm');
+      }
       _this.setState({
-        selectedFeature: ev.target.value
+        selectedFeature: selectedFeature
       });
     });
     _defineProperty(_this, "onWindowClose", function () {
-      _this.clearResults();
-      if (_this.props.exitTaskOnResultsClose) {
-        _this.props.setCurrentTask(null);
+      if (!_this.props.editContext.changed) {
+        _this.clearResults();
+        if (_this.props.exitTaskOnResultsClose) {
+          _this.props.setCurrentTask(null);
+        }
       }
     });
     _defineProperty(_this, "clearResults", function () {
-      if (!_this.props.editContext.changed) {
-        _this.setState(FeatureForm.defaultState);
-      }
+      _this.props.clearEditContext('FeatureForm');
+      _this.setState(FeatureForm.defaultState);
     });
     _defineProperty(_this, "updatePickedFeatures", function (newfeature) {
       _this.setState(function (state) {
         return {
-          pickedFeatures: Object.entries(state.pickedFeatures).reduce(function (res, _ref3) {
-            var _ref4 = _slicedToArray(_ref3, 2),
-              key = _ref4[0],
-              feature = _ref4[1];
+          pickedFeatures: Object.entries(state.pickedFeatures).reduce(function (res, _ref5) {
+            var _ref6 = _slicedToArray(_ref5, 2),
+              key = _ref6[0],
+              feature = _ref6[1];
             res[key] = feature.id === newfeature.id ? newfeature : feature;
             return res;
           }, {})
@@ -193,43 +200,19 @@ var FeatureForm = /*#__PURE__*/function (_React$Component) {
           var mapCrs = this.props.theme.mapCrs;
           this.queryFeatures(CoordinatesUtils.reproject(c, startupParams.crs || mapCrs, mapCrs));
         }
-      } else if (this.props.theme !== prevProps.theme) {
+      } else if (this.props.theme !== prevProps.theme || !this.props.enabled && prevProps.enabled) {
         this.clearResults();
-      } else if (!this.props.enabled && prevProps.enabled) {
-        if (this.props.clearResultsOnClose) {
-          this.clearResults();
-        }
       }
-      if (this.props.enabled && !prevProps.enabled) {
-        this.props.setEditContext('FeatureForm', {
-          action: 'Pick'
-        });
-      }
-      var isCurrentContext = this.props.editContext.id === this.props.currentEditContext;
-      if (this.props.enabled && isCurrentContext && !this.props.editContext.changed && this.state.pendingRequests === 0) {
+      var isAllowedContext = [null, "FeatureForm"].includes(this.props.currentEditContext);
+      if (this.props.enabled && this.state.pendingRequests === 0 && isAllowedContext && !this.props.editContext.changed) {
         var clickPoint = this.queryPoint(prevProps);
         if (clickPoint) {
           this.queryFeatures(clickPoint);
         }
       }
-      if (this.props.enabled && this.state.selectedFeature !== prevState.selectedFeature) {
-        var feature = this.state.pickedFeatures ? this.state.pickedFeatures[this.state.selectedFeature] : null;
-        var curLayerId = this.state.selectedFeature.split("::")[0];
-        var curConfig = this.props.theme.editConfig[curLayerId] || {};
-        var canEditGeometry = ['Point', 'LineString', 'Polygon'].includes((curConfig.geomType || "").replace(/^Multi/, '').replace(/Z$/, ''));
-        var editPermissions = curConfig.permissions || {};
-        this.props.setEditContext('FeatureForm', {
-          action: 'Pick',
-          feature: feature,
-          changed: false,
-          geomType: curConfig.geomType || null,
-          geomReadOnly: editPermissions.updatable === false || !canEditGeometry,
-          permissions: (curConfig === null || curConfig === void 0 ? void 0 : curConfig.permissions) || {}
-        });
-      }
-      if (!this.props.enabled && prevProps.enabled) {
-        this.props.clearEditContext('FeatureForm');
-        this.setState(FeatureForm.defaultState);
+      if (this.state.pendingRequests === 0 && prevState.pendingRequests > 0) {
+        // Select first result
+        this.setSelectedFeature(Object.keys(this.state.pickedFeatures)[0]);
       }
     }
   }, {
@@ -255,39 +238,48 @@ var FeatureForm = /*#__PURE__*/function (_React$Component) {
           }, LocaleUtils.tr("featureform.noresults")));
         } else {
           var featureText = LocaleUtils.tr("featureform.feature");
-          var curLayerId = this.state.selectedFeature.split("::")[0];
-          var curConfig = this.props.theme.editConfig[curLayerId];
+          var attributeForm = null;
+          if (this.props.editContext.feature) {
+            var _this$props$layers$fi;
+            var translations = (_this$props$layers$fi = this.props.layers.find(function (layer) {
+              return layer.wms_name === _this2.props.editContext.mapPrefix;
+            })) === null || _this$props$layers$fi === void 0 ? void 0 : _this$props$layers$fi.translations;
+            attributeForm = /*#__PURE__*/React.createElement(AttributeForm, {
+              editContext: this.props.editContext,
+              iface: this.props.iface,
+              onCommit: this.updatePickedFeatures,
+              translations: translations
+            });
+          }
           body = /*#__PURE__*/React.createElement("div", {
             className: "feature-query-body",
             role: "body"
           }, Object.keys(this.state.pickedFeatures).length > 1 ? /*#__PURE__*/React.createElement("div", {
             className: "feature-query-selection"
           }, /*#__PURE__*/React.createElement("select", {
-            onChange: this.setSelectedFeature,
+            onChange: function onChange(ev) {
+              return _this2.setSelectedFeature(ev.target.value);
+            },
             value: this.state.selectedFeature
-          }, Object.entries(this.state.pickedFeatures).map(function (_ref5) {
-            var _this2$props$theme$tr, _this2$props$theme$tr2, _LayerUtils$searchLay, _LayerUtils$searchLay2;
-            var _ref6 = _slicedToArray(_ref5, 2),
-              id = _ref6[0],
-              feature = _ref6[1];
-            var _id$split = id.split("::"),
-              _id$split2 = _slicedToArray(_id$split, 2),
-              layerId = _id$split2[0],
-              featureId = _id$split2[1];
-            var editConfig = _this2.props.theme.editConfig[layerId];
-            var layerName = editConfig.layerName;
-            var layerTitle = editConfig.layerTitle ? (_this2$props$theme$tr = (_this2$props$theme$tr2 = _this2.props.theme.translations) === null || _this2$props$theme$tr2 === void 0 || (_this2$props$theme$tr2 = _this2$props$theme$tr2.layertree) === null || _this2$props$theme$tr2 === void 0 ? void 0 : _this2$props$theme$tr2[layerName]) !== null && _this2$props$theme$tr !== void 0 ? _this2$props$theme$tr : editConfig.layerTitle : (_LayerUtils$searchLay = (_LayerUtils$searchLay2 = LayerUtils.searchLayer(_this2.props.layers, _this2.props.theme.url, layerName)) === null || _LayerUtils$searchLay2 === void 0 || (_LayerUtils$searchLay2 = _LayerUtils$searchLay2.sublayer) === null || _LayerUtils$searchLay2 === void 0 ? void 0 : _LayerUtils$searchLay2.title) !== null && _LayerUtils$searchLay !== void 0 ? _LayerUtils$searchLay : layerName;
+          }, Object.entries(this.state.pickedFeatures).map(function (_ref7) {
+            var _ref9, _ref10, _match$layer$translat, _match$layer$translat2, _match$sublayer;
+            var _ref8 = _slicedToArray(_ref7, 2),
+              id = _ref8[0],
+              feature = _ref8[1];
+            var _id$split = id.split("#"),
+              _id$split2 = _slicedToArray(_id$split, 3),
+              mapName = _id$split2[0],
+              layerName = _id$split2[1],
+              featureId = _id$split2[2];
+            var editConfig = _this2.props.editConfigs[mapName][layerName];
+            var match = LayerUtils.searchLayer(_this2.props.layers, 'wms_name', mapName, 'name', layerName);
+            var layerTitle = (_ref9 = (_ref10 = (_match$layer$translat = (_match$layer$translat2 = match.layer.translations) === null || _match$layer$translat2 === void 0 || (_match$layer$translat2 = _match$layer$translat2.layertree) === null || _match$layer$translat2 === void 0 ? void 0 : _match$layer$translat2[layerName]) !== null && _match$layer$translat !== void 0 ? _match$layer$translat : editConfig.layerTitle) !== null && _ref10 !== void 0 ? _ref10 : match === null || match === void 0 || (_match$sublayer = match.sublayer) === null || _match$sublayer === void 0 ? void 0 : _match$sublayer.title) !== null && _ref9 !== void 0 ? _ref9 : layerName;
             var featureName = editConfig.displayField ? feature.properties[editConfig.displayField] : featureText + " " + featureId;
             return /*#__PURE__*/React.createElement("option", {
               key: id,
               value: id
             }, layerTitle + ": " + featureName);
-          }))) : null, this.props.editContext.feature ? /*#__PURE__*/React.createElement(AttributeForm, {
-            editConfig: curConfig,
-            editContext: this.props.editContext,
-            iface: this.props.iface,
-            onCommit: this.updatePickedFeatures
-          }) : null);
+          }))) : null, attributeForm);
         }
         resultWindow = /*#__PURE__*/React.createElement(ResizeableWindow, {
           dockable: this.props.geometry.side,
@@ -315,10 +307,9 @@ var FeatureForm = /*#__PURE__*/function (_React$Component) {
 }(React.Component);
 _defineProperty(FeatureForm, "propTypes", {
   clearEditContext: PropTypes.func,
-  /** Whether to clear the identify results when exiting the identify tool. */
-  clearResultsOnClose: PropTypes.bool,
   click: PropTypes.object,
   currentEditContext: PropTypes.string,
+  editConfigs: PropTypes.object,
   editContext: PropTypes.object,
   enabled: PropTypes.bool,
   /** Whether to clear the task when the results window is closed. */
@@ -372,6 +363,7 @@ export default (function () {
       layers: state.layers.flat,
       filter: state.layers.filter,
       map: state.map,
+      editConfigs: state.layers.editConfigs,
       theme: state.theme.current,
       startupParams: state.localConfig.startupParams
     };

package/plugins/LayerTree.js

@@ -401,6 +401,7 @@ var LayerTree = /*#__PURE__*/function (_React$Component) {
       }) : null);
     });
     _defineProperty(_this, "renderOptionsMenu", function (layer, sublayer, path, marginRight) {
+      var _this$props$editConfi;
       var subtreevisibility = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
       var allowReordering = ConfigUtils.getConfigProp("allowReorderingLayers", _this.props.theme) === true;
       var zoomToLayerButton = null;
@@ -453,7 +454,7 @@ var LayerTree = /*#__PURE__*/function (_React$Component) {
         });
       }
       var attrTableButton = null;
-      if (_this.props.showAttributeTableLink && ConfigUtils.havePlugin("AttributeTable") && layer.role === LayerRole.THEME && _this.props.theme.editConfig[sublayer.name]) {
+      if (_this.props.showAttributeTableLink && ConfigUtils.havePlugin("AttributeTable") && layer.role === LayerRole.THEME && (_this$props$editConfi = _this.props.editConfigs[layer.wms_name]) !== null && _this$props$editConfi !== void 0 && _this$props$editConfi[sublayer.name]) {
         attrTableButton = /*#__PURE__*/React.createElement(Icon, {
           icon: "editing",
           onClick: function onClick() {
@@ -1079,6 +1080,7 @@ _defineProperty(LayerTree, "propTypes", {
   /** Whether to display a BBOX dependent legend. Can be `true|false|"theme"`, latter means only for theme layers. */
   bboxDependentLegend: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
   changeLayerProperty: PropTypes.func,
+  editConfigs: PropTypes.object,
   /** Whether to enable the legend print functionality. */
   enableLegendPrint: PropTypes.bool,
   /** Whether to display a service info button to display the WMS service metadata. */
@@ -1178,6 +1180,7 @@ _defineProperty(LayerTree, "defaultProps", {
 });
 var selector = function selector(state) {
   return {
+    editConfigs: state.layers.editConfigs,
     layers: state.layers.flat,
     filter: state.layers.filter,
     loadingLayers: state.layers.loading,

package/plugins/NewsPopup.js

@@ -52,7 +52,7 @@ var NewsPopup = /*#__PURE__*/function (_React$Component) {
         className: "newspopup-dialog-popup-body",
         role: "body"
       }, /*#__PURE__*/React.createElement("iframe", {
-        src: _this.props.newsDocument
+        src: _this.props.newsDocument.replace('{lang}', LocaleUtils.lang())
       }), /*#__PURE__*/React.createElement("div", {
         className: "newspopup-dialog-popup-buttonbar"
       }, /*#__PURE__*/React.createElement("button", {
@@ -127,7 +127,7 @@ var NewsPopup = /*#__PURE__*/function (_React$Component) {
 }(React.Component);
 _defineProperty(NewsPopup, "availableIn3D", true);
 _defineProperty(NewsPopup, "propTypes", {
-  /** URL to the news HTML document to display in the popup. */
+  /** URL to the news HTML document to display in the popup. Can contain `{lang}` as a placeholder which will be replaced with the current viewer language.*/
   newsDocument: PropTypes.string,
   /** Revision of the document. */
   newsRev: PropTypes.string,

package/plugins/Portal.js

@@ -133,6 +133,7 @@ var Portal = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React.createElement(ThemeList, {
         collapsibleGroups: this.props.collapsibleGroups,
         dontPreserveSettingsOnSwitch: !preserveSettings,
+        expandGroups: this.props.expandGroups,
         filter: this.state.filter
       })), /*#__PURE__*/React.createElement("div", {
         className: "portal-bottombar"
@@ -169,6 +170,8 @@ _defineProperty(Portal, "propTypes", {
   collapsibleGroups: PropTypes.bool,
   currentTask: PropTypes.string,
   currentTheme: PropTypes.object,
+  /** Whether to expand theme groups by default. */
+  expandGroups: PropTypes.bool,
   keepMenuOpen: PropTypes.bool,
   /** Name of a logo image below assets/img. */
   logo: PropTypes.string,
@@ -186,7 +189,6 @@ _defineProperty(Portal, "propTypes", {
   userName: PropTypes.string
 });
 _defineProperty(Portal, "defaultProps", {
-  collapsibleGroups: true,
   menuItems: []
 });
 var selector = function selector(state) {

package/plugins/Print.js

@@ -254,7 +254,7 @@ var Print = /*#__PURE__*/function (_React$Component) {
         return /*#__PURE__*/React.createElement("option", {
           key: item.name,
           value: item.name
-        }, _this.translateLayoutName(item.name));
+        }, _this.translateLayoutName(item));
       })))), _this.props.formats.length > 1 ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("print.format")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("select", {
         disabled: _this.state.printSeriesEnabled,
         name: "FORMAT",
@@ -782,9 +782,9 @@ var Print = /*#__PURE__*/function (_React$Component) {
         });
       });
     });
-    _defineProperty(_this, "translateLayoutName", function (name) {
-      var _this$props$theme$tra, _this$props$theme$tra2;
-      return (_this$props$theme$tra = (_this$props$theme$tra2 = _this.props.theme.translations) === null || _this$props$theme$tra2 === void 0 || (_this$props$theme$tra2 = _this$props$theme$tra2.layouts) === null || _this$props$theme$tra2 === void 0 ? void 0 : _this$props$theme$tra2[name]) !== null && _this$props$theme$tra !== void 0 ? _this$props$theme$tra : name;
+    _defineProperty(_this, "translateLayoutName", function (item) {
+      var _ref9, _ref10, _this$props$theme$tra, _this$props$theme$tra2, _this$props$theme$tra3;
+      return (_ref9 = (_ref10 = (_this$props$theme$tra = (_this$props$theme$tra2 = _this.props.theme.translations) === null || _this$props$theme$tra2 === void 0 || (_this$props$theme$tra2 = _this$props$theme$tra2.layouts) === null || _this$props$theme$tra2 === void 0 ? void 0 : _this$props$theme$tra2[item.title]) !== null && _this$props$theme$tra !== void 0 ? _this$props$theme$tra : (_this$props$theme$tra3 = _this.props.theme.translations) === null || _this$props$theme$tra3 === void 0 || (_this$props$theme$tra3 = _this$props$theme$tra3.layouts) === null || _this$props$theme$tra3 === void 0 ? void 0 : _this$props$theme$tra3[item.name]) !== null && _ref10 !== void 0 ? _ref10 : item.title) !== null && _ref9 !== void 0 ? _ref9 : item.name;
     });
     _this.printForm = null;
     _this.state.grid = props.gridInitiallyEnabled;

package/plugins/ThemeSwitcher.js

@@ -106,6 +106,7 @@ var ThemeSwitcher = /*#__PURE__*/function (_React$Component) {
             allowAddingOtherThemeLayers: showAddThemeLayersButton,
             allowAddingOtherThemes: showAddThemeButton,
             collapsibleGroups: _this2.props.collapsibleGroups,
+            expandGroups: _this2.props.expandGroups,
             filter: _this2.state.filter,
             showDefaultThemeSelector: _this2.props.showDefaultThemeSelector,
             showLayerAfterChangeTheme: _this2.props.showLayerAfterChangeTheme
@@ -128,6 +129,8 @@ _defineProperty(ThemeSwitcher, "propTypes", {
   /** Whether to allow collapsing theme groups. */
   collapsibleGroups: PropTypes.bool,
   currentTask: PropTypes.object,
+  /** Whether to expand theme groups by default. */
+  expandGroups: PropTypes.bool,
   /** Whether to hide the add theme button. Note: the button will also be hidden if the global option `allowAddingOtherThemes` is `false`. */
   hideAddThemeButton: PropTypes.bool,
   /** Whether to hide the add theme layers button. Note: the button will also be hidden if the global option `allowAddingOtherThemes` is `false`. */

package/plugins/map/EditingSupport.js

@@ -104,7 +104,7 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
       _this.props.map.addInteraction(drawInteraction);
       _this.interaction = drawInteraction;
       _this.setState({
-        showRecordLocation: ["Point", "LineString"].includes(geomType)
+        showRecordLocation: ["Point", "LineString", "MultiPoint", "MultiLineString"].includes(geomType)
       });
     });
     _defineProperty(_this, "addEditInteraction", function () {
@@ -199,7 +199,7 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      if (this.state.showRecordLocation) {
+      if (this.state.showRecordLocation && this.props.editContext.geomType) {
         var geomType = this.props.editContext.geomType.replace(/Z$/, '');
         return /*#__PURE__*/React.createElement(LocationRecorder, {
           drawInteraction: this.interaction,

package/plugins/map/RedliningSupport.js

@@ -376,7 +376,7 @@ var RedliningSupport = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "addTransformInteraction", function () {
       var redliningLayer = _this.searchRedliningLayer(_this.props.redlining.layer);
       if (!redliningLayer) {
-        return;
+        return null;
       }
       var transformInteraction = _this.setupTransformInteraction(redliningLayer, [], true);
       transformInteraction.on('select', function (evt) {

package/plugins/style/Editing.css

@@ -40,3 +40,37 @@
 #Editing select.editing-feature-select:disabled {
     cursor: not-allowed;
 }
+
+.editing-clone-dialog {
+    display: flex;
+    flex-direction: column;
+    gap: 0.25em;
+}
+
+.editing-clone-header {
+    font-weight: bold;
+    margin-bottom: 0.25em;
+}
+
+.editing-clone-table {
+    margin-top: calc(-0.25em - 1px);
+    background: var(--list-bg-color);
+    border: 1px solid var(--border-color);
+    width: 100%;
+    table-layout: fixed;
+}
+
+.editing-clone-table td {
+    padding: 0.125em 0.25em;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: 50%;
+}
+
+.editing-clone-attribute {
+    display: flex;
+    align-items: center;
+    gap: 0.5em;
+    cursor: pointer;
+}

package/reducers/editing.js

@@ -33,8 +33,10 @@ var checkNonZeroZ = function checkNonZeroZ(oldState, newState, fallback) {
   }
   return (oldState === null || oldState === void 0 ? void 0 : oldState.geomNonZeroZ) || false;
 };
-var checkGeomReadOnly = function checkGeomReadOnly(geomType) {
-  return (geomType !== null && geomType !== void 0 ? geomType : null) !== null && !['Point', 'LineString', 'Polygon'].includes((geomType || "").replace(/^Multi/, '').replace(/Z$/, ''));
+var checkGeomReadOnly = function checkGeomReadOnly(editConfig) {
+  var _editConfig$geomType, _editConfig$permissio;
+  var simpleGeomType = ((_editConfig$geomType = editConfig === null || editConfig === void 0 ? void 0 : editConfig.geomType) !== null && _editConfig$geomType !== void 0 ? _editConfig$geomType : "").replace(/^Multi/, '').replace(/Z$/, '');
+  return (editConfig === null || editConfig === void 0 ? void 0 : editConfig.geomType) && !['Point', 'LineString', 'Polygon'].includes(simpleGeomType) || (editConfig === null || editConfig === void 0 || (_editConfig$permissio = editConfig.permissions) === null || _editConfig$permissio === void 0 ? void 0 : _editConfig$permissio.updatable) === false;
 };
 export default function editing() {
   var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultState;
@@ -42,18 +44,21 @@ export default function editing() {
   switch (action.type) {
     case SET_EDIT_CONTEXT:
       {
-        var _action$editContext$g, _state$contexts$actio;
+        var _action$editConfig, _state$contexts$actio, _editConfig$permissio2;
+        var editConfig = (_action$editConfig = action.editConfig) !== null && _action$editConfig !== void 0 ? _action$editConfig : (_state$contexts$actio = state.contexts[action.contextId]) === null || _state$contexts$actio === void 0 ? void 0 : _state$contexts$actio.editConfig;
         return {
           contexts: _objectSpread(_objectSpread({}, state.contexts), {}, _defineProperty({}, action.contextId, _objectSpread(_objectSpread(_objectSpread({
             action: null,
             feature: null,
-            geomType: null,
             changed: false,
-            permissions: {}
+            mapPrefix: null,
+            editConfig: null
           }, state.contexts[action.contextId]), action.editContext), {}, {
             geomNonZeroZ: checkNonZeroZ(state.contexts[action.contextId], action.editContext),
-            geomReadOnly: checkGeomReadOnly((_action$editContext$g = action.editContext.geomType) !== null && _action$editContext$g !== void 0 ? _action$editContext$g : (_state$contexts$actio = state.contexts[action.contextId]) === null || _state$contexts$actio === void 0 ? void 0 : _state$contexts$actio.geomType),
-            id: action.contextId
+            geomReadOnly: checkGeomReadOnly(editConfig),
+            id: action.contextId,
+            geomType: editConfig === null || editConfig === void 0 ? void 0 : editConfig.geomType,
+            permissions: (_editConfig$permissio2 = editConfig === null || editConfig === void 0 ? void 0 : editConfig.permissions) !== null && _editConfig$permissio2 !== void 0 ? _editConfig$permissio2 : {}
           }))),
           currentContext: action.contextId
         };

package/reducers/layers.js

@@ -34,7 +34,8 @@ var defaultState = {
     filterParams: null,
     filterGeom: null,
     timeRange: null
-  }
+  },
+  editConfigs: {}
 };
 export default function layers() {
   var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultState;
@@ -196,8 +197,13 @@ export default function layers() {
             bl: newLayer.name
           });
         }
+        var newEditConfigs = state.editConfigs;
+        if (newLayer.editConfig && newLayer.wms_name) {
+          newEditConfigs = _objectSpread(_objectSpread({}, newEditConfigs), {}, _defineProperty({}, newLayer.wms_name, _objectSpread(_objectSpread({}, newEditConfigs[newLayer.wms_name]), newLayer.editConfig)));
+        }
         return _objectSpread(_objectSpread({}, state), {}, {
-          flat: _newLayers2
+          flat: _newLayers2,
+          editConfigs: newEditConfigs
         });
       }
     case ADD_LAYER_SEPARATOR:
@@ -233,6 +239,7 @@ export default function layers() {
           return state;
         }
         var _newLayers4 = state.flat;
+        var _newEditConfigs = state.editConfigs;
         if (_layer.role === LayerRole.BACKGROUND || isEmpty(action.sublayerpath)) {
           var position = state.flat.findIndex(function (l) {
             return l.id === action.layerId;
@@ -243,6 +250,10 @@ export default function layers() {
             // Compress layers
             _newLayers4 = LayerUtils.implodeLayers(LayerUtils.explodeLayers(_newLayers4));
           }
+          if (_newEditConfigs[_layer.wms_name]) {
+            _newEditConfigs = _objectSpread({}, _newEditConfigs);
+            delete _newEditConfigs[_layer.wms_name];
+          }
         } else {
           _newLayers4 = LayerUtils.removeLayer(state.flat, _layer, action.sublayerpath).map(function (l) {
             if (l.type === "wms") {
@@ -256,7 +267,8 @@ export default function layers() {
           l: LayerUtils.buildWMSLayerUrlParam(_newLayers4)
         });
         return _objectSpread(_objectSpread({}, state), {}, {
-          flat: _newLayers4
+          flat: _newLayers4,
+          editConfigs: _newEditConfigs
         });
       }
     case ADD_LAYER_FEATURES:
@@ -365,8 +377,13 @@ export default function layers() {
           UrlParams.updateParams({
             l: LayerUtils.buildWMSLayerUrlParam(_newLayers8)
           });
+          var _newEditConfigs2 = state.editConfigs;
+          if (action.layer.editConfig) {
+            _newEditConfigs2 = _objectSpread(_objectSpread({}, _newEditConfigs2), {}, _defineProperty({}, _newLayers8[themeLayerIdx].wms_name, _objectSpread(_objectSpread({}, _newEditConfigs2[_newLayers8[themeLayerIdx].wms_name]), action.layer.editConfig)));
+          }
           return _objectSpread(_objectSpread({}, state), {}, {
-            flat: _newLayers8
+            flat: _newLayers8,
+            editConfigs: _newEditConfigs2
           });
         }
         return state;
@@ -411,8 +428,13 @@ export default function layers() {
         UrlParams.updateParams({
           l: LayerUtils.buildWMSLayerUrlParam(_newLayers11)
         });
+        var _newEditConfigs3 = state.editConfigs;
+        if (action.layer.editConfig && action.layer.wms_name) {
+          _newEditConfigs3 = _objectSpread(_objectSpread({}, _newEditConfigs3), {}, _defineProperty({}, action.layer.wms_name, _objectSpread(_objectSpread({}, _newEditConfigs3[action.layer.wms_name]), action.layer.editConfig)));
+        }
         return _objectSpread(_objectSpread({}, state), {}, {
-          flat: _newLayers11
+          flat: _newLayers11,
+          editConfigs: _newEditConfigs3
         });
       }
     case SET_SWIPE:

package/reducers/locale.js

@@ -13,6 +13,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  * LICENSE file in the root directory of this source tree.
  */
 
+import deepmerge from 'deepmerge';
 import { flatten } from 'flat';
 import { CHANGE_LOCALE, ADD_TRANSLATIONS } from '../actions/locale';
 var defaultState = {
@@ -27,6 +28,7 @@ export default function locale() {
     case CHANGE_LOCALE:
       {
         return {
+          messagesTree: action.messages,
           messages: flatten(action.messages),
           fallbackMessages: flatten(action.fallbackMessages),
           current: action.locale
@@ -35,6 +37,7 @@ export default function locale() {
     case ADD_TRANSLATIONS:
       {
         return _objectSpread(_objectSpread({}, state), {}, {
+          messagesTree: deepmerge(state.messages, action.translations[state.current]),
           messages: _objectSpread(_objectSpread({}, state.messages), flatten(action.translations[state.current] || {}))
         });
       }