qwc2 2025.12.17 → 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';
@@ -59,8 +60,6 @@ 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',
@@ -880,7 +879,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
             multiViewEnabled: active
           });
         }
-      }))) : null, exportEnabled ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("identify.export"), ":"), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("div", {
+      }))) : 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",
@@ -901,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", {

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 () {

package/components/SearchBox.js

@@ -128,7 +128,7 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
         value: _this.state.selectedProvider
       }, /*#__PURE__*/React.createElement("div", {
         value: ""
-      }, LocaleUtils.tr("search.all")), Object.entries(_this.props.searchProviders).map(function (_ref) {
+      }, LocaleUtils.tr("common.all")), Object.entries(_this.props.searchProviders).map(function (_ref) {
         var _prov$params, _prov$label;
         var _ref2 = _slicedToArray(_ref, 2),
           key = _ref2[0],
@@ -162,14 +162,14 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
       }
       var filterButtons = [{
         key: "Polygon",
-        tooltip: LocaleUtils.tr("redlining.polygon"),
+        tooltip: LocaleUtils.tr("common.polygon"),
         icon: "polygon",
-        label: LocaleUtils.tr("redlining.polygon")
+        label: LocaleUtils.tr("common.polygon")
       }, {
         key: "Circle",
-        tooltip: LocaleUtils.tr("redlining.circle"),
+        tooltip: LocaleUtils.tr("common.circle"),
         icon: "circle",
-        label: LocaleUtils.tr("redlining.circle")
+        label: LocaleUtils.tr("common.circle")
       }];
       return /*#__PURE__*/React.createElement("div", {
         className: "searchbox-filter-options"
@@ -182,7 +182,7 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
       }), searchRegionSelection, /*#__PURE__*/React.createElement("button", {
         className: "button",
         onClick: _this.clearFilter,
-        title: LocaleUtils.tr("search.clearfilter")
+        title: LocaleUtils.tr("common.clear")
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "clear"
       }))))), _this.state.filterGeomType === 'Circle' ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("search.circleradius"), ":"), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(NumberInput, {
@@ -253,7 +253,7 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
             className: "searchbox-noresults",
             disabled: true,
             key: "noresults"
-          }, LocaleUtils.tr("search.noresults"));
+          }, LocaleUtils.tr("common.noresults"));
         } else {
           return null;
         }

package/components/map3d/drawtool/EditTool3D.js

