qwc2 2026.6.3 → 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); }
@@ -76,7 +76,7 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
           label: _this.state.formValid ? LocaleUtils.tr("editing.commit") : LocaleUtils.tr("editing.invalidform"),
           extraClasses: _this.state.formValid ? "button-accept" : "button-warning",
           type: "submit",
-          disabled: !_this.state.formValid || captchaPending
+          disabled: captchaPending
         }, {
           key: 'Discard',
           icon: 'remove',
@@ -167,11 +167,10 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
       }, readOnlyMsg) : null, /*#__PURE__*/React.createElement("form", {
         action: "",
         className: "attrib-form-parent-form",
-        onChange: function onChange(ev) {
-          return _this.formChanged(ev);
-        },
         onSubmit: _this.onSubmit,
-        ref: _this.setupChangedObserver
+        ref: function ref(el) {
+          _this.form = el;
+        }
       }, editConfig.form ? /*#__PURE__*/React.createElement(QtDesignerForm, {
         addRelationRecord: _this.addRelationRecord,
         editConfig: editConfig,
@@ -218,7 +217,6 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         feature: newFeature,
         changed: true
       });
-      _this.validateFieldConstraints(newFeature);
     });
     _defineProperty(_this, "setRelationTables", function (relationTables) {
       _this.setState({
@@ -228,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);
@@ -275,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]);
@@ -380,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;
         }
@@ -419,8 +416,6 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
                     changed: false
                   });
                 });
-                // Re-validate feature field constraints
-                _this.validateFieldConstraints(feature);
               } else {
                 _this.props.setEditContext(_this.props.editContext.id, {
                   feature: feature,
@@ -443,37 +438,7 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         }
       }
     });
-    _defineProperty(_this, "setupChangedObserver", function (form) {
-      _this.form = form;
-      if (form) {
-        form.observer = new MutationObserver(function () {
-          _this.setState({
-            formValid: form.checkValidity()
-          });
-        });
-        form.observer.observe(form, {
-          subtree: true,
-          childList: true,
-          attributes: true
-        });
-      }
-    });
-    _defineProperty(_this, "formChanged", function (ev) {
-      var _ev$target;
-      var form = ev.currentTarget;
-      if ((_ev$target = ev.target) !== null && _ev$target !== void 0 && _ev$target.setCustomValidity) {
-        ev.target.setCustomValidity("");
-      }
-      if (form) {
-        _this.setState({
-          formValid: form.checkValidity()
-        });
-        _this.props.setEditContext(_this.props.editContext.id, {
-          changed: true
-        });
-      }
-    });
-    _defineProperty(_this, "validateFieldConstraints", function (feature) {
+    _defineProperty(_this, "validateForm", function (feature) {
       var validCallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
       var invalidCallback = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
       var constraintExpressions = _this.props.editContext.editConfig.fields.reduce(function (res, cur) {
@@ -487,12 +452,12 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         return res;
       }, []);
       parseExpressionsAsync(constraintExpressions, feature, _this.props.editContext.editConfig, _this.props.iface, _this.props.editContext.mapPrefix, _this.props.map.projection, false).then(function (result) {
-        var valid = true;
+        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) {
@@ -508,23 +473,27 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
             }
           }
         });
+        Array.from(_this.form.elements).filter(function (el) {
+          return el.willValidate && el.required && el.validity.valueMissing;
+        }).forEach(function (el) {
+          reasons.push("".concat(el.name, ": ").concat(LocaleUtils.tr("editing.emptyvalue")));
+        });
         if (!valid) {
           _this.setState({
             formValid: false
           });
-          if (invalidCallback) {
-            invalidCallback(reasons);
-          }
+          invalidCallback === null || invalidCallback === void 0 || invalidCallback(reasons);
         } else {
-          if (validCallback) {
-            validCallback();
-          }
+          _this.setState({
+            formValid: true
+          });
+          validCallback === null || validCallback === void 0 || validCallback();
         }
       });
     });
     _defineProperty(_this, "onSubmit", function (ev) {
       ev.preventDefault();
-      _this.validateFieldConstraints(_this.props.editContext.feature, _this.doSubmit, function (reasons) {
+      _this.validateForm(_this.props.editContext.feature, _this.doSubmit, function (reasons) {
         /* eslint-disable-next-line */
         alert(LocaleUtils.tr("editing.contraintviolation") + ":\n" + reasons.join("\n"));
       });
@@ -678,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],
@@ -712,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;
         });
@@ -724,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) {
@@ -826,8 +795,6 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
                 changed: false
               });
             });
-            // Re-validate feature field constraints
-            _this.validateFieldConstraints(result);
           } else {
             _this.props.setEditContext(_this.props.editContext.id, {
               action: 'Pick',
@@ -931,8 +898,9 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
             feature: newFeature
           });
         });
-        // Re-validate feature field constraints
-        this.validateFieldConstraints(this.props.editContext.feature);
+      }
+      if (this.props.editContext.feature !== prevProps.editContext.feature) {
+        this.validateForm(this.props.editContext.feature);
       }
     }
   }, {

package/components/AutoEditForm.js

@@ -1,5 +1,11 @@
 var _excluded = ["multiline"];
 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 _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 _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); }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
@@ -75,12 +81,17 @@ var AutoEditForm = /*#__PURE__*/function (_React$Component) {
           })), field.name);
         }
       } else if (constraints.values || constraints.keyvalrel) {
+        var _constraints$keyvalre = constraints.keyvalrel.split('.', 2),
+          _constraints$keyvalre2 = _slicedToArray(_constraints$keyvalre, 2),
+          mapPrefix = _constraints$keyvalre2[0],
+          keyvalrel = _constraints$keyvalre2[1];
         input = /*#__PURE__*/React.createElement("span", {
           className: "input-frame"
         }, /*#__PURE__*/React.createElement(EditComboField, {
           editIface: _this.props.iface,
           fieldId: field.id,
-          keyvalrel: constraints.keyvalrel,
+          keyvalrel: keyvalrel,
+          mapPrefix: mapPrefix,
           name: field.id,
           readOnly: readOnly,
           required: constraints.required,

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/components/style/App.css

@@ -149,6 +149,10 @@ button.button-reject {
     background-color: rgb(255,127,127);
 }
 
+button.button-warning:not(:disabled):hover {
+    background-color: #f5ce74;
+}
+
 button.button-accept:not(:disabled):hover {
     background-color: rgb(127,225,127);
 }

package/components/widgets/MenuButton.js

@@ -85,7 +85,9 @@ var MenuButton = /*#__PURE__*/function (_React$Component) {
         buttonContents = [this.props.menuIcon ? /*#__PURE__*/React.createElement(Icon, {
           icon: this.props.menuIcon,
           key: "icon"
-        }) : null, this.props.menuLabel ? /*#__PURE__*/React.createElement("span", null, this.props.menuLabel) : null];
+        }) : null, this.props.menuLabel ? /*#__PURE__*/React.createElement("span", {
+          key: "label"
+        }, this.props.menuLabel) : null];
       } else {
         buttonContents = children.filter(function (child) {
           return child.props.value === _this2.state.selected;
@@ -123,6 +125,7 @@ var MenuButton = /*#__PURE__*/function (_React$Component) {
       })), this.props.tooltip ? /*#__PURE__*/React.createElement("span", {
         className: "menubutton-tooltip " + ("menubutton-tooltip-" + this.props.tooltipPos)
       }, this.props.tooltip) : null), this.el && this.state.popup ? /*#__PURE__*/React.createElement(PopupMenu, {
+        align: this.props.menuAlign,
         anchor: this.el,
         className: menuClassnames,
         onClose: function onClose() {
@@ -150,6 +153,7 @@ _defineProperty(MenuButton, "propTypes", {
   children: PropTypes.array,
   className: PropTypes.string,
   disabled: PropTypes.bool,
+  menuAlign: PropTypes.string,
   menuClassName: PropTypes.string,
   menuIcon: PropTypes.string,
   menuLabel: PropTypes.string,

package/components/widgets/NumberInput.js

@@ -50,7 +50,7 @@ var NumberInput = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_this, "currentFloatValue", function () {
       if (_this.state.value === "") {
-        return 0;
+        return null;
       }
       var floatValue = parseFloat(_this.state.value);
       return isNaN(floatValue) ? null : floatValue;

package/components/widgets/PopupMenu.js

@@ -156,13 +156,14 @@ var PopupMenu = /*#__PURE__*/function (_React$PureComponent) {
   }, {
     key: "render",
     value: function render() {
-      var _rect$left,
+      var _ref,
         _rect,
-        _rect$bottom,
         _rect2,
-        _ref,
-        _rect$width,
+        _rect$bottom,
         _rect3,
+        _ref2,
+        _rect$width,
+        _rect4,
         _this$props$disabledI,
         _this2 = this;
       if (isEmpty(this.props.children)) {
@@ -182,19 +183,12 @@ var PopupMenu = /*#__PURE__*/function (_React$PureComponent) {
         this.shields[2].style.left = rect.right + "px";
         this.shields[3].style.top = rect.bottom + "px";
       }
-      var x = (_rect$left = (_rect = rect) === null || _rect === void 0 ? void 0 : _rect.left) !== null && _rect$left !== void 0 ? _rect$left : this.props.x;
-      var y = ((_rect$bottom = (_rect2 = rect) === null || _rect2 === void 0 ? void 0 : _rect2.bottom) !== null && _rect$bottom !== void 0 ? _rect$bottom : this.props.y) - 1;
-      var minWidth = (_ref = (_rect$width = (_rect3 = rect) === null || _rect3 === void 0 ? void 0 : _rect3.width) !== null && _rect$width !== void 0 ? _rect$width : this.props.width) !== null && _ref !== void 0 ? _ref : 0;
-      var style = {
-        position: 'absolute',
-        left: x + 'px',
-        top: y + 'px',
-        minWidth: minWidth + 'px',
-        maxHeight: window.innerHeight - y - 5 + 'px',
-        overflowY: 'auto',
-        zIndex: 1,
-        pointerEvents: 'initial'
-      };
+      var x = (_ref = this.props.align === 'right' ? (_rect = rect) === null || _rect === void 0 ? void 0 : _rect.right : (_rect2 = rect) === null || _rect2 === void 0 ? void 0 : _rect2.left) !== null && _ref !== void 0 ? _ref : this.props.x;
+      var y = ((_rect$bottom = (_rect3 = rect) === null || _rect3 === void 0 ? void 0 : _rect3.bottom) !== null && _rect$bottom !== void 0 ? _rect$bottom : this.props.y) - 1;
+      var minWidth = (_ref2 = (_rect$width = (_rect4 = rect) === null || _rect4 === void 0 ? void 0 : _rect4.width) !== null && _rect$width !== void 0 ? _rect$width : this.props.width) !== null && _ref2 !== void 0 ? _ref2 : 0;
+      var style = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
+        position: 'absolute'
+      }, this.props.align === "right" ? "right" : "left", (this.props.align === "right" ? window.innerWidth - x : x) + 'px'), "top", y + 'px'), "minWidth", minWidth + 'px'), "maxHeight", window.innerHeight - y - 5 + 'px'), "overflowY", 'auto'), "zIndex", 1), "pointerEvents", 'initial');
       if (this.props.setMaxWidth) {
         style.maxWidth = minWidth + 'px';
       }
@@ -225,6 +219,7 @@ var PopupMenu = /*#__PURE__*/function (_React$PureComponent) {
   }]);
 }(React.PureComponent);
 _defineProperty(PopupMenu, "propTypes", {
+  align: PropTypes.string,
   anchor: PropTypes.object,
   children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
   className: PropTypes.string,

package/components/widgets/style/MenuButton.css

@@ -52,6 +52,10 @@ span.menubutton-button-content {
     align-items: center;
 }
 
+span.menubutton-button-content span+span {
+    margin-left: 0.5em;
+}
+
 div.menubutton span.menubotton-button-arrow {
     height: 80%;
     display: flex;
@@ -104,4 +108,4 @@ span.menubutton-tooltip-bottom {
 
 div.menubutton:hover span.menubutton-tooltip {
     display: inline;
-}
+}

package/package.json

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

package/plugins/SensorThingsTool.js

@@ -231,6 +231,8 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
        *  }
        */
       currentSensorLocation: null,
+      // automatically add all Datastreams of currently selected Location if true
+      addCurrentLocationDatastreams: false,
       // show currently selected Location info window if true
       showLocationInfoWindow: false,
       // currently selected Datastreams filter options
@@ -952,12 +954,11 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
           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() {
-              return _this.addLocation(location);
-            },
+        }, /*#__PURE__*/React.createElement("table", {
+          className: "sensor-things-location-select-table"
+        }, /*#__PURE__*/React.createElement("tbody", null, _this.state.locationsAtPoint.map(function (location, idx) {
+          return /*#__PURE__*/React.createElement("tr", {
+            key: "select-location--" + idx,
             onMouseOut: function onMouseOut() {
               return _this.setState({
                 highlightedLocation: null
@@ -968,8 +969,31 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
                 highlightedLocation: location
               });
             }
-          }, location.name, ": ", location.description);
-        })));
+          }, /*#__PURE__*/React.createElement("td", {
+            onClickCapture: function onClickCapture() {
+              return _this.addLocation(location);
+            },
+            title: "".concat(location.name, ": ").concat(location.description)
+          }, location.name, ": ", location.description), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("div", {
+            className: "sensor-things-location-select-buttons"
+          }, /*#__PURE__*/React.createElement("button", {
+            className: "button",
+            onClick: function onClick() {
+              return _this.addLocation(location);
+            },
+            title: LocaleUtils.tr("sensorthingstool.addLocation")
+          }, /*#__PURE__*/React.createElement(Icon, {
+            icon: "plus"
+          })), /*#__PURE__*/React.createElement("button", {
+            className: "button",
+            onClick: function onClick() {
+              return _this.addFullLocation(location);
+            },
+            title: LocaleUtils.tr("sensorthingstool.addLocationAndDatastreams")
+          }, /*#__PURE__*/React.createElement(Icon, {
+            icon: "sync"
+          })))));
+        })))));
       } else {
         return null;
       }
@@ -1008,6 +1032,16 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
         });
       }
     });
+    _defineProperty(_this, "addFullLocation", function (location) {
+      // remove current Datastreams
+      _this.removeAllDatastreams();
+      // add selected Location
+      _this.addLocation(location);
+      // set flag to automatically add all Datastreams of selected Location once ready
+      _this.setState({
+        addCurrentLocationDatastreams: true
+      });
+    });
     _defineProperty(_this, "removeSelectedLocation", function () {
       if (_this.state.currentSensorLocation === null) {
         // skip if currentSensorLocation not yet ready
@@ -1147,6 +1181,12 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
         });
       }
     });
+    _defineProperty(_this, "addDatastreams", function (datastreamIds) {
+      // add multiple Datastreams
+      datastreamIds.forEach(function (datastreamId) {
+        _this.addDatastream(datastreamId);
+      });
+    });
     _defineProperty(_this, "removeDatastream", function (datastreamIndex) {
       _this.setState(function (state) {
         var datastreamInfoWindow = state.datastreamInfoWindow;
@@ -1181,6 +1221,18 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
         };
       });
     });
+    _defineProperty(_this, "removeAllDatastreams", function () {
+      _this.setState(function (state) {
+        return {
+          graph: _objectSpread(_objectSpread({}, state.graph), {}, {
+            datastreams: []
+          }),
+          datastreamInfoWindow: null,
+          datastreamOptions: [],
+          datastreamTableWindow: null
+        };
+      });
+    });
     // NOTE: color as [<r>, <g>, <b>] (0-255)
     _defineProperty(_this, "optionsForThresholdLine", function (axisID, label, thresholdValue, color) {
       var annotationOptions = {
@@ -1661,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"
@@ -2018,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) {
@@ -2173,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: {
@@ -2193,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,
@@ -2963,6 +3022,14 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
       } else if (prevState.currentSensorLocation && !this.state.currentSensorLocation) {
         this.props.removeLayer("sensorThingsSelection");
       }
+      if (this.state.addCurrentLocationDatastreams && this.state.currentSensorLocation && this.state.currentSensorLocation.id === this.state.currentLocationId) {
+        // add all Datastreams of current Location
+        this.addDatastreams(this.state.currentSensorLocation.datastreams);
+        // reset flag
+        this.setState({
+          addCurrentLocationDatastreams: false
+        });
+      }
       if (this.state.currentDatastreamsFilter !== prevState.currentDatastreamsFilter) {
         this.filterLocationDatastreams();
       }
@@ -3021,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;
 }
@@ -163,16 +164,30 @@ div.sensor-things-location-select-header {
 }
 div.sensor-things-location-select-list {
     padding: 0.25em;
+    max-width: 500px;
     max-height: 16em;
     overflow-y: auto;
 }
-div.sensor-things-location-select-list div {
+table.sensor-things-location-select-table tr:hover {
+    background-color: var(--button-bg-color);
+}
+table.sensor-things-location-select-table td {
     padding-top: 0.25em;
+    padding-bottom: 0.25em;
+    border-bottom: 1px solid var(--border-color);
 }
-div.sensor-things-location-select-list div:hover {
-    font-weight: bold;
+table.sensor-things-location-select-table td:nth-child(1) {
+    max-width: 430px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
     cursor: pointer;
 }
+table.sensor-things-location-select-table td div.sensor-things-location-select-buttons {
+    display: flex;
+    padding-left: 0.25em;
+    font-size: 85%;
+}
 
 table.sensor-things-location-info td:nth-child(1) {
     width: 8.5em;

package/static/translations/bg-BG.json

@@ -224,6 +224,7 @@
       "create": "Създаване на",
       "discard": "Изхвърляне",
       "draw": "Начертайте",
+      "emptyvalue": "",
       "feature": "Функции",
       "geomnonzeroz": "Геометрията съдържа ненулеви стойности на Z и следователно е само за четене.",
       "geomreadonly": "",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "",
+      "addLocation": "",
+      "addLocationAndDatastreams": "",
       "datastreamInfo": {
         "calibration": "",
         "description": "",

package/static/translations/ca-ES.json

@@ -224,6 +224,7 @@
       "create": "Crear",
       "discard": "Descartar",
       "draw": "Traçar",
+      "emptyvalue": "",
       "feature": "Element",
       "geomnonzeroz": "La geometria conté valors Z diferents de zero, per tant és de només lectura",
       "geomreadonly": "La geometria és només de lectura.",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "",
+      "addLocation": "",
+      "addLocationAndDatastreams": "",
       "datastreamInfo": {
         "calibration": "",
         "description": "",

package/static/translations/cs-CZ.json

@@ -224,6 +224,7 @@
       "create": "Vytvořit",
       "discard": "Vyřadit",
       "draw": "Kreslit",
+      "emptyvalue": "",
       "feature": "Prvek",
       "geomnonzeroz": "",
       "geomreadonly": "",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "",
+      "addLocation": "",
+      "addLocationAndDatastreams": "",
       "datastreamInfo": {
         "calibration": "",
         "description": "",

package/static/translations/de-CH.json

@@ -224,6 +224,7 @@
       "create": "Erstellen",
       "discard": "Abbrechen",
       "draw": "Zeichnen",
+      "emptyvalue": "Leerer Wert",
       "feature": "Objekt",
       "geomnonzeroz": "Die Geometrie enthält Z-Werte ungleich Null und ist daher nicht veränderbar.",
       "geomreadonly": "Die Geometrie ist nicht veränderbar.",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "Datastream zum Graph hinzufügen",
+      "addLocation": "Location hinzufügen",
+      "addLocationAndDatastreams": "Location hinzufügen und alle ihre Datastreams im Graph anzeigen",
       "datastreamInfo": {
         "calibration": "Kalibrierung",
         "description": "Beschreibung",

package/static/translations/de-DE.json

@@ -224,6 +224,7 @@
       "create": "Erstellen",
       "discard": "Abbrechen",
       "draw": "Zeichnen",
+      "emptyvalue": "Leerer Wert",
       "feature": "Objekt",
       "geomnonzeroz": "Die Geometrie enthält Z-Werte ungleich Null und ist daher nicht veränderbar.",
       "geomreadonly": "Die Geometrie ist nicht veränderbar",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "Datastream zum Graph hinzufügen",
+      "addLocation": "Location hinzufügen",
+      "addLocationAndDatastreams": "Location hinzufügen und alle ihre Datastreams im Graph anzeigen",
       "datastreamInfo": {
         "calibration": "Kalibrierung",
         "description": "Beschreibung",
@@ -813,7 +816,7 @@
         "title": "Titel"
       },
       "openintab": "In Tab öffnen",
-      "restrictedcontent": "",
+      "restrictedcontent": "Theme mit Inhalten, die auf authentifizierte Benutzer beschränkt sind",
       "restrictedthemeinfo": "Sie sind nicht berechtigt oder sind nicht angemeldet"
     },
     "timemanager": {

package/static/translations/en-US.json

@@ -224,6 +224,7 @@
       "create": "Create",
       "discard": "Discard",
       "draw": "Draw",
+      "emptyvalue": "Empty value",
       "feature": "Feature",
       "geomnonzeroz": "The geometry contains non-zero Z values and is therefore read only.",
       "geomreadonly": "The geometry is read only.",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "Add datastream to graph",
+      "addLocation": "Add location",
+      "addLocationAndDatastreams": "Add location and show all its datastreams in the graph",
       "datastreamInfo": {
         "calibration": "Calibration",
         "description": "Description",

package/static/translations/es-ES.json

@@ -224,6 +224,7 @@
       "create": "Crear",
       "discard": "Descartar",
       "draw": "Trazar",
+      "emptyvalue": "",
       "feature": "Elemento",
       "geomnonzeroz": "La geometría contiene valores Z diferentes de cero por lo que es sólo lectura",
       "geomreadonly": "La geometría es de solo lectura.",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "",
+      "addLocation": "",
+      "addLocationAndDatastreams": "",
       "datastreamInfo": {
         "calibration": "",
         "description": "",

package/static/translations/fi-FI.json

@@ -224,6 +224,7 @@
       "create": "",
       "discard": "Discard",
       "draw": "Draw",
+      "emptyvalue": "",
       "feature": "Feature",
       "geomnonzeroz": "",
       "geomreadonly": "",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "",
+      "addLocation": "",
+      "addLocationAndDatastreams": "",
       "datastreamInfo": {
         "calibration": "",
         "description": "",

package/static/translations/fr-FR.json

@@ -224,6 +224,7 @@
       "create": "Créer",
       "discard": "Rejeter",
       "draw": "Dessiner",
+      "emptyvalue": "Valeur vide",
       "feature": "Objet",
       "geomnonzeroz": "La géométrie contient des valeurs Z non nulles et ne peut donc pas être modifiée.",
       "geomreadonly": "La géométrie e peut pas être modifiée.",
@@ -533,7 +534,7 @@
       "loading": "Chargement des données..."
     },
     "portal": {
-      "close": "",
+      "close": "Fermer le portail",
       "filter": "Filtrer les thèmes...",
       "menulabel": "Menu"
     },
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "Ajouter un flux de données au graphique",
+      "addLocation": "Ajouter un lieu",
+      "addLocationAndDatastreams": "Ajouter un emplacement et afficher tous ses flux de données dans le graphique",
       "datastreamInfo": {
         "calibration": "Calibration",
         "description": "Description",

package/static/translations/hu-HU.json

@@ -224,6 +224,7 @@
       "create": "",
       "discard": "Elvetés",
       "draw": "Rajzolás",
+      "emptyvalue": "",
       "feature": "",
       "geomnonzeroz": "",
       "geomreadonly": "",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "",
+      "addLocation": "",
+      "addLocationAndDatastreams": "",
       "datastreamInfo": {
         "calibration": "",
         "description": "",

package/static/translations/it-IT.json

@@ -224,6 +224,7 @@
       "create": "Crea",
       "discard": "Annulla",
       "draw": "Disegna",
+      "emptyvalue": "Valore vuoto",
       "feature": "Oggetto",
       "geomnonzeroz": "La geometria contiene valori Z non nulli ed è quindi di sola lettura.",
       "geomreadonly": "La geometria è di solo lettura.",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "Aggiungi flusso di dati al grafico",
+      "addLocation": "Aggiungi una posizione",
+      "addLocationAndDatastreams": "Aggiungi una posizione e visualizza tutti i relativi flussi di dati nel grafico",
       "datastreamInfo": {
         "calibration": "Calibrazione",
         "description": "Descrizione",

package/static/translations/ja-JP.json

@@ -224,6 +224,7 @@
       "create": "作成",
       "discard": "中止",
       "draw": "作図",
+      "emptyvalue": "",
       "feature": "地物",
       "geomnonzeroz": "ジオメトリが 0 でない Z 値を含んでいるため、リード・オンリーです。",
       "geomreadonly": "ジオメトリがリード・オンリーです。",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "",
+      "addLocation": "",
+      "addLocationAndDatastreams": "",
       "datastreamInfo": {
         "calibration": "",
         "description": "",

package/static/translations/nl-NL.json

@@ -224,6 +224,7 @@
       "create": "Toevoegen",
       "discard": "Negeren",
       "draw": "Tekenen",
+      "emptyvalue": "",
       "feature": "Object",
       "geomnonzeroz": "De geometrie bevat geen Z-waarden en is daarom read only.",
       "geomreadonly": "",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "",
+      "addLocation": "",
+      "addLocationAndDatastreams": "",
       "datastreamInfo": {
         "calibration": "",
         "description": "",

package/static/translations/no-NO.json

@@ -224,6 +224,7 @@
       "create": "",
       "discard": "Forkast",
       "draw": "Tegn",
+      "emptyvalue": "",
       "feature": "Objekt",
       "geomnonzeroz": "",
       "geomreadonly": "",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "",
+      "addLocation": "",
+      "addLocationAndDatastreams": "",
       "datastreamInfo": {
         "calibration": "",
         "description": "",

package/static/translations/pl-PL.json

@@ -224,6 +224,7 @@
       "create": "",
       "discard": "Odrzuć",
       "draw": "Rysuj",
+      "emptyvalue": "",
       "feature": "",
       "geomnonzeroz": "",
       "geomreadonly": "",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "",
+      "addLocation": "",
+      "addLocationAndDatastreams": "",
       "datastreamInfo": {
         "calibration": "",
         "description": "",

package/static/translations/pt-BR.json

@@ -224,6 +224,7 @@
       "create": "Criar",
       "discard": "Descartar",
       "draw": "Desenhar",
+      "emptyvalue": "",
       "feature": "Feição",
       "geomnonzeroz": "Geometria somente de leitura",
       "geomreadonly": "",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "",
+      "addLocation": "",
+      "addLocationAndDatastreams": "",
       "datastreamInfo": {
         "calibration": "",
         "description": "",

package/static/translations/pt-PT.json

@@ -224,6 +224,7 @@
       "create": "Criar",
       "discard": "Descartar",
       "draw": "Desenhar",
+      "emptyvalue": "",
       "feature": "Recurso",
       "geomnonzeroz": "Geometria Apenas para Leitura",
       "geomreadonly": "",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "",
+      "addLocation": "",
+      "addLocationAndDatastreams": "",
       "datastreamInfo": {
         "calibration": "",
         "description": "",

package/static/translations/ro-RO.json

@@ -224,6 +224,7 @@
       "create": "Creare",
       "discard": "Renunță",
       "draw": "Desenare",
+      "emptyvalue": "",
       "feature": "Obiect spațial",
       "geomnonzeroz": "Geometria include valori Z și, prin urmare, nu poate fi editată",
       "geomreadonly": "",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "",
+      "addLocation": "",
+      "addLocationAndDatastreams": "",
       "datastreamInfo": {
         "calibration": "",
         "description": "",

package/static/translations/ru-RU.json

@@ -224,6 +224,7 @@
       "create": "",
       "discard": "Отменить изменения",
       "draw": "Нарисовать",
+      "emptyvalue": "",
       "feature": "",
       "geomnonzeroz": "",
       "geomreadonly": "",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "",
+      "addLocation": "",
+      "addLocationAndDatastreams": "",
       "datastreamInfo": {
         "calibration": "",
         "description": "",

package/static/translations/sv-SE.json

@@ -224,6 +224,7 @@
       "create": "",
       "discard": "Förkasta",
       "draw": "Rita",
+      "emptyvalue": "",
       "feature": "Objekt",
       "geomnonzeroz": "",
       "geomreadonly": "",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "",
+      "addLocation": "",
+      "addLocationAndDatastreams": "",
       "datastreamInfo": {
         "calibration": "",
         "description": "",

package/static/translations/tr-TR.json

@@ -224,6 +224,7 @@
       "create": "Yeni oluştur",
       "discard": "İptal",
       "draw": "Çiz",
+      "emptyvalue": "",
       "feature": "Obje",
       "geomnonzeroz": "Geometri, sıfır olmayan yükseklik değeri içerdiğinden salt okunur",
       "geomreadonly": "",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "",
+      "addLocation": "",
+      "addLocationAndDatastreams": "",
       "datastreamInfo": {
         "calibration": "",
         "description": "",

package/static/translations/tsconfig.json

@@ -235,6 +235,7 @@
     "editing.create",
     "editing.discard",
     "editing.draw",
+    "editing.emptyvalue",
     "editing.feature",
     "editing.geomnonzeroz",
     "editing.geomreadonly",
@@ -563,6 +564,8 @@
     "search.themes",
     "search.unknownmore",
     "sensorthingstool.addDatastream",
+    "sensorthingstool.addLocation",
+    "sensorthingstool.addLocationAndDatastreams",
     "sensorthingstool.datastreamInfo.calibration",
     "sensorthingstool.datastreamInfo.description",
     "sensorthingstool.datastreamInfo.location",

package/static/translations/uk-UA.json

@@ -224,6 +224,7 @@
       "create": "",
       "discard": "Скасувати зміни",
       "draw": "Намалювати",
+      "emptyvalue": "",
       "feature": "",
       "geomnonzeroz": "",
       "geomreadonly": "",
@@ -648,6 +649,8 @@
     },
     "sensorthingstool": {
       "addDatastream": "",
+      "addLocation": "",
+      "addLocationAndDatastreams": "",
       "datastreamInfo": {
         "calibration": "",
         "description": "",

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 = {