qwc2 2026.4.23 → 2026.4.29

package/components/EditComboField.js

@@ -186,7 +186,13 @@ var EditComboField = /*#__PURE__*/function (_React$Component) {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
       var _this3 = this;
-      if (this.props.keyvalrel && this.props.filterExpr !== prevProps.filterExpr) {
+      if (this.props.values && this.props.values !== prevProps.values) {
+        // This does not handle the case a selected value has disappeared from values, caller should handle that
+        this.setState({
+          values: this.props.values,
+          showPlaceholder: !this.hasEmptyValue(this.props.values)
+        });
+      } else if (this.props.keyvalrel && this.props.filterExpr !== prevProps.filterExpr) {
         var _this$props$filterExp3;
         KeyValCache.get(this.props.editIface, this.props.mapPrefix + "." + this.props.keyvalrel, (_this$props$filterExp3 = this.props.filterExpr) !== null && _this$props$filterExp3 !== void 0 ? _this$props$filterExp3 : null).then(function (values) {
           _this3.setState({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2026.04.23",
+    "version": "2026.04.29",
     "description": "QGIS Web Client",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",
@@ -17,7 +17,7 @@
     ],
     "dependencies": {
         "@furkot/webfonts-generator": "^2.0.3",
-        "@giro3d/giro3d": "^2.0.1",
+        "@giro3d/giro3d": "^2.0.2",
         "@kayahr/text-encoding": "^2.1.0",
         "@loaders.gl/core": "^4.3.4",
         "@loaders.gl/shapefile": "^4.3.4",

package/plugins/Redlining.js

@@ -35,7 +35,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import React from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
-import { LayerRole, addLayer } from '../actions/layers';
+import { LayerRole, addLayer, changeLayerProperty } from '../actions/layers';
 import { setSnappingConfig } from '../actions/map';
 import { changeRedliningState, resetRedliningState } from '../actions/redlining';
 import Icon from '../components/Icon';
@@ -70,13 +70,18 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
         geomType: (_data$geomType = data === null || data === void 0 ? void 0 : data.geomType) !== null && _data$geomType !== void 0 ? _data$geomType : null
       }, _this.redliningStateDefaults()));
       _this.props.setSnappingConfig(_this.props.snapping, _this.props.snappingActive);
+      var layer = null;
       if (data && data.layerId) {
-        var layer = _this.props.layers.find(function (l) {
+        layer = _this.props.layers.find(function (l) {
           return l.id === data.layerId;
         });
-        if (layer) {
-          _this.changeRedliningLayer(layer);
-        }
+      } else {
+        layer = _this.props.layers.find(function (l) {
+          return l.id === _this.props.redlining.layer;
+        });
+      }
+      if (layer) {
+        _this.changeRedliningLayer(layer);
       }
     });
     _defineProperty(_this, "onHide", function () {
@@ -550,6 +555,8 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
         layerTitle: layer.title,
         action: action
       });
+      // Ensure layer is visible
+      _this.props.changeLayerProperty(layer.id, "visibility", true);
     });
     _this.labelInput = null;
     _this.dashIcons = {};
@@ -617,6 +624,7 @@ _defineProperty(Redlining, "propTypes", {
   addLayer: PropTypes.func,
   /** Whether to allow labeling geometric figures. */
   allowGeometryLabels: PropTypes.bool,
+  changeLayerProperty: PropTypes.func,
   changeRedliningState: PropTypes.func,
   /** Default area unit. Options: `metric`, `imperial`, `sqm`, `ha`, `sqkm`, `sqft`, `acre`, `sqmi` */
   defaultAreaUnit: PropTypes.string,
@@ -675,6 +683,7 @@ export default (function (plugins) {
     };
   }, {
     changeRedliningState: changeRedliningState,
+    changeLayerProperty: changeLayerProperty,
     addLayer: addLayer,
     resetRedliningState: resetRedliningState,
     setSnappingConfig: setSnappingConfig

package/plugins/SensorThingsTool.js

@@ -235,9 +235,9 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
       showLocationInfoWindow: false,
       // currently selected Datastreams filter options
       currentDatastreamsFilter: {
-        thingId: -1,
-        sensorId: -1,
-        observedPropertyId: -1
+        thingId: '-1',
+        sensorId: '-1',
+        observedPropertyId: '-1'
       },
       // show Datastreams filter window for currently selected Location if true
       showDatastreamsFilterWindow: false,
@@ -666,7 +666,7 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
         locationSelect = /*#__PURE__*/React.createElement("div", null, LocaleUtils.tr("sensorthingstool.locationLabel"), ":\xA0", /*#__PURE__*/React.createElement("select", {
           onChange: function onChange(ev) {
             return _this.setState({
-              currentLocationId: parseInt(ev.target.value, 10)
+              currentLocationId: ev.target.value
             });
           },
           value: _this.state.currentLocationId
@@ -693,14 +693,14 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
           icon: "trash"
         }));
         if (_this.state.currentSensorLocation !== null) {
-          var datastreamsFilterActive = _this.state.currentDatastreamsFilter.thingId !== -1 || _this.state.currentDatastreamsFilter.sensorId !== -1 || _this.state.currentDatastreamsFilter.observedPropertyId !== -1;
+          var datastreamsFilterActive = _this.state.currentDatastreamsFilter.thingId !== '-1' || _this.state.currentDatastreamsFilter.sensorId !== '-1' || _this.state.currentDatastreamsFilter.observedPropertyId !== '-1';
           if (_this.state.currentSensorLocation.filteredDatastreams.length > 0) {
             datastreamSelect = /*#__PURE__*/React.createElement("div", {
               className: "sensor-things-location-datastreams"
             }, LocaleUtils.tr("sensorthingstool.datastreamLabel"), ":\xA0", /*#__PURE__*/React.createElement("select", {
               onChange: function onChange(ev) {
                 return _this.setState({
-                  currentDatastreamId: parseInt(ev.target.value, 10)
+                  currentDatastreamId: ev.target.value
                 });
               },
               value: _this.state.currentDatastreamId
@@ -929,14 +929,30 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
         // show popup with list of Locations at picking pos, cf. MapInfoTooltip
         var pixel = MapUtils.getHook(MapUtils.GET_PIXEL_FROM_COORDINATES_HOOK)(_this.state.pickGeom.coordinates);
         var style = {
-          left: pixel[0] + 16 + "px",
+          left: pixel[0] + 32 + "px",
           top: pixel[1] + "px"
         };
         return /*#__PURE__*/React.createElement("div", {
           className: "sensor-things-location-select",
           key: "SensorThingsLocationSelectPopup",
           style: style
-        }, /*#__PURE__*/React.createElement("b", null, LocaleUtils.tr("sensorthingstool.selectLocation"), ":"), /*#__PURE__*/React.createElement("br", null), _this.state.locationsAtPoint.map(function (location, idx) {
+        }, /*#__PURE__*/React.createElement("div", {
+          className: "sensor-things-location-select-header"
+        }, /*#__PURE__*/React.createElement("b", null, LocaleUtils.tr("sensorthingstool.selectLocation")), /*#__PURE__*/React.createElement("div", {
+          className: "sensor-things-toolbar-spacer"
+        }), /*#__PURE__*/React.createElement("button", {
+          className: "button",
+          onClick: function onClick() {
+            return _this.setState({
+              locationsAtPoint: []
+            });
+          },
+          title: LocaleUtils.tr("common.close")
+        }, /*#__PURE__*/React.createElement(Icon, {
+          icon: "remove"
+        }))), /*#__PURE__*/React.createElement("div", {
+          className: "sensor-things-location-select-list"
+        }, _this.state.locationsAtPoint.map(function (location, idx) {
           return /*#__PURE__*/React.createElement("div", {
             key: "select-location-" + idx,
             onClickCapture: function onClickCapture() {
@@ -953,7 +969,7 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
               });
             }
           }, location.name, ": ", location.description);
-        }));
+        })));
       } else {
         return null;
       }
@@ -1053,9 +1069,9 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
           currentLocationId: nextSelectedLocationId,
           currentSensorLocation: null,
           currentDatastreamsFilter: {
-            thingId: -1,
-            sensorId: -1,
-            observedPropertyId: -1
+            thingId: '-1',
+            sensorId: '-1',
+            observedPropertyId: '-1'
           },
           currentDatastreamId: null,
           datastreams: nextDatastreams,
@@ -1075,7 +1091,7 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "updateDatastreamsFilter", function (field, value) {
       _this.setState(function (state) {
         return {
-          currentDatastreamsFilter: _objectSpread(_objectSpread({}, state.currentDatastreamsFilter), {}, _defineProperty({}, field, parseInt(value, 10)))
+          currentDatastreamsFilter: _objectSpread(_objectSpread({}, state.currentDatastreamsFilter), {}, _defineProperty({}, field, value))
         };
       });
     });
@@ -2236,9 +2252,9 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
               filteredDatastreams: datastreamIds
             },
             currentDatastreamsFilter: {
-              thingId: -1,
-              sensorId: -1,
-              observedPropertyId: -1
+              thingId: '-1',
+              sensorId: '-1',
+              observedPropertyId: '-1'
             },
             currentDatastreamId: datastreamIds[0],
             datastreams: _objectSpread(_objectSpread({}, state.datastreams), datastreamsLookup)
@@ -2252,22 +2268,25 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "filterLocationDatastreams", function () {
       if (_this.state.currentSensorLocation !== null) {
         var filteredDatastreams = _this.state.currentSensorLocation.datastreams;
-        if (_this.state.currentDatastreamsFilter.thingId !== -1) {
+
+        // NOTE: entity IDs may be integer or UUID strings, so compare them as string
+
+        if (_this.state.currentDatastreamsFilter.thingId !== '-1') {
           // filter by Thing
           filteredDatastreams = filteredDatastreams.filter(function (datastreamId) {
-            return _this.state.datastreams[datastreamId].thing.id === _this.state.currentDatastreamsFilter.thingId;
+            return _this.state.datastreams[datastreamId].thing.id.toString() === _this.state.currentDatastreamsFilter.thingId;
           });
         }
-        if (_this.state.currentDatastreamsFilter.sensorId !== -1) {
+        if (_this.state.currentDatastreamsFilter.sensorId !== '-1') {
           // filter by Sensor
           filteredDatastreams = filteredDatastreams.filter(function (datastreamId) {
-            return _this.state.datastreams[datastreamId].sensor.id === _this.state.currentDatastreamsFilter.sensorId;
+            return _this.state.datastreams[datastreamId].sensor.id.toString() === _this.state.currentDatastreamsFilter.sensorId;
           });
         }
-        if (_this.state.currentDatastreamsFilter.observedPropertyId !== -1) {
+        if (_this.state.currentDatastreamsFilter.observedPropertyId !== '-1') {
           // filter by ObservedProperty
           filteredDatastreams = filteredDatastreams.filter(function (datastreamId) {
-            return _this.state.datastreams[datastreamId].observedProperty.id === _this.state.currentDatastreamsFilter.observedPropertyId;
+            return _this.state.datastreams[datastreamId].observedProperty.id.toString() === _this.state.currentDatastreamsFilter.observedPropertyId;
           });
         }
         _this.setState(function (state) {

package/plugins/map3d/MapExport3D.js

@@ -352,7 +352,7 @@ var MapExport3D = /*#__PURE__*/function (_React$Component) {
       var exportScale = _this.state.exportScaleFactor / 100;
       if (_this.state.selectedFormat === "application/pdf") {
         var mapWidthMM = _this.state.layout.map.width;
-        var exportWidthPx = _this.state.width;
+        var exportWidthPx = _this.state.frame.width;
         exportScale = Math.min(5, _this.state.exportDpi / (exportWidthPx * 25.4 / mapWidthMM));
       }
       _this.setState({

package/plugins/style/SensorThingsTool.css

@@ -150,18 +150,26 @@ table.sensor-things-datastream-statistics-table td.sensor-things-datastream-stat
 }
 
 div.sensor-things-location-select {
-    max-height: 16em;
-    overflow-y: auto;
-    padding: 0.25em;
     position: fixed;
     background-color: var(--container-bg-color);
     box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.75);
     z-index: 2;
 }
-div.sensor-things-location-select div {
+div.sensor-things-location-select-header {
+    display: flex;
+    padding-left: 0.25em;
+    align-items: center;
+    background-color: var(--button-bg-color);
+}
+div.sensor-things-location-select-list {
+    padding: 0.25em;
+    max-height: 16em;
+    overflow-y: auto;
+}
+div.sensor-things-location-select-list div {
     padding-top: 0.25em;
 }
-div.sensor-things-location-select div:hover {
+div.sensor-things-location-select-list div:hover {
     font-weight: bold;
     cursor: pointer;
 }

package/static/translations/bg-BG.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "Търсене на функции",
         "GeometryDigitizer": "Дигитайзер на геометрия",
         "IdentifyPoint": "Идентифициране на точка",
+        "IdentifyRadius": "",
         "IdentifyRegion": "Определяне на региона",
         "LayerCatalog": "Каталог на слоевете",
         "Login": "Вход",

package/static/translations/ca-ES.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "Cerca d'element",
         "GeometryDigitizer": "Digitalitzador de geometria",
         "IdentifyPoint": "Identificar punt",
+        "IdentifyRadius": "",
         "IdentifyRegion": "Identificar zona",
         "LayerCatalog": "Capes",
         "Login": "Inicio de sessió",

package/static/translations/cs-CZ.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "",
         "GeometryDigitizer": "",
         "IdentifyPoint": "Informace o bodu",
+        "IdentifyRadius": "",
         "IdentifyRegion": "Informace o oblasti",
         "LayerCatalog": "Katalog vrstev",
         "Login": "Přihlášení",

package/static/translations/de-CH.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "Objektsuche",
         "GeometryDigitizer": "Geometriedigitalisierung",
         "IdentifyPoint": "Punkt abfragen",
+        "IdentifyRadius": "Radius abfragen",
         "IdentifyRegion": "Region abfragen",
         "LayerCatalog": "Ebenenkatalog",
         "Login": "Anmelden",

package/static/translations/de-DE.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "Objektsuche",
         "GeometryDigitizer": "Geometriedigitalisierung",
         "IdentifyPoint": "Punkt abfragen",
+        "IdentifyRadius": "Radius abfragen",
         "IdentifyRegion": "Region abfragen",
         "LayerCatalog": "Ebenenkatalog",
         "Login": "Anmelden",

package/static/translations/en-US.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "Feature Search",
         "GeometryDigitizer": "Geometry digitizer",
         "IdentifyPoint": "Identify Point",
+        "IdentifyRadius": "Identify in Radius",
         "IdentifyRegion": "Identify Region",
         "LayerCatalog": "Layer catalog",
         "Login": "Login",

package/static/translations/es-ES.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "Búsqueda de elemento",
         "GeometryDigitizer": "Digitalizador de geometría",
         "IdentifyPoint": "Identificar punto",
+        "IdentifyRadius": "",
         "IdentifyRegion": "Identificar zona",
         "LayerCatalog": "Capa catálogo",
         "Login": "Inicio de sesión",

package/static/translations/fi-FI.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "",
         "GeometryDigitizer": "",
         "IdentifyPoint": "",
+        "IdentifyRadius": "",
         "IdentifyRegion": "Tunnista alue",
         "LayerCatalog": "",
         "Login": "Kirjaudu",

package/static/translations/fr-FR.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "Recherche objet",
         "GeometryDigitizer": "Digitalisation des géométries",
         "IdentifyPoint": "Interroger point",
+        "IdentifyRadius": "Interroger dans un rayon",
         "IdentifyRegion": "Interroger la région",
         "LayerCatalog": "Catalogue des couches",
         "Login": "Connexion",

package/static/translations/hu-HU.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "",
         "GeometryDigitizer": "",
         "IdentifyPoint": "",
+        "IdentifyRadius": "",
         "IdentifyRegion": "Adatok lekérdezése",
         "LayerCatalog": "",
         "Login": "",

package/static/translations/it-IT.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "Ricerca oggetto",
         "GeometryDigitizer": "Digitalizzazione geometrie",
         "IdentifyPoint": "Identifica punto",
+        "IdentifyRadius": "Identifica in un raggio",
         "IdentifyRegion": "Identifica in un poligono",
         "LayerCatalog": "Catalogo livelli",
         "Login": "Accedi",

package/static/translations/ja-JP.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "地物検索",
         "GeometryDigitizer": "ジオメトリ・デジタイザ",
         "IdentifyPoint": "点で地物を確認",
+        "IdentifyRadius": "",
         "IdentifyRegion": "領域内の地物を確認",
         "LayerCatalog": "レイヤ・カタログ",
         "Login": "ログイン",

package/static/translations/nl-NL.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "Zoeken op kenmerken",
         "GeometryDigitizer": "Geometry digitizer",
         "IdentifyPoint": "",
+        "IdentifyRadius": "",
         "IdentifyRegion": "Data opvragen",
         "LayerCatalog": "Lagencatalogus",
         "Login": "Inloggen",

package/static/translations/no-NO.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "",
         "GeometryDigitizer": "",
         "IdentifyPoint": "",
+        "IdentifyRadius": "",
         "IdentifyRegion": "Identifiser med område",
         "LayerCatalog": "",
         "Login": "Logg inn",

package/static/translations/pl-PL.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "",
         "GeometryDigitizer": "",
         "IdentifyPoint": "",
+        "IdentifyRadius": "",
         "IdentifyRegion": "Identifikuj Obszar",
         "LayerCatalog": "",
         "Login": "Zaloguj",

package/static/translations/pt-BR.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "Procurar feição",
         "GeometryDigitizer": "",
         "IdentifyPoint": "Identificar ponto",
+        "IdentifyRadius": "",
         "IdentifyRegion": "Identificar região",
         "LayerCatalog": "Catálogo de camadas",
         "Login": "Inicio da sessão",

package/static/translations/pt-PT.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "Pesquisa de Recurso",
         "GeometryDigitizer": "",
         "IdentifyPoint": "Identificar Ponto",
+        "IdentifyRadius": "",
         "IdentifyRegion": "Identificar Região",
         "LayerCatalog": "Catálogo de Camadas",
         "Login": "Iniciar Sessão",

package/static/translations/ro-RO.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "",
         "GeometryDigitizer": "",
         "IdentifyPoint": "Interogare punct",
+        "IdentifyRadius": "",
         "IdentifyRegion": "Interogare regiune",
         "LayerCatalog": "Catalog  de straturi",
         "Login": "Conectează-te",

package/static/translations/ru-RU.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "",
         "GeometryDigitizer": "",
         "IdentifyPoint": "",
+        "IdentifyRadius": "",
         "IdentifyRegion": "Определить регион",
         "LayerCatalog": "",
         "Login": "",

package/static/translations/sv-SE.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "",
         "GeometryDigitizer": "",
         "IdentifyPoint": "",
+        "IdentifyRadius": "",
         "IdentifyRegion": "Identifiera med område",
         "LayerCatalog": "",
         "Login": "Logga in",

package/static/translations/tr-TR.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "Obje Arama",
         "GeometryDigitizer": "Geometri Sayısallaştırıcı",
         "IdentifyPoint": "Nokta bilgisi al",
+        "IdentifyRadius": "",
         "IdentifyRegion": "Bölgeden Bilgi Al",
         "LayerCatalog": "Katman Kataloğu",
         "Login": "Giriş",

package/static/translations/tsconfig.json

@@ -34,6 +34,7 @@
     "appmenu.items.GeometryDigitizer",
     "appmenu.items.Help",
     "appmenu.items.IdentifyPoint",
+    "appmenu.items.IdentifyRadius",
     "appmenu.items.IdentifyRegion",
     "appmenu.items.LayerCatalog",
     "appmenu.items.LayerTree",

package/static/translations/uk-UA.json

@@ -43,6 +43,7 @@
         "FeatureSearch": "",
         "GeometryDigitizer": "",
         "IdentifyPoint": "",
+        "IdentifyRadius": "",
         "IdentifyRegion": "Визначити регіон",
         "LayerCatalog": "",
         "Login": "",