@@ -498,7 +498,7 @@ var EditTool3D = /*#__PURE__*/function (_React$Component) {
       }];
       var extraButtons = [{
         key: "clone",
-        tooltip: LocaleUtils.tr("draw3d.clone"),
+        tooltip: LocaleUtils.tr("common.clone"),
         icon: "clone"
       }, {
         key: "NumericInput",

package/components/style/IdentifyViewer.css

@@ -194,7 +194,7 @@ span.identify-toolbar-spacer {
 
 div.identify-settings-menu {
     position: absolute;
-    bottom: 100%;
+    bottom: calc(100% - 0.25em);
     left: 0;
     border: 1px solid var(--border-color);
     background-color: var(--container-bg-color);

package/components/style/LocationRecorder.css

@@ -1,10 +1,5 @@
 div.LocationRecorder {
-    display: inline-flex;
+    display: flex;
     align-items: center;
-    padding: 0.25em 0.5em;
-    background-color: var(--container-bg-color);
-    box-shadow: 0px -2px 4px rgba(136, 136, 136, 0.5);
-    border-bottom: 1px solid rgba(136, 136, 136, 0.5);
     column-gap: 0.25em;
-    order: 1;
 }

package/components/style/PluginsContainer.css

@@ -30,15 +30,20 @@ div.map-bottom-tool-container {
     position: absolute;
     pointer-events: none;
     display: flex;
-    flex-direction: column-reverse;
-    align-items: center;
-    align-content: flex-start;
-    justify-content: flex-start;
-    margin-bottom: -1px;
+    justify-content: center;
+    align-items: flex-end;
 }
 
-div.map-bottom-tool-container > * {
+div.map-bottom-tool-container > div {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    margin-bottom: -1px;
     pointer-events: initial;
+    padding: 0.25em 0.5em;
+    gap: 1em;
+    background-color: var(--container-bg-color);
+    box-shadow: 0px -2px 4px rgba(136, 136, 136, 0.5);
 }
 
 div.app-info {

package/components/timeline/FixedTimeline.js

@@ -158,11 +158,11 @@ var FixedTimeline = /*#__PURE__*/function (_React$Component) {
         icon: "home"
       }, {
         key: "zoomout",
-        tooltip: LocaleUtils.tr("timemanager.zoomout"),
+        tooltip: LocaleUtils.tr("common.zoomout"),
         icon: "zoomout"
       }, {
         key: "zoomin",
-        tooltip: LocaleUtils.tr("timemanager.zoomin"),
+        tooltip: LocaleUtils.tr("common.zoomin"),
         icon: "zoomin"
       }];
       return /*#__PURE__*/React.createElement("div", {

package/components/timeline/InfiniteTimeline.js

@@ -257,11 +257,11 @@ var InfiniteTimeline = /*#__PURE__*/function (_React$Component) {
         icon: "home"
       }, {
         key: "zoomout",
-        tooltip: LocaleUtils.tr("timemanager.zoomout"),
+        tooltip: LocaleUtils.tr("common.zoomout"),
         icon: "zoomout"
       }, {
         key: "zoomin",
-        tooltip: LocaleUtils.tr("timemanager.zoomin"),
+        tooltip: LocaleUtils.tr("common.zoomin"),
         icon: "zoomin"
       }];
       return /*#__PURE__*/React.createElement("div", {

package/components/timeline/TimelineFeaturesSlider.js

@@ -414,7 +414,7 @@ var TimelineFeaturesSlider = /*#__PURE__*/function (_React$Component) {
         onPointerDown: this.pickCurrentTimestamp
       }, this.props.displayMode === "features" ? this.renderTimeFeatures(sliderGeom) : null, this.props.displayMode === "layers" ? this.renderTimeLayers(sliderGeom) : null, this.renderGradient(sliderGeom)), this.renderCursor(timestamp), this.props.timeFeatures.pendingRequests > 0 ? /*#__PURE__*/React.createElement("div", {
         className: "timeline-slider-loading"
-      }, /*#__PURE__*/React.createElement(Spinner, null), /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("timemanager.loading"))) : null);
+      }, /*#__PURE__*/React.createElement(Spinner, null), /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("common.loading"))) : null);
     }
   }]);
 }(React.Component);

package/components/widgets/LayerCatalogWidget.js

@@ -247,7 +247,7 @@ var LayerCatalogWidget = /*#__PURE__*/function (_React$PureComponent) {
       } else if (isEmpty(this.state.catalog)) {
         emptyEntry = /*#__PURE__*/React.createElement("div", {
           className: "layer-catalog-placeholder"
-        }, LocaleUtils.tr("importlayer.loading"));
+        }, LocaleUtils.tr("common.loading"));
       }
       var filterplaceholder = LocaleUtils.tr("importlayer.filter");
       var catalog = (_this$state$filteredC = this.state.filteredCatalog) !== null && _this$state$filteredC !== void 0 ? _this$state$filteredC : this.state.catalog;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2025.12.17",
+    "version": "2025.12.18",
     "description": "QGIS Web Client",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",

package/plugins/Editing.js

@@ -33,6 +33,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 { parseNumber } from '@norbulcz/num-parse';
 import dateParser from 'any-date-parser';
@@ -46,7 +47,9 @@ import { setSnappingConfig } from '../actions/map';
 import { setCurrentTask, setCurrentTaskBlocked } from '../actions/task';
 import AttributeForm from '../components/AttributeForm';
 import Icon from '../components/Icon';
