qwc2 2026.5.28 → 2026.6.4

package/components/AttributeForm.js

@@ -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({
@@ -419,8 +417,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 +439,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,7 +453,7 @@ 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),
@@ -508,23 +474,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"));
       });
@@ -826,8 +796,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 +899,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

@@ -273,7 +273,24 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
       } else {
         elname = nametransform(widget.name);
       }
-      if (widget["class"] === "QLabel") {
+      if (widget.component) {
+        return /*#__PURE__*/React.createElement(widget.component, {
+          addRelationRecord: _this.props.addRelationRecord,
+          editConfigs: _this.props.editConfigs,
+          feature: _this.props.feature,
+          inputConstraints: inputConstraints,
+          mapPrefix: _this.props.mapPrefix,
+          name: elname,
+          onChange: function onChange(val) {
+            return updateField(widget.name, val);
+          },
+          readOnly: _this.props.readOnly,
+          removeRelationRecord: _this.props.removeRelationRecord,
+          reorderRelationRecord: _this.props.reorderRelationRecord,
+          updateRelationField: _this.props.updateRelationField,
+          widget: widget
+        });
+      } else if (widget["class"] === "QLabel") {
         if (widget.name.startsWith("img__")) {
           var _feature$properties$w2, _feature$properties2;
           value = (_feature$properties$w2 = (_feature$properties2 = feature.properties) === null || _feature$properties2 === void 0 ? void 0 : _feature$properties2[widget.name.split("__")[1]]) !== null && _feature$properties$w2 !== void 0 ? _feature$properties$w2 : widget.property.text;

package/components/StandardApp.js

@@ -265,7 +265,7 @@ var StandardApp = /*#__PURE__*/function (_React$Component2) {
         return res;
       }, {});
       ConfigUtils.loadConfiguration(configParams).then(function (config) {
-        var _window$QWC2PluginCon, _window$QWC2PluginCon2, _window$QWC2PluginCon3, _ref5, _this2$props$appConfi, _this2$props$appConfi2, _this2$props$appConfi3;
+        var _window$QWC2PluginCon, _window$QWC2PluginCon2, _window$QWC2PluginCon3, _ref5, _ref6, _this2$props$appConfi, _this2$props$appConfi2, _this2$props$appConfi3;
         // Merge common config into mobile/desktop config, merge config from appConfig
         var renameTaskButtons = function renameTaskButtons(res, entry) {
           var _entry$cfg$task, _entry$cfg;
@@ -318,7 +318,7 @@ var StandardApp = /*#__PURE__*/function (_React$Component2) {
         });
 
         // Load locale
-        var lang = (_ref5 = (_this2$props$appConfi = (_this2$props$appConfi2 = (_this2$props$appConfi3 = _this2.props.appConfig).getDefaultLocale) === null || _this2$props$appConfi2 === void 0 ? void 0 : _this2$props$appConfi2.call(_this2$props$appConfi3)) !== null && _this2$props$appConfi !== void 0 ? _this2$props$appConfi : initialParams.lang) !== null && _ref5 !== void 0 ? _ref5 : navigator.language;
+        var lang = (_ref5 = (_ref6 = (_this2$props$appConfi = (_this2$props$appConfi2 = (_this2$props$appConfi3 = _this2.props.appConfig).getDefaultLocale) === null || _this2$props$appConfi2 === void 0 ? void 0 : _this2$props$appConfi2.call(_this2$props$appConfi3)) !== null && _this2$props$appConfi !== void 0 ? _this2$props$appConfi : initialParams.lang) !== null && _ref6 !== void 0 ? _ref6 : config.defaultLocale) !== null && _ref5 !== void 0 ? _ref5 : navigator.language;
         LocaleUtils.loadLocale(lang, _this2.props.appConfig.defaultLocaleData).then(function (localeData) {
           StandardApp.store.dispatch(changeLocale(localeData, _this2.props.appConfig.defaultLocaleData));
           _this2.setState({

package/components/ThemeList.js

@@ -216,7 +216,12 @@ var ThemeList = /*#__PURE__*/function (_React$Component) {
           className: "theme-item-restricted-overlay"
         }, /*#__PURE__*/React.createElement(Icon, {
           icon: "lock"
-        })), isEmpty(matches) ? null : /*#__PURE__*/React.createElement("div", {
+        })), item.hasRestrictedContent ? /*#__PURE__*/React.createElement("div", {
+          className: "theme-item-restricted-content",
+          title: LocaleUtils.tr("themeswitcher.restrictedcontent")
+        }, /*#__PURE__*/React.createElement(Icon, {
+          icon: "lock"
+        })) : null, isEmpty(matches) ? null : /*#__PURE__*/React.createElement("div", {
           className: "theme-item-filterinfo-overlay"
         }, matches.map(function (match) {
           return /*#__PURE__*/React.createElement("div", {

package/components/map3d/Map3D.js

@@ -586,7 +586,9 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
               objectTree[child] = _objectSpread(_objectSpread({}, objectTree[child]), {}, {
                 visibility: false
               });
-              _this2.objectMap[child].visible = false;
+              if (_this2.objectMap[child]) {
+                _this2.objectMap[child].visible = false;
+              }
             }
           });
         }
@@ -625,10 +627,12 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
           }
           var child = objectTree[nodeId];
           var newVisible = visibility && child.visibility && child.opacity > 0;
-          var changed = newVisible !== _this2.objectMap[child.objectId].visible;
-          _this2.objectMap[child.objectId].visible = newVisible;
-          if (changed) {
-            _this2.instance.notifyChange(_this2.objectMap[child.objectId]);
+          if (_this2.objectMap[child.objectId]) {
+            var changed = newVisible !== _this2.objectMap[child.objectId].visible;
+            _this2.objectMap[child.objectId].visible = newVisible;
+            if (changed) {
+              _this2.instance.notifyChange(_this2.objectMap[child.objectId]);
+            }
           }
         }
       });
@@ -803,7 +807,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       // Collect baselayers
       var externalLayers = {};
       var baseLayers = ThemeUtils.createThemeBackgroundLayers(_this2.props.theme.map3d.basemaps || [], _this2.props.themes, null, externalLayers);
-      baseLayers.push({
+      baseLayers.unshift({
         type: "blank",
         name: "",
         title: LocaleUtils.tr("bgswitcher.nobg")

package/components/map3d/utils/FirstPersonControls3D.js

@@ -347,19 +347,21 @@ var FirstPersonControls3D = /*#__PURE__*/function (_Controls) {
         this.target.y += step * dir.y;
 
         // Project overstep onto wall
-        var tangent = new Vector2(-inter.normal.y, inter.normal.x).normalize();
-        var slidestep = tangent.dot(dir) * overstep;
-        if (slidestep < 0) {
-          tangent.negate();
-          slidestep *= -1;
+        if (inter.normal) {
+          var tangent = new Vector2(-inter.normal.y, inter.normal.x).normalize();
+          var slidestep = tangent.dot(dir) * overstep;
+          if (slidestep < 0) {
+            tangent.negate();
+            slidestep *= -1;
+          }
+          raycaster.set(this.target, new Vector3(tangent.x, tangent.y, 0));
+          var slideInter = raycaster.intersectObjects(this.sceneContext.collisionObjects, true)[0];
+          if (slideInter && slideInter.distance - wallBuffer < slidestep) {
+            slidestep = slideInter.distance - wallBuffer;
+          }
+          this.target.x += slidestep * tangent.x;
+          this.target.y += slidestep * tangent.y;
         }
-        raycaster.set(this.target, new Vector3(tangent.x, tangent.y, 0));
-        var slideInter = raycaster.intersectObjects(this.sceneContext.collisionObjects, true)[0];
-        if (slideInter && slideInter.distance - wallBuffer < slidestep) {
-          slidestep = slideInter.distance - wallBuffer;
-        }
-        this.target.x += slidestep * tangent.x;
-        this.target.y += slidestep * tangent.y;
       } else {
         this.target.x += step * dir.x;
         this.target.y += step * dir.y;

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

@@ -1,10 +1,6 @@
 div.SearchBox {
     position: relative;
     display: flex;
-    height: 2em;
-    background-color: var(--input-bg-color);
-    color: var(--text-color);
-    border-radius: var(--border-radius);
 }
 
 div.searchbox-field {

package/components/style/ThemeList.css

@@ -200,3 +200,11 @@ div.ThemeList div.theme-item-restricted-overlay {
     justify-content: center;
     font-size: 400%;
 }
+
+div.ThemeList div.theme-item-restricted-content {
+    position: absolute;
+    right: 0;
+    top: 0;
+    opacity: .5;
+    padding: 0.25em;
+}

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.05.28",
+    "version": "2026.06.04",
     "description": "QGIS Web Client",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",

package/plugins/BackgroundSwitcher.js

@@ -395,7 +395,7 @@ var selector = function selector(state) {
   var backgroundLayers = Object.values(state.layers.flat.filter(function (layer) {
     return layer.role === LayerRole.BACKGROUND;
   }).reduce(function (res, l) {
-    return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, l.group || l.name, l.group ? [].concat(_toConsumableArray(res[l.group] || []), [l]) : l));
+    return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, "_" + (l.group || l.name), l.group ? [].concat(_toConsumableArray(res["_" + l.group] || []), [l]) : l));
   }, {}));
   return {
     backgroundLayers: backgroundLayers

package/plugins/Bookmark.js

@@ -76,6 +76,11 @@ var Bookmark = /*#__PURE__*/function (_React$Component) {
         });
       }
     });
+    _defineProperty(_this, "bookmarkDoubleClicked", function (ev, bookmark) {
+      if (!_this.state.renameBookmark) {
+        _this.open(bookmark.key, false);
+      }
+    });
     _defineProperty(_this, "updateBookmarkName", function (text) {
       _this.setState({
         busy: true
@@ -284,8 +289,8 @@ var Bookmark = /*#__PURE__*/function (_React$Component) {
           onClick: function onClick(ev) {
             return _this2.bookmarkClicked(ev, bookmark);
           },
-          onDoubleClick: function onDoubleClick() {
-            return _this2.open(bookmark.key, false);
+          onDoubleClick: function onDoubleClick(ev) {
+            return _this2.bookmarkDoubleClicked(ev, bookmark);
           },
           title: lastUpdateTitle + ": " + bookmark.date
         }, _this2.state.renameBookmark === bookmark.key ? /*#__PURE__*/React.createElement(InputContainer, null, /*#__PURE__*/React.createElement(TextInput, {

package/plugins/Editing.js

@@ -392,7 +392,8 @@ var Editing = /*#__PURE__*/function (_React$Component) {
                 value = !['0', 'false'].includes(String(value).toLowerCase());
               } else if (field.type === 'date') {
                 if (typeof value === 'string') {
-                  value = dateParser.fromString(value).toISOString();
+                  var _dateParser$fromStrin, _dateParser$fromStrin2, _dateParser$fromStrin3;
+                  value = (_dateParser$fromStrin = (_dateParser$fromStrin2 = dateParser.fromString(value)) === null || _dateParser$fromStrin2 === void 0 || (_dateParser$fromStrin3 = _dateParser$fromStrin2.toISOString) === null || _dateParser$fromStrin3 === void 0 ? void 0 : _dateParser$fromStrin3.call(_dateParser$fromStrin2)) !== null && _dateParser$fromStrin !== void 0 ? _dateParser$fromStrin : null;
                 }
               } else if (field.type === 'list') {
                 // Not supported

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 = {
@@ -2963,6 +3015,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();
       }