qwc2 2025.12.15 → 2025.12.18

package/components/AttributeForm.js

@@ -99,7 +99,7 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
           var deleteButtons = [{
             key: 'Delete',
             icon: 'trash',
-            label: (_this$props$deleteLab = _this.props.deleteLabel) !== null && _this$props$deleteLab !== void 0 ? _this$props$deleteLab : LocaleUtils.tr("editing.delete")
+            label: (_this$props$deleteLab = _this.props.deleteLabel) !== null && _this$props$deleteLab !== void 0 ? _this$props$deleteLab : LocaleUtils.tr("common.delete")
           }];
           deleteBar = /*#__PURE__*/React.createElement(ButtonBar, {
             buttons: deleteButtons,
@@ -564,7 +564,7 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
           var parts = name.split("__");
           var value = element.type === "radio" || element.type === "checkbox" ? element.checked : element.value;
           var nullElements = ["date", "number", "radio"];
-          var nullFieldTypes = ["date", "number"];
+          var textDataTypes = ["character varying", "text"];
           if (parts.length >= 3) {
             var _relEditConfig$fields, _relEditConfig$fields2, _relEditConfig$fields3;
             // Relation value
@@ -577,17 +577,17 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
             var nrelFieldConfig = (_relEditConfig$fields = (_relEditConfig$fields2 = relEditConfig.fields) === null || _relEditConfig$fields2 === void 0 || (_relEditConfig$fields3 = _relEditConfig$fields2.find) === null || _relEditConfig$fields3 === void 0 ? void 0 : _relEditConfig$fields3.call(_relEditConfig$fields2, function (f) {
               return f.id === field;
             })) !== null && _relEditConfig$fields !== void 0 ? _relEditConfig$fields : {};
-            var nrelFieldDataType = nrelFieldConfig.type;
+            var nrelFieldDataType = nrelFieldConfig.data_type;
             if (nrelFieldConfig.expression) {
               // Skip virtual fields
               delete relationValues[datasetname].features[index][field];
               return;
             }
-            if ((element instanceof RadioNodeList || nullElements.includes(element.type) || nullFieldTypes.includes(nrelFieldDataType)) && element.value === "") {
+            if ((element instanceof RadioNodeList || nullElements.includes(element.type) || !textDataTypes.includes(nrelFieldDataType)) && element.value === "") {
               // Set empty value to null instead of empty string
               value = null;
             }
-            if (nrelFieldDataType === "text" && textNullValue !== undefined && element.value === textNullValue) {
+            if (textDataTypes.includes(nrelFieldDataType) && textNullValue !== undefined && element.value === textNullValue) {
               // Convert text NULL to null
               value = null;
             }
@@ -624,12 +624,12 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
               delete feature.properties[name];
               return;
             }
-            var dataType = fieldConfig.type;
-            if ((element instanceof RadioNodeList || nullElements.includes(element.type) || nullFieldTypes.includes(dataType)) && element.value === "") {
+            var dataType = fieldConfig.data_type;
+            if ((element instanceof RadioNodeList || nullElements.includes(element.type) || !textDataTypes.includes(dataType)) && element.value === "") {
               // Set empty value to null instead of empty string
               value = null;
             }
-            if (dataType === "text" && textNullValue !== undefined && element.value === textNullValue) {
+            if (textDataTypes.includes(dataType) && textNullValue !== undefined && element.value === textNullValue) {
               // Convert text NULL to null
               value = null;
             }

package/components/AttributeTableWidget.js

@@ -730,7 +730,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
         if (this.state.loading) {
           loadOverlay = /*#__PURE__*/React.createElement("div", {
             className: "attribtable-overlay"
-          }, /*#__PURE__*/React.createElement(Spinner, null), /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("attribtable.loading")));
+          }, /*#__PURE__*/React.createElement(Spinner, null), /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("common.loading")));
         } else {
           loadOverlay = /*#__PURE__*/React.createElement("div", {
             className: "attribtable-overlay"
@@ -942,7 +942,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React.createElement("option", {
         disabled: true,
         value: ""
-      }, LocaleUtils.tr("attribtable.selectlayer")), Object.entries(this.props.editConfigs).map(function (_ref4) {
+      }, LocaleUtils.tr("common.selectlayer")), Object.entries(this.props.editConfigs).map(function (_ref4) {
         var _ref5 = _slicedToArray(_ref4, 2),
           wmsName = _ref5[0],
           serviceConfigs = _ref5[1];
@@ -1009,7 +1009,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
         onClick: this.deleteSelectedFeatured
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "ok"
-      }), /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("attribtable.delete"))) : deleteButton, this.state.confirmDelete ? /*#__PURE__*/React.createElement("button", {
+      }), /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("common.delete"))) : deleteButton, this.state.confirmDelete ? /*#__PURE__*/React.createElement("button", {
         className: "button button-reject",
         onClick: function onClick() {
           return _this2.setState({

package/components/EditComboField.js

@@ -103,7 +103,7 @@ var EditComboField = /*#__PURE__*/function (_React$Component) {
       }, _this.state.showPlaceholder ? /*#__PURE__*/React.createElement("option", {
         disabled: _this.props.required,
         value: ""
-      }, (_this$props$placehold = _this.props.placeholder) !== null && _this$props$placehold !== void 0 ? _this$props$placehold : LocaleUtils.tr("editing.select")) : null, _this.state.values.map(function (item, index) {
+      }, (_this$props$placehold = _this.props.placeholder) !== null && _this$props$placehold !== void 0 ? _this$props$placehold : LocaleUtils.tr("common.select")) : null, _this.state.values.map(function (item, index) {
         var _this$itemValueLabel2 = _this.itemValueLabel(item),
           value = _this$itemValueLabel2.value,
           label = _this$itemValueLabel2.label;

package/components/EditUploadField.js

@@ -224,7 +224,7 @@ var EditUploadField = /*#__PURE__*/function (_React$Component) {
           }, {
             key: 'Clear',
             icon: 'clear',
-            tooltip: LocaleUtils.tr("editing.clearpicture"),
+            tooltip: LocaleUtils.tr("common.clear"),
             disabled: this.props.disabled
           }];
           return /*#__PURE__*/React.createElement("span", {

package/components/IdentifyViewer.js

@@ -49,6 +49,7 @@ import { zoomToPoint } from '../actions/map';
 import { openExternalUrl } from '../actions/windows';
 import ConfigUtils from '../utils/ConfigUtils';
 import CoordinatesUtils from '../utils/CoordinatesUtils';
+import { EXCLUDE_ATTRS, EXCLUDE_PROPS } from '../utils/IdentifyUtils';
 import LayerUtils from '../utils/LayerUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MapUtils from '../utils/MapUtils';
@@ -57,9 +58,8 @@ import VectorLayerUtils from '../utils/VectorLayerUtils';
 import Icon from './Icon';
 import NavBar from './widgets/NavBar';
 import Spinner from './widgets/Spinner';
+import ToggleSwitch from './widgets/ToggleSwitch';
 import './style/IdentifyViewer.css';
-var EXCLUDE_PROPS = ['featurereport', 'displayfield', 'layername', 'layertitle', 'layerinfo', 'attribnames', 'clickPos', 'displayname', 'bbox'];
-var EXCLUDE_ATTRS = ['htmlContent', 'htmlContentInline'];
 var BuiltinExporters = [{
   id: 'json',
   title: 'json',
@@ -334,7 +334,9 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       generatingReport: false,
       selectedLayer: '',
       compareEnabled: false,
-      currentPage: 0
+      multiViewEnabled: false,
+      currentPage: 0,
+      pageSize: 1
     });
     _defineProperty(_this, "getCurrentResultFeature", function () {
       var _this$state$resultTre, _this$state$resultTre2, _this$state$resultTre3, _this$state$currentRe;
@@ -720,7 +722,13 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       var selected = _this.state.selectedResults.has(key);
       return /*#__PURE__*/React.createElement("div", {
         className: resultClass,
-        key: key
+        key: key,
+        onMouseEnter: function onMouseEnter() {
+          return _this.setHighlightedFeatures([feature]);
+        },
+        onMouseLeave: function onMouseLeave() {
+          return _this.setHighlightedFeatures(null);
+        }
       }, /*#__PURE__*/React.createElement("div", {
         className: "identify-result-title"
       }, _this.props.collapsible ? /*#__PURE__*/React.createElement(Icon, {
@@ -737,7 +745,8 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
         icon: selected ? "checked" : "unchecked",
         onClick: function onClick() {
           return _this.toggleSelectedResult(key);
-        }
+        },
+        title: LocaleUtils.tr("identify.selectforcompare")
       }) : null, /*#__PURE__*/React.createElement("span", null, (_this.props.showLayerTitles ? feature.layertitle + ": " : "") + feature.displayname), zoomToFeatureButton, /*#__PURE__*/React.createElement(Icon, {
         icon: "info-sign",
         onClick: function onClick() {
@@ -761,6 +770,34 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
         };
       });
     });
+    _defineProperty(_this, "initBody", function (el) {
+      if (el) {
+        // HACK to trigger an additional repaint, since Safari/Chrome on iOS render the element cut off the first time
+        el.style.background = 'inherit';
+        var resizeObserver = new ResizeObserver(function (entries) {
+          var contentRectEntry = entries.find(function (entry) {
+            return entry.contentRect;
+          });
+          if (contentRectEntry) {
+            _this.computePageSize(contentRectEntry.contentRect);
+          }
+        });
+        resizeObserver.observe(el);
+        _this.bodyEl = el;
+      }
+    });
+    _defineProperty(_this, "computePageSize", function (rect) {
+      var s = 2 * _this.props.resultGridSize;
+      if (_this.state.multiViewEnabled && (rect.height >= s || rect.width >= s)) {
+        _this.setState({
+          pageSize: rect.height >= s && rect.width >= s ? 4 : 2
+        });
+      } else {
+        _this.setState({
+          pageSize: 1
+        });
+      }
+    });
     _defineProperty(_this, "renderToolbar", function (results) {
       var resultCount = results.length;
       var toggleButton = function toggleButton(key, icon, disabled) {
@@ -781,12 +818,12 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       var infoLabel = null;
       if (_this.state.compareEnabled) {
         infoLabel = /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("identify.comparing", _this.state.selectedResults.size()));
-      } else if (_this.props.resultDisplayMode !== 'paginated') {
+      } else {
         infoLabel = /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("identify.featurecount", resultCount));
       }
       var checkedPages = results.reduce(function (res, entry, idx) {
         if (_this.state.selectedResults.has(entry[0] + "$" + entry[1].id)) {
-          return [].concat(_toConsumableArray(res), [idx]);
+          return [].concat(_toConsumableArray(res), [Math.floor(idx / _this.state.pageSize)]);
         }
         return res;
       }, []);
@@ -796,9 +833,9 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
         className: "identify-toolbar-spacer"
       }), infoLabel, /*#__PURE__*/React.createElement("span", {
         className: "identify-toolbar-spacer"
-      }), _this.props.resultDisplayMode === 'paginated' ? /*#__PURE__*/React.createElement(NavBar, {
+      }), _this.props.resultDisplayMode === 'paginated' && !_this.state.compareEnabled ? /*#__PURE__*/React.createElement(NavBar, {
         currentPage: _this.state.currentPage,
-        nPages: resultCount,
+        nPages: Math.ceil(resultCount / _this.state.pageSize),
         pageChanged: function pageChanged(page) {
           return _this.setState({
             currentPage: page
@@ -835,7 +872,14 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
           key: layer,
           value: layer
         }, _this.state.resultTree[layer][0].layertitle);
-      }))))), exportEnabled ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("identify.export"), ":"), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("div", {
+      }))))), _this.props.resultDisplayMode === 'paginated' ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("identify.multiview")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(ToggleSwitch, {
+        active: _this.state.multiViewEnabled,
+        onChange: function onChange(active) {
+          return _this.setState({
+            multiViewEnabled: active
+          });
+        }
+      }))) : null, exportEnabled ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("common.export"), ":"), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("div", {
         className: "controlgroup"
       }, /*#__PURE__*/React.createElement("select", {
         className: "controlgroup-expanditem",
@@ -856,7 +900,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
         onClick: function onClick() {
           return _this.exportResults();
         },
-        title: LocaleUtils.tr("identify.download")
+        title: LocaleUtils.tr("common.download")
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "export"
       })), /*#__PURE__*/React.createElement("button", {
@@ -1128,6 +1172,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
     _this.resultsTreeRef = null;
     _this.currentResultElRef = null;
     _this.scrollIntoView = false;
+    _this.bodyEl = null;
     _this.state.exportFormat = !Array.isArray(props.enableExport) ? 'geojson' : props.enableExport[0];
     return _this;
   }
@@ -1161,6 +1206,9 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
           };
         });
       }
