qwc2 2026.6.4 → 2026.6.9

package/components/AttributeForm.js

@@ -1,14 +1,14 @@
 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 _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
@@ -226,30 +226,25 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "loadRelationValues", function (feature, callback) {
       if (!isEmpty(_this.state.relationTables)) {
         if (feature.id) {
-          var relTables = Object.entries(_this.state.relationTables).map(function (_ref) {
-            var _ref2 = _slicedToArray(_ref, 2),
-              name = _ref2[0],
-              entry = _ref2[1];
-            if (entry.sortcol) {
-              return name + ":" + entry.fk + ":" + entry.sortcol;
-            } else {
-              return name + ":" + entry.fk;
-            }
-          }).join(",");
+          // Existing feature, load relations from data service
+          var relTables = Object.values(_this.state.relationTables).map(function (entry) {
+            return _objectSpread(_objectSpread({}, entry), {}, {
+              fkVal: entry.pkField ? feature.properties[entry.pkField] : feature.id
+            });
+          });
           var mapEditConfigs = _this.props.editConfigs[_this.props.editContext.mapPrefix];
-          _this.props.iface.getRelations(_this.props.editContext.editConfig, feature.id, _this.props.map.projection, relTables, mapEditConfigs, function (relationValues) {
+          _this.props.iface.getRelations(relTables, _this.props.map.projection, mapEditConfigs, function (relationValues) {
             var newFeature = _objectSpread(_objectSpread({}, feature), {}, {
               relationValues: relationValues
             });
             callback(newFeature);
           });
         } else {
-          var relationValues = _objectSpread(_objectSpread({}, Object.entries(_this.state.relationTables).reduce(function (res, _ref3) {
-            var _ref4 = _slicedToArray(_ref3, 2),
-              name = _ref4[0],
-              entry = _ref4[1];
-            return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, name, {
-              fk: entry.fk,
+          // New feature, create relationValues skeleton
+          var relationValues = _objectSpread(_objectSpread({}, Object.values(_this.state.relationTables).reduce(function (res, entry) {
+            return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, entry.table, {
+              fk: entry.fkField,
+              pk: entry.pkField,
               features: []
             }));
           }, {})), feature.relationValues);
@@ -273,7 +268,9 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         }
         // If feature id is known, i.e. not when drawing new feature, set foreign key
         if (_this.props.editContext.action !== "Draw") {
-          newRelFeature.properties[_this.state.relationTables[table].fk] = _this.props.editContext.feature.id;
+          var relTable = _this.state.relationTables[table];
+          var fkVal = relTable.pkField ? _this.props.editContext.feature.properties[relTable.pkField] : _this.props.editContext.feature.id;
+          newRelFeature.properties[relTable.fkField] = fkVal;
         }
         newRelationValues[table] = _objectSpread({}, newRelationValues[table]);
         newRelationValues[table].features = newRelationValues[table].features.concat([newRelFeature]);
@@ -378,9 +375,11 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         });
         // If feature id is known, i.e. not when drawing new feature, set foreign key
         var changed = _this.props.editContext.changed;
+        var relTable = _this.state.relationTables[table];
+        var fkVal = relTable.pkField ? _this.props.editContext.feature.properties[relTable.pkField] : _this.props.editContext.feature.id;
         var fk = _this.state.relationTables[table].fk;
-        if (_this.props.editContext.action !== "Draw" && feature.properties[fk] !== _this.props.editContext.feature.id) {
-          newRelationValues[table].features[idx].properties[fk] = _this.props.editContext.feature.id;
+        if (_this.props.editContext.action !== "Draw" && feature.properties[fk] !== fkVal) {
+          newRelationValues[table].features[idx].properties[fk] = fkVal;
           newRelationValues[table].features[idx].__status__ = "changed";
           changed = true;
         }
@@ -455,10 +454,10 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
       parseExpressionsAsync(constraintExpressions, feature, _this.props.editContext.editConfig, _this.props.iface, _this.props.editContext.mapPrefix, _this.props.map.projection, false).then(function (result) {
         var valid = _this.form.checkValidity();
         var reasons = [];
-        Object.entries(result).forEach(function (_ref5) {
-          var _ref6 = _slicedToArray(_ref5, 2),
-            key = _ref6[0],
-            value = _ref6[1];
+        Object.entries(result).forEach(function (_ref) {
+          var _ref2 = _slicedToArray(_ref, 2),
+            key = _ref2[0],
+            value = _ref2[1];
           var element = _this.form.elements.namedItem(key);
           if (element) {
             if (value === false) {
@@ -648,10 +647,10 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
           delete feature.properties[key];
         }
       });
-      Object.entries(relationValues).forEach(function (_ref7) {
-        var _ref8 = _slicedToArray(_ref7, 2),
-          dataset = _ref8[0],
-          entry = _ref8[1];
+      Object.entries(relationValues).forEach(function (_ref3) {
+        var _ref4 = _slicedToArray(_ref3, 2),
+          dataset = _ref4[0],
+          entry = _ref4[1];
         var _dataset$split = dataset.split(".", 2),
           _dataset$split2 = _slicedToArray(_dataset$split, 2),
           mapName = _dataset$split2[0],
@@ -682,11 +681,11 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
               }
             }
           });
-          var sortcol = _this.state.relationTables[relTable].sortcol;
+          var sortField = _this.state.relationTables[relTable].sortField;
           var noreorder = _this.state.relationTables[relTable].noreorder;
-          if (sortcol && !noreorder) {
-            newRelFeature.__status__ = feature.__status__ || (newRelFeature.properties[sortcol] !== idx ? "changed" : "");
-            newRelFeature.properties[sortcol] = idx;
+          if (sortField && !noreorder) {
+            newRelFeature.__status__ = feature.__status__ || (newRelFeature.properties[sortField] !== idx ? "changed" : "");
+            newRelFeature.properties[sortField] = idx;
           }
           return newRelFeature;
         });
@@ -694,16 +693,16 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
       feature.relationValues = relationValues;
       var featureData = new FormData();
       featureData.set('feature', JSON.stringify(feature));
-      Object.entries(featureUploads).forEach(function (_ref9) {
-        var _ref0 = _slicedToArray(_ref9, 2),
-          key = _ref0[0],
-          value = _ref0[1];
+      Object.entries(featureUploads).forEach(function (_ref5) {
+        var _ref6 = _slicedToArray(_ref5, 2),
+          key = _ref6[0],
+          value = _ref6[1];
         return featureData.set('file:' + key, value);
       });
-      Object.entries(relationUploads).forEach(function (_ref1) {
-        var _ref10 = _slicedToArray(_ref1, 2),
-          key = _ref10[0],
-          value = _ref10[1];
+      Object.entries(relationUploads).forEach(function (_ref7) {
+        var _ref8 = _slicedToArray(_ref7, 2),
+          key = _ref8[0],
+          value = _ref8[1];
         return featureData.set('relfile:' + _this.props.editContext.mapPrefix + "." + key, value);
       });
       if (_this.state.captchaResponse) {

package/components/QtDesignerForm.js

@@ -401,7 +401,7 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
         })));
       } else if (widget["class"] === "QTextEdit" || widget["class"] === "QTextBrowser" || widget["class"] === "QPlainTextEdit") {
         var _feature$properties$w3, _feature$properties3;
-        if (((_feature$properties$w3 = (_feature$properties3 = feature.properties) === null || _feature$properties3 === void 0 ? void 0 : _feature$properties3[widget.name]) !== null && _feature$properties$w3 !== void 0 ? _feature$properties$w3 : null) === null) {
+        if (value === "" && ((_feature$properties$w3 = (_feature$properties3 = feature.properties) === null || _feature$properties3 === void 0 ? void 0 : _feature$properties3[widget.name]) !== null && _feature$properties$w3 !== void 0 ? _feature$properties$w3 : null) === null) {
           var _ConfigUtils$getConfi;
           value = (_ConfigUtils$getConfi = ConfigUtils.getConfigProp("editTextNullValue")) !== null && _ConfigUtils$getConfi !== void 0 ? _ConfigUtils$getConfi : "";
         }
@@ -448,7 +448,7 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
           var _feature$properties$w4, _feature$properties5;
           if (fieldConstraints.prec !== undefined && typeof value === 'number') {
             value = value.toFixed(fieldConstraints.prec);
-          } else if (((_feature$properties$w4 = (_feature$properties5 = feature.properties) === null || _feature$properties5 === void 0 ? void 0 : _feature$properties5[widget.name]) !== null && _feature$properties$w4 !== void 0 ? _feature$properties$w4 : null) === null) {
+          } else if (value === "" && ((_feature$properties$w4 = (_feature$properties5 = feature.properties) === null || _feature$properties5 === void 0 ? void 0 : _feature$properties5[widget.name]) !== null && _feature$properties$w4 !== void 0 ? _feature$properties$w4 : null) === null) {
             var _ConfigUtils$getConfi2;
             value = (_ConfigUtils$getConfi2 = ConfigUtils.getConfigProp("editTextNullValue")) !== null && _ConfigUtils$getConfi2 !== void 0 ? _ConfigUtils$getConfi2 : "";
           }
@@ -1034,10 +1034,15 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
       }
       var parts = widget.name.split("__");
       if (parts.length >= 3 && parts[0] === "nrel") {
+        var _this$props$editConfi2, _this$props$editConfi3;
         relationTables[_this.props.mapPrefix + "." + parts[1]] = {
-          fk: parts[2],
-          sortcol: parts[3] || null,
-          noreorder: parts[4] || false
+          table: _this.props.mapPrefix + "." + parts[1],
+          fkField: parts[2],
+          sortField: parts[3] || null,
+          noreorder: parts[4] || false,
+          pkField: (_this$props$editConfi2 = (_this$props$editConfi3 = _this.props.editConfig.reltables.find(function (entry) {
+            return entry.id === widget.name;
+          })) === null || _this$props$editConfi3 === void 0 ? void 0 : _this$props$editConfi3.referencedField) !== null && _this$props$editConfi2 !== void 0 ? _this$props$editConfi2 : null
         };
       }
       return verticalFill;

package/package.json

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

package/plugins/SensorThingsTool.js

@@ -1713,7 +1713,8 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
             showDatastreamsFilterWindow: false
           });
         },
-        title: LocaleUtils.tr("sensorthingstool.datastreamsFilter.title")
+        title: LocaleUtils.tr("sensorthingstool.datastreamsFilter.title"),
+        usePortal: false
       }, /*#__PURE__*/React.createElement("div", {
         className: "sensor-things-dialog-body",
         role: "body"
@@ -2070,6 +2071,7 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
         showWindow: false,
         pickGeom: null
       });
+      _this.props.removeLayer("sensorThingsSelection");
     });
     _defineProperty(_this, "initPeriod", function () {
       if (_this.state.graph.x.min === null) {
@@ -2225,6 +2227,11 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
             }
             var sensor = datastream.Sensor;
             var observedProperty = datastream.ObservedProperty;
+            var unitOfMeasurement = datastream.unitOfMeasurement || {};
+            if (unitOfMeasurement.symbol === undefined || unitOfMeasurement.symbol === null) {
+              // set empty string as dummy symbol if missing
+              unitOfMeasurement.symbol = "";
+            }
             datastreamsLookup[datastreamId] = {
               locationId: location['@iot.id'],
               thing: {
@@ -2245,7 +2252,7 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
               id: datastreamId,
               name: datastream.name,
               description: datastream.description,
-              unitOfMeasurement: datastream.unitOfMeasurement,
+              unitOfMeasurement: unitOfMeasurement,
               phenomenonTime: datastream.phenomenonTime,
               period: {
                 begin: periodBegin,
@@ -3081,7 +3088,8 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
         onClose: function onClose() {
           return _this3.props.setCurrentTask(null);
         },
-        title: LocaleUtils.tr("sensorthingstool.title")
+        title: LocaleUtils.tr("sensorthingstool.title"),
+        usePortal: false
       }, this.renderBody()), this.renderLocationSelectPopup(), this.renderLocationInfoWindow(), this.renderDatastreamsFilterWindow(), this.renderDatastreamInfoWindow(), this.renderDatastreamTableWindow(), /*#__PURE__*/React.createElement(MapSelection, {
         active: this.state.locationPickingActive,
         cursor: "crosshair",

package/plugins/map/LocateSupport.js

@@ -29,8 +29,10 @@ import { connect } from 'react-redux';
 import ol from 'openlayers';
 import PropTypes from 'prop-types';
 import { changeLocateState, changeLocatePosition, onLocateError } from '../../actions/locate';
+import { zoomToPoint } from '../../actions/map';
 import CoordinatesUtils from '../../utils/CoordinatesUtils';
 import LocaleUtils from '../../utils/LocaleUtils';
+import MapUtils from '../../utils/MapUtils';
 import './style/LocateSupport.css';
 
 /**
@@ -218,6 +220,12 @@ var LocateSupport = /*#__PURE__*/function (_React$Component) {
           this.requestedMode = "DISABLED";
           this.stop();
         }
+        if (newState === "FOLLOWING" && oldState !== "FOLLOWING" && this.props.followScale && this.props.scales) {
+          var mapPos = this.geolocate.getPosition();
+          if (mapPos) {
+            this.props.zoomToPoint(mapPos, MapUtils.computeZoom(this.props.scales, this.props.followScale), this.props.projection);
+          }
+        }
       }
       if (this.props.projection !== prevProps.projection) {
         this.geolocate.setProjection(this.props.projection);
@@ -235,12 +243,15 @@ _defineProperty(LocateSupport, "propTypes", {
   changeLocateState: PropTypes.func,
   /** Whether to draw an accuracy circle around the location point. */
   drawCircle: PropTypes.bool,
+  /** Scale denominator to zoom to when entering follow mode. If not set, the map zoom level is not changed. */
+  followScale: PropTypes.number,
   locateState: PropTypes.object,
   map: PropTypes.object,
   /** Whether to display the accuracy in meters (`true`) or in feet (`false`). */
   metric: PropTypes.bool,
   onLocateError: PropTypes.func,
   projection: PropTypes.string,
+  scales: PropTypes.arrayOf(PropTypes.number),
   /** Whether to show a popup displaying accuracy information when clicking on the location point. */
   showPopup: PropTypes.bool,
   /** The geolocation startup mode. Either `DISABLED`, `ENABLED` or `FOLLOWING`. */
@@ -249,7 +260,8 @@ _defineProperty(LocateSupport, "propTypes", {
   /** Whether to stop following when the map is dragged. */
   stopFollowingOnDrag: PropTypes.bool,
   /** Tracking options, as documented in the [HTML5 Geolocation spec](https://www.w3.org/TR/geolocation-API/#position_options_interface) */
-  trackingOptions: PropTypes.object
+  trackingOptions: PropTypes.object,
+  zoomToPoint: PropTypes.func
 });
 _defineProperty(LocateSupport, "defaultProps", {
   drawCircle: true,
@@ -266,10 +278,12 @@ _defineProperty(LocateSupport, "defaultProps", {
 export default connect(function (state) {
   return {
     locateState: state.locate,
+    scales: state.map.scales,
     startupParams: state.localConfig.startupParams
   };
 }, {
   changeLocateState: changeLocateState,
   changeLocatePosition: changeLocatePosition,
-  onLocateError: onLocateError
+  onLocateError: onLocateError,
+  zoomToPoint: zoomToPoint
 })(LocateSupport);

package/plugins/map3d/Identify3D.js

@@ -93,10 +93,10 @@ var Identify3D = /*#__PURE__*/function (_React$Component) {
       var picks = [];
       Object.values(_this.props.sceneContext.objectTree).forEach(function (entry) {
         var _object$tiles;
-        if (!entry.objectId || !_this.props.sceneContext.objectIsVisible(entry.objectId)) {
+        var object = _this.props.sceneContext.getSceneObject(entry.objectId);
+        if (!entry.objectId || !_this.props.sceneContext.objectIsVisible(entry.objectId) || !object) {
           return;
         }
-        var object = _this.props.sceneContext.getSceneObject(entry.objectId);
         if ((_object$tiles = object.tiles) !== null && _object$tiles !== void 0 && _object$tiles.raycast) {
           var intersections = [];
           object.tiles.raycast(raycaster, intersections);

package/plugins/style/SensorThingsTool.css

@@ -1,4 +1,5 @@
 div.sensor-things-dialog-body {
+    height: 100%;
     display: flex;
     flex-direction: column;
 }

package/utils/EditingInterface.js

@@ -371,18 +371,16 @@ var EditingInterface = {
   },
   /**
    * Queries relation values of a feature
-   * @param editConfig The edit config of the feature dataset
-   * @param featureId The feature ID
+   * @param tables List of the form `[{"table": "<table>", "fkField": "<fk_field_name>", "fkVal": "<fk_val>", "sortCol": "<sort_col>", "pkField": "<pk_field>"}]`
    * @param mapCrs The CRS of the map, as an EPSG code
-   * @param tables Comma separated string of relation table references in the form `<table_name>:<fk_name>:<sort_col>`
    * @param editConfigs The theme editConfig block, containing all theme dataset edit configs
    * @param callback Callback invoked with the relation values, taking `{<tablename>: {<relation_values>}}` on success and `{}` on failure
    */
-  getRelations: function getRelations(editConfig, featureId, mapCrs, tables, editConfigs, callback) {
+  getRelations: function getRelations(tables, mapCrs, editConfigs, callback) {
     var editServiceUrl = ConfigUtils.getConfigProp("editServiceUrl").replace(/\/$/, '');
-    var req = editServiceUrl + '/' + editConfig.editDataset + '/' + featureId + "/relations";
+    var req = editServiceUrl + '/relations';
     var params = {
-      tables: tables,
+      tables: JSON.stringify(tables),
       crs: mapCrs
     };
     var headers = {