+import MeasureSwitcher from '../components/MeasureSwitcher';
 import PickFeature from '../components/PickFeature';
+import { BottomToolPortalContext } from '../components/PluginsContainer';
 import SideBar from '../components/SideBar';
 import ButtonBar from '../components/widgets/ButtonBar';
 import ConfigUtils from '../utils/ConfigUtils';
@@ -173,7 +176,7 @@ var Editing = /*#__PURE__*/function (_React$Component) {
       actionButtons.push({
         key: 'Pick',
         icon: 'pick',
-        label: LocaleUtils.tr("editing.pick"),
+        label: LocaleUtils.tr("common.pick"),
         data: {
           action: 'Pick',
           feature: null
@@ -258,7 +261,7 @@ var Editing = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React.createElement("option", {
         disabled: true,
         value: ""
-      }, LocaleUtils.tr("editing.selectlayer")), Object.entries(_this.props.editConfigs).map(function (_ref) {
+      }, LocaleUtils.tr("common.selectlayer")), Object.entries(_this.props.editConfigs).map(function (_ref) {
         var _ref2 = _slicedToArray(_ref, 2),
           mapName = _ref2[0],
           serviceConfigs = _ref2[1];
@@ -285,6 +288,11 @@ var Editing = /*#__PURE__*/function (_React$Component) {
         onClick: _this.actionClicked
       }), featureSelection, pickBar, attributeForm);
     });
+    _defineProperty(_this, "changeMeasurementState", function (diff) {
+      _this.props.setEditContext('Editing', {
+        measurements: _objectSpread(_objectSpread({}, _this.props.editContext.measurements), diff)
+      });
+    });
     _defineProperty(_this, "actionClicked", function (action, data) {
       _this.setState({
         drawPick: false,
@@ -635,8 +643,9 @@ var Editing = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this3 = this;
-      var minMaxTooltip = this.state.minimized ? LocaleUtils.tr("editing.maximize") : LocaleUtils.tr("editing.minimize");
+      var _this3 = this,
+        _this$props$editConte3;
+      var minMaxTooltip = this.state.minimized ? LocaleUtils.tr("window.maximize") : LocaleUtils.tr("window.minimize");
       var extraTitlebarContent = /*#__PURE__*/React.createElement(Icon, {
         className: "editing-minimize-maximize",
         icon: this.state.minimized ? 'chevron-down' : 'chevron-up',
@@ -669,10 +678,16 @@ var Editing = /*#__PURE__*/function (_React$Component) {
         featureFilter: this.pickFilter,
         featurePicked: this.geomPicked,
         key: "FeaturePicker"
-      }) : null];
+      }) : null, this.props.editContext.action === "Draw" || (_this$props$editConte3 = this.props.editContext.feature) !== null && _this$props$editConte3 !== void 0 && _this$props$editConte3.geometry ? /*#__PURE__*/ReactDOM.createPortal(/*#__PURE__*/React.createElement(MeasureSwitcher, {
+        changeMeasureState: this.changeMeasurementState,
+        geomType: this.props.editContext.geomType,
+        iconSize: "large",
+        measureState: this.props.editContext.measurements
+      }), this.context) : null];
     }
   }]);
 }(React.Component);
+_defineProperty(Editing, "contextType", BottomToolPortalContext);
 _defineProperty(Editing, "propTypes", {
   addLayerFeatures: PropTypes.func,
   /** Whether to enable the "Clone existing geometry" functionality. */

package/plugins/FeatureForm.js

@@ -233,7 +233,7 @@ var FeatureForm = /*#__PURE__*/function (_React$Component) {
             className: "feature-query-body"
           }, /*#__PURE__*/React.createElement("span", {
             className: "identify-body-message"
-          }, LocaleUtils.tr("featureform.noresults")));
+          }, LocaleUtils.tr("common.noresults")));
         } else {
           var featureText = LocaleUtils.tr("featureform.feature");
           var attributeForm = null;