+      if (this.state.multiViewEnabled !== prevState.multiViewEnabled) {
+        this.computePageSize(this.bodyEl.getBoundingClientRect());
+      }
     }
   }, {
     key: "componentWillUnmount",
@@ -1182,8 +1230,12 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
         });
       }).flat();
       if (this.state.compareEnabled) {
+        var style = {
+          gridTemplateColumns: "repeat(auto-fit, minmax(".concat(this.resultGridSize / 2 - 2, "px, 1fr))")
+        };
         body = /*#__PURE__*/React.createElement("div", {
-          className: "identify-compare-results"
+          className: "identify-compare-results",
+          style: style
         }, this.state.selectedResults.entries().map(function (key) {
           var _key$split3 = key.split("$"),
             _key$split4 = _slicedToArray(_key$split3, 2),
@@ -1205,37 +1257,36 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
             layerid = _ref26[0],
             features = _ref26[1];
           return features.map(function (feature) {
-            return /*#__PURE__*/React.createElement("div", {
-              key: layerid + "$" + feature.id,
-              onMouseEnter: function onMouseEnter() {
-                return _this2.setHighlightedFeatures([feature]);
-              },
-              onMouseLeave: function onMouseLeave() {
-                return _this2.setHighlightedFeatures(null);
-              }
-            }, _this2.renderResultAttributes(layerid, feature, 'identify-result-frame'));
+            return _this2.renderResultAttributes(layerid, feature, 'identify-result-frame');
           });
         }));
-      } else if (this.props.resultDisplayMode === 'paginated' && this.state.currentPage < flatResults.length) {
-        var _flatResults$this$sta = _slicedToArray(flatResults[this.state.currentPage], 2),
-          layerid = _flatResults$this$sta[0],
-          feature = _flatResults$this$sta[1];
-        body = /*#__PURE__*/React.createElement("div", {
-          className: "identify-flat-results-list",
-          onMouseEnter: function onMouseEnter() {
-            return _this2.setHighlightedFeatures([feature]);
-          },
-          onMouseLeave: function onMouseLeave() {
-            return _this2.setHighlightedFeatures(null);
-          }
-        }, this.renderResultAttributes(layerid, feature, 'identify-result-frame'));
+      } else if (this.props.resultDisplayMode === 'paginated') {
+        if (this.state.multiViewEnabled) {
+          var results = flatResults.slice(this.state.currentPage * this.state.pageSize, (this.state.currentPage + 1) * this.state.pageSize);
+          var _style = {
+            gridTemplateColumns: "repeat(auto-fit, minmax(".concat(this.resultGridSize - 2, "px, 1fr))")
+          };
+          body = /*#__PURE__*/React.createElement("div", {
+            className: "identify-compare-results",
+            style: _style
+          }, results.map(function (_ref27) {
+            var _ref28 = _slicedToArray(_ref27, 2),
+              layerid = _ref28[0],
+              feature = _ref28[1];
+            return _this2.renderResultAttributes(layerid, feature, 'identify-result-frame');
+          }));
+        } else if (this.state.currentPage < flatResults.length) {
+          var _flatResults$this$sta = _slicedToArray(flatResults[this.state.currentPage], 2),
+            layerid = _flatResults$this$sta[0],
+            feature = _flatResults$this$sta[1];
+          body = /*#__PURE__*/React.createElement("div", {
+            className: "identify-flat-results-list"
+          }, this.renderResultAttributes(layerid, feature, 'identify-result-frame'));
+        }
       }
-      // "el.style.background='inherit'": HACK to trigger an additional repaint, since Safari/Chrome on iOS render the element cut off the first time
       return /*#__PURE__*/React.createElement("div", {
         className: "identify-body",
-        ref: function ref(el) {
-          if (el) el.style.background = 'inherit';
-        }
+        ref: this.initBody
       }, body, flatResults.length > 0 ? this.renderToolbar(flatResults) : null);
     }
   }]);
@@ -1261,6 +1312,7 @@ _defineProperty(IdentifyViewer, "propTypes", {
   removeLayer: PropTypes.func,
   replaceImageUrls: PropTypes.bool,
   resultDisplayMode: PropTypes.string,
+  resultGridSize: PropTypes.number,
   setActiveLayerInfo: PropTypes.func,
   showLayerSelector: PropTypes.bool,
   showLayerTitles: PropTypes.bool,
@@ -1278,6 +1330,7 @@ _defineProperty(IdentifyViewer, "defaultProps", {
   },
   enableAggregatedReports: true,
   resultDisplayMode: 'flat',
+  resultGridSize: 200,
   showLayerTitles: true,
   showLayerSelector: true,
   highlightAllResults: true

package/components/LinkFeatureForm.js

@@ -23,6 +23,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  */
 
 import React from 'react';
+import ReactDOM from 'react-dom';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import { setEditContext } from '../actions/editing';
@@ -31,6 +32,8 @@ import { getFeatureTemplate } from '../utils/EditingUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MapUtils from '../utils/MapUtils';
 import AttributeForm from './AttributeForm';
+import MeasureSwitcher from './MeasureSwitcher';
+import { BottomToolPortalContext } from './PluginsContainer';
 import './style/LinkFeatureForm.css';
 var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
   function LinkFeatureForm() {
@@ -45,6 +48,12 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
       pickedFeatures: null,
       highlightedFeature: null
     });
+    _defineProperty(_this, "changeMeasurementState", function (diff) {
+      var editContext = _this.props.editing.contexts[_this.props.editContextId];
+      _this.props.setEditContext(_this.props.editContextId, {
+        measurements: _objectSpread(_objectSpread({}, editContext.measurements), diff)
+      });
+    });
     _defineProperty(_this, "childPickQuery", function (coordinate) {
       var scale = Math.round(MapUtils.computeForZoom(_this.props.map.scales, _this.props.map.zoom));
       _this.props.iface.getFeature(_this.props.editConfig, coordinate, _this.props.map.projection, scale, 96, function (featureCollection) {
@@ -200,11 +209,13 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
           className: "button",
           disabled: editContext.changed,
           onClick: this.finish
-        }, LocaleUtils.tr("linkfeatureform.cancel"))));
+        }, LocaleUtils.tr("common.cancel"))));
       } else if (editContext.feature) {
+        var _editContext$feature;
         var drawing = editContext.action === 'Draw' && !editContext.feature.geometry && this.props.editConfig.geomType;
-        return /*#__PURE__*/React.createElement("div", {
-          className: "link-feature-form"
+        return [/*#__PURE__*/React.createElement("div", {
+          className: "link-feature-form",
+          key: "LinkFeatureForm"
         }, drawing ? /*#__PURE__*/React.createElement("div", {
           className: "link-feature-form-hint"
         }, /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("linkfeatureform.drawhint"))) : /*#__PURE__*/React.createElement(AttributeForm, {
@@ -220,13 +231,19 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
           className: "button",
           disabled: editContext.changed,
           onClick: this.finish
-        }, drawing ? LocaleUtils.tr("linkfeatureform.cancel") : LocaleUtils.tr("linkfeatureform.close"))));
+        }, drawing ? LocaleUtils.tr("common.cancel") : LocaleUtils.tr("common.close")))), drawing || (_editContext$feature = editContext.feature) !== null && _editContext$feature !== void 0 && _editContext$feature.geometry ? /*#__PURE__*/ReactDOM.createPortal(/*#__PURE__*/React.createElement(MeasureSwitcher, {
+          changeMeasureState: this.changeMeasurementState,
+          geomType: editContext.geomType,
+          iconSize: "large",
+          measureState: editContext.measurements
+        }), this.context) : null];
       } else {
         return null;
       }
     }
   }]);
 }(React.Component);
+_defineProperty(LinkFeatureForm, "contextType", BottomToolPortalContext);
 _defineProperty(LinkFeatureForm, "propTypes", {
   action: PropTypes.string,
   addLayerFeatures: PropTypes.func,

package/components/MeasureSwitcher.js

@@ -0,0 +1,115 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
+function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
+function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
+function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
+ * Copyright 2025 Sourcepole AG
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import React from "react";
+import PropTypes from "prop-types";
+import LocaleUtils from "../utils/LocaleUtils";
+import Icon from "./Icon";
+var MeasureSwitcher = /*#__PURE__*/function (_React$PureComponent) {
+  function MeasureSwitcher() {
+    _classCallCheck(this, MeasureSwitcher);
+    return _callSuper(this, MeasureSwitcher, arguments);
+  }
+  _inherits(MeasureSwitcher, _React$PureComponent);
+  return _createClass(MeasureSwitcher, [{
+    key: "render",
+    value: function render() {
+      var _this$props$className,
+        _this = this;
+      var style = {
+        width: 'fit-content'
+      };
+      return /*#__PURE__*/React.createElement("div", {
+        className: "controlgroup " + ((_this$props$className = this.props.className) !== null && _this$props$className !== void 0 ? _this$props$className : "")
+      }, /*#__PURE__*/React.createElement("button", {
+        className: "button" + (this.props.measureState.showmeasurements ? " pressed" : ""),
+        onClick: function onClick() {
+          return _this.props.changeMeasureState({
+            showmeasurements: !_this.props.measureState.showmeasurements
+          });
+        },
+        title: LocaleUtils.tr("measureComponent.showmeasurements")
+      }, /*#__PURE__*/React.createElement(Icon, {
+        icon: "measure",
+        size: this.props.iconSize
+      })), this.props.measureState.showmeasurements && ['LineString', 'Circle'].includes(this.props.geomType) ? /*#__PURE__*/React.createElement("select", {
+        className: "controlgroup-fillitem",
+        onChange: function onChange(ev) {
+          return _this.props.changeMeasureState({
+            lenUnit: ev.target.value
+          });
+        },
+        style: style,
+        value: this.props.measureState.lenUnit
+      }, /*#__PURE__*/React.createElement("option", {
+        value: "metric"
+      }, LocaleUtils.tr("measureComponent.metric")), /*#__PURE__*/React.createElement("option", {
+        value: "imperial"
+      }, LocaleUtils.tr("measureComponent.imperial")), /*#__PURE__*/React.createElement("option", {
+        value: "m"
+      }, "m"), /*#__PURE__*/React.createElement("option", {
+        value: "km"
+      }, "km"), /*#__PURE__*/React.createElement("option", {
+        value: "ft"
+      }, "ft"), /*#__PURE__*/React.createElement("option", {
+        value: "mi"
+      }, "mi")) : null, this.props.measureState.showmeasurements && ['Polygon', 'Ellipse', 'Square', 'Box'].includes(this.props.geomType) ? /*#__PURE__*/React.createElement("select", {
+        className: "controlgroup-fillitem",
+        onChange: function onChange(ev) {
+          return _this.props.changeMeasureState({
+            areaUnit: ev.target.value
+          });
+        },
+        style: style,
+        value: this.props.measureState.areaUnit
+      }, /*#__PURE__*/React.createElement("option", {
+        value: "metric"
+      }, LocaleUtils.tr("measureComponent.metric")), /*#__PURE__*/React.createElement("option", {
+        value: "imperial"
+      }, LocaleUtils.tr("measureComponent.imperial")), /*#__PURE__*/React.createElement("option", {
+        value: "sqm"
+      }, "m\xB2"), /*#__PURE__*/React.createElement("option", {
+        value: "ha"
+      }, "ha"), /*#__PURE__*/React.createElement("option", {
+        value: "sqkm"
+      }, "km\xB2"), /*#__PURE__*/React.createElement("option", {
+        value: "sqft"
+      }, "ft\xB2"), /*#__PURE__*/React.createElement("option", {
+        value: "acre"
+      }, "acre"), /*#__PURE__*/React.createElement("option", {
+        value: "sqmi"
+      }, "mi\xB2")) : null);
+    }
+  }]);
+}(React.PureComponent);
+_defineProperty(MeasureSwitcher, "propTypes", {
+  changeMeasureState: PropTypes.func,
+  className: PropTypes.string,
+  geomType: PropTypes.string,
+  iconSize: PropTypes.string,
+  measureState: PropTypes.shape({
+    showmeasurements: PropTypes.bool,
+    lenUnit: PropTypes.string,
+    areaUnit: PropTypes.string
+  })
+});
+export { MeasureSwitcher as default };

package/components/PluginsContainer.js

@@ -268,9 +268,10 @@ var PluginsContainer = /*#__PURE__*/function (_React$Component) {
         style: mapContainerStyle
       }), /*#__PURE__*/React.createElement("div", {
         className: "map-bottom-tool-container",
-        ref: this.setBottomToolContanerRef,
         style: mapContainerStyle
-      }));
+      }, /*#__PURE__*/React.createElement("div", {
+        ref: this.setBottomToolContanerRef
+      })));
     }
   }]);
 }(React.Component);

package/components/QtDesignerForm.js

@@ -652,7 +652,7 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
                   _featurebuttons.push({
                     key: 'Pick',
                     icon: 'pick',
-                    label: LocaleUtils.tr("editing.pick")
+                    label: LocaleUtils.tr("common.pick")
                   });
                 }
                 _featurebuttons.push({
@@ -697,7 +697,7 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
                 var _featurebuttons3 = [{
                   key: 'Pick',
                   icon: 'pick',
-                  label: LocaleUtils.tr("editing.pick")
+                  label: LocaleUtils.tr("common.pick")
                 }, {
                   key: 'Create',
                   icon: 'editdraw',

package/components/ResizeableWindow.js

@@ -137,7 +137,7 @@ var ResizeableWindow = /*#__PURE__*/function (_React$Component) {
         className: iconClasses,
         icon: "remove",
         onClick: _this.onClose,
-        title: LocaleUtils.tr("window.close")
+        title: LocaleUtils.tr("common.close")
       }) : null);
     });
     _defineProperty(_this, "renderInternalWindowContainer", function () {
@@ -306,6 +306,11 @@ var ResizeableWindow = /*#__PURE__*/function (_React$Component) {
       if (el) {
         _this.rnd = el;
         _this.rnd.updatePosition(_this.state.geometry);
+        // Set focus to first focusable element
+        if (_this.props.visible) {
+          var _this$rnd$resizableEl, _this$rnd$resizableEl2, _this$rnd$resizableEl3;
+          (_this$rnd$resizableEl = _this.rnd.resizableElement) === null || _this$rnd$resizableEl === void 0 || (_this$rnd$resizableEl = _this$rnd$resizableEl.current) === null || _this$rnd$resizableEl === void 0 || (_this$rnd$resizableEl2 = _this$rnd$resizableEl.querySelector) === null || _this$rnd$resizableEl2 === void 0 || (_this$rnd$resizableEl2 = _this$rnd$resizableEl2.call(_this$rnd$resizableEl, '[tabindex="0"]')) === null || _this$rnd$resizableEl2 === void 0 || (_this$rnd$resizableEl3 = _this$rnd$resizableEl2.focus) === null || _this$rnd$resizableEl3 === void 0 || _this$rnd$resizableEl3.call(_this$rnd$resizableEl2);
+        }
       }
     });
     _defineProperty(_this, "onDragStart", function () {
@@ -495,8 +500,11 @@ var ResizeableWindow = /*#__PURE__*/function (_React$Component) {
         return;
       }
       if (this.rnd && this.props.visible && this.props.visible !== prevProps.visible) {
+        var _this$rnd$resizableEl4, _this$rnd$resizableEl5, _this$rnd$resizableEl6;
         this.props.onGeometryChanged(this.state.geometry);
         this.rnd.updatePosition(this.state.geometry);
+        // Set focus to first focusable element
+        (_this$rnd$resizableEl4 = this.rnd.resizableElement) === null || _this$rnd$resizableEl4 === void 0 || (_this$rnd$resizableEl4 = _this$rnd$resizableEl4.current) === null || _this$rnd$resizableEl4 === void 0 || (_this$rnd$resizableEl5 = _this$rnd$resizableEl4.querySelector) === null || _this$rnd$resizableEl5 === void 0 || (_this$rnd$resizableEl5 = _this$rnd$resizableEl5.call(_this$rnd$resizableEl4, '[tabindex="0"]')) === null || _this$rnd$resizableEl5 === void 0 || (_this$rnd$resizableEl6 = _this$rnd$resizableEl5.focus) === null || _this$rnd$resizableEl6 === void 0 || _this$rnd$resizableEl6.call(_this$rnd$resizableEl5);
       }
       if (this.state.geometry !== prevState.geometry) {
         this.props.onGeometryChanged(this.state.geometry);