qwc2 2025.10.30 → 2025.11.12

package/components/PickFeature.js

@@ -1,6 +1,10 @@
 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 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 _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 _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; } }
@@ -74,18 +78,26 @@ var PickFeature = /*#__PURE__*/function (_React$Component) {
       }
       _this.setState(function (state) {
         var newState = {
-          pickResults: _objectSpread(_objectSpread({}, state.pickResults), result),
+          pickResults: [].concat(_toConsumableArray(state.pickResults), _toConsumableArray(Object.entries(result).map(function (_ref5) {
+            var _ref6 = _slicedToArray(_ref5, 2),
+              layername = _ref6[0],
+              features = _ref6[1];
+            return features.map(function (feature) {
+              return {
+                layer: layername,
+                feature: feature,
+                mapName: layer.wms_name
+              };
+            });
+          }).flat())),
           pendingQueries: state.pendingQueries - 1
         };
         if (newState.pendingQueries === 0) {
-          var entries = Object.entries(newState.pickResults);
-          if (entries.length === 1 && entries[0][1].length === 1) {
-            _this.props.featurePicked(entries[0][0], entries[0][1][0]);
+          if (newState.pickResults.length === 1) {
+            _this.props.featurePicked(newState.pickResults[0].layer, newState.pickResults[0].feature, newState.pickResults[0].mapName);
             newState.pickResults = null;
             newState.pickGeom = null;
-          } else if (entries.reduce(function (sum, entry) {
-            return sum + entry[1].length;
-          }, 0) === 0) {
+          } else if (newState.pickResults.length === 0) {
             newState.pickResults = null;
             newState.pickGeom = null;
           }
@@ -100,11 +112,11 @@ var PickFeature = /*#__PURE__*/function (_React$Component) {
       };
       _this.props.addLayerFeatures(layer, [feature], true);
       _this.setState({
-        highlightedFeature: key + ":" + feature.id
+        highlightedFeature: key
       });
     });
     _defineProperty(_this, "clearHighlight", function (key, feature) {
-      if (_this.state.highlightedFeature === key + ":" + feature.id) {
+      if (_this.state.highlightedFeature === key) {
         _this.setState({
           highlightFeature: null
         });
@@ -174,7 +186,7 @@ var PickFeature = /*#__PURE__*/function (_React$Component) {
               });
             });
           }
-          var pickResults = {};
+          var pickResults = [];
           if (!isEmpty(queryVectorLayers)) {
             var olMap = MapUtils.getHook(MapUtils.GET_MAP);
             var layerMap = queryVectorLayers.reduce(function (res, layer) {
@@ -188,8 +200,10 @@ var PickFeature = /*#__PURE__*/function (_React$Component) {
                 if (layerid in layerMap) {
                   var featureObj = format.writeFeatureObject(feature);
                   var layername = layerMap[layerid].name;
-                  pickResults[layername] = pickResults[layername] || [];
-                  pickResults[layername].push(featureObj);
+                  pickResults.push({
+                    layer: layername,
+                    feature: featureObj
+                  });
                 }
               });
             } else if (_this2.props.pickGeomType === 'Polygon') {
@@ -212,8 +226,10 @@ var PickFeature = /*#__PURE__*/function (_React$Component) {
                   }
                   var featureObj = format.writeFeatureObject(feature);
                   var layername = layerMap[layer.get('id')].name;
-                  pickResults[layername] = pickResults[layername] || [];
-                  pickResults[layername].push(featureObj);
+                  pickResults.push({
+                    layer: layername,
+                    feature: featureObj
+                  });
                 });
               });
             }
@@ -239,25 +255,21 @@ var PickFeature = /*#__PURE__*/function (_React$Component) {
           onClose: this.onClose,
           x: this.state.clickPos[0],
           y: this.state.clickPos[1]
-        }, this.state.pendingQueries === 0 ? Object.entries(this.state.pickResults).map(function (_ref5) {
-          var _ref6 = _slicedToArray(_ref5, 2),
-            layername = _ref6[0],
-            features = _ref6[1];
-          return features.map(function (feature) {
-            var _feature$displayname;
-            return /*#__PURE__*/React.createElement("div", {
-              key: layername + ":" + feature.id,
-              onClickCapture: function onClickCapture() {
-                return _this3.props.featurePicked(layername, feature);
-              },
-              onMouseOut: function onMouseOut() {
-                return _this3.clearHighlight(layername, feature);
-              },
-              onMouseOver: function onMouseOver() {
-                return _this3.highlightFeature(layername, feature);
-              }
-            }, layername + ": " + ((_feature$displayname = feature.displayname) !== null && _feature$displayname !== void 0 ? _feature$displayname : feature.id));
-          });
+        }, this.state.pendingQueries === 0 ? this.state.pickResults.map(function (entry) {
+          var _entry$feature$displa;
+          var key = (entry.mapName || "") + "." + entry.layer + ":" + entry.feature.id;
+          return /*#__PURE__*/React.createElement("div", {
+            key: key,
+            onClickCapture: function onClickCapture() {
+              return _this3.props.featurePicked(entry.layer, entry.feature, entry.mapName);
+            },
+            onMouseOut: function onMouseOut() {
+              return _this3.clearHighlight(key, entry.feature);
+            },
+            onMouseOver: function onMouseOver() {
+              return _this3.highlightFeature(key, entry.feature);
+            }
+          }, entry.layer + ": " + ((_entry$feature$displa = entry.feature.displayname) !== null && _entry$feature$displa !== void 0 ? _entry$feature$displa : entry.feature.id));
         }) : /*#__PURE__*/React.createElement("div", {
           className: "pick-feature-menu-querying"
         }, /*#__PURE__*/React.createElement(Spinner, null), LocaleUtils.tr("pickfeature.querying")));

package/components/QtDesignerForm.js

@@ -226,13 +226,13 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
       return rows;
     });
     _defineProperty(_this, "renderWidget", function (widget, feature, editConfig, fields, updateField) {
-      var _widget$name;
+      var _feature$properties$w, _feature$properties;
       var nametransform = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : function (name) {
         return name;
       };
       var isRelWidget = arguments.length > 6 ? arguments[6] : undefined;
       var disabled = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
-      var value = (_widget$name = (feature.properties || {})[widget.name]) !== null && _widget$name !== void 0 ? _widget$name : "";
+      var value = (_feature$properties$w = (_feature$properties = feature.properties) === null || _feature$properties === void 0 ? void 0 : _feature$properties[widget.name]) !== null && _feature$properties$w !== void 0 ? _feature$properties$w : "";
       var prop = widget.property || {};
       if (String(prop.visible) === "false") {
         return null;
@@ -270,8 +270,8 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
       }
       if (widget["class"] === "QLabel") {
         if (widget.name.startsWith("img__")) {
-          var _widget$name$split$;
-          value = (_widget$name$split$ = (feature.properties || [])[widget.name.split("__")[1]]) !== null && _widget$name$split$ !== void 0 ? _widget$name$split$ : widget.property.text;
+          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;
           return /*#__PURE__*/React.createElement("div", {
             className: "qt-designer-form-image"
           }, /*#__PURE__*/React.createElement("a", {
@@ -372,8 +372,8 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
           return _this.renderLayout(child.layout, feature, editConfig, updateField, nametransform, child.name === activetab);
         })));
       } else if (widget["class"] === "QTextEdit" || widget["class"] === "QTextBrowser" || widget["class"] === "QPlainTextEdit") {
-        var _feature$properties$w, _feature$properties;
-        if (((_feature$properties$w = (_feature$properties = feature.properties) === null || _feature$properties === void 0 ? void 0 : _feature$properties[widget.name]) !== null && _feature$properties$w !== void 0 ? _feature$properties$w : null) === null) {
+        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) {
           var _ConfigUtils$getConfi;
           value = (_ConfigUtils$getConfi = ConfigUtils.getConfigProp("editTextNullValue")) !== null && _ConfigUtils$getConfi !== void 0 ? _ConfigUtils$getConfi : "";
         }
@@ -397,9 +397,9 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
         }
       } else if (widget["class"] === "QLineEdit") {
         if (widget.name.endsWith("__upload")) {
-          var _feature$properties2;
+          var _feature$properties4;
           var fieldId = widget.name.replace(/__upload/, '');
-          var uploadValue = ((_feature$properties2 = feature.properties) === null || _feature$properties2 === void 0 ? void 0 : _feature$properties2[fieldId]) || "";
+          var uploadValue = ((_feature$properties4 = feature.properties) === null || _feature$properties4 === void 0 ? void 0 : _feature$properties4[fieldId]) || "";
           var uploadElName = elname.replace(/__upload/, '');
           var constraints = {
             accept: prop.text || "",
@@ -417,10 +417,10 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
             value: uploadValue
           });
         } else {
-          var _feature$properties$w2, _feature$properties3;
+          var _feature$properties$w4, _feature$properties5;
           if (fieldConstraints.prec !== undefined && typeof value === 'number') {
             value = value.toFixed(fieldConstraints.prec);
-          } else if (((_feature$properties$w2 = (_feature$properties3 = feature.properties) === null || _feature$properties3 === void 0 ? void 0 : _feature$properties3[widget.name]) !== null && _feature$properties$w2 !== void 0 ? _feature$properties$w2 : null) === null) {
+          } 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) {
             var _ConfigUtils$getConfi2;
             value = (_ConfigUtils$getConfi2 = ConfigUtils.getConfigProp("editTextNullValue")) !== null && _ConfigUtils$getConfi2 !== void 0 ? _ConfigUtils$getConfi2 : "";
           }
@@ -471,7 +471,7 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
           var count = parts.length;
           var _fieldId = parts.slice(1, count - 3).join("__");
           value = (_fieldId2 = (feature.properties || [])[_fieldId]) !== null && _fieldId2 !== void 0 ? _fieldId2 : "";
-          var keyvalrel = _this.props.mapPrefix + parts[count - 3] + ":" + parts[count - 2] + ":" + parts[count - 1];
+          var keyvalrel = _this.props.mapPrefix + "." + parts[count - 3] + ":" + parts[count - 2] + ":" + parts[count - 1];
           var filterExpr = null;
           if (field !== null && field !== void 0 && field.filterExpression) {
             filterExpr = parseExpression(field.filterExpression, feature, editConfig, _this.props.iface, _this.props.mapPrefix, _this.props.mapCrs, function () {
@@ -543,6 +543,7 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
             value: value
           }));
         } else {
+          var _feature$properties6;
           return /*#__PURE__*/React.createElement(NumberInput, _extends({
             decimals: precision,
             max: max,
@@ -554,7 +555,7 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
           }, inputConstraints, {
             step: step,
             style: fontStyle,
-            value: value
+            value: (_feature$properties6 = feature.properties) === null || _feature$properties6 === void 0 ? void 0 : _feature$properties6[widget.name]
           }));
         }
       } else if (widget["class"] === "QDateEdit") {
@@ -621,14 +622,14 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
           // featurelink__layer__attrname
           // featurelink__layer__reltable__attrname
           if (_parts.length === 3 || _parts.length === 4) {
-            var _feature$properties4;
+            var _feature$properties7;
             var layer = _parts[1];
             var reltable = _parts.length === 4 ? _parts[2] : "";
             var attrname = _parts.slice(2).join("__");
-            value = (_feature$properties4 = feature.properties) === null || _feature$properties4 === void 0 ? void 0 : _feature$properties4[attrname];
+            value = (_feature$properties7 = feature.properties) === null || _feature$properties7 === void 0 ? void 0 : _feature$properties7[attrname];
             if (layer === reltable) {
               var index = parseInt(nametransform("").split("__")[1], 10); // Ugh..
-              var reldataset = _this.props.mapPrefix + reltable;
+              var reldataset = _this.props.mapPrefix + "." + reltable;
               var displayField = attrname.split("__")[1];
               if (feature.__status__ !== "empty") {
                 var featurebuttons = [{
@@ -745,7 +746,7 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
           width: '1px'
         } : {};
       });
-      var editConfig = _this.props.editConfigs[tablename];
+      var editConfig = _this.props.editConfigs[_this.props.mapPrefix][tablename];
       if (!editConfig) {
         // Relation dataset not permitted / no edit config available
         return null;
@@ -991,7 +992,7 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
       }
       var parts = widget.name.split("__");
       if (parts.length >= 3 && parts[0] === "nrel") {
-        relationTables[_this.props.mapPrefix + parts[1]] = {
+        relationTables[_this.props.mapPrefix + "." + parts[1]] = {
           fk: parts[2],
           sortcol: parts[3] || null,
           noreorder: parts[4] || false
@@ -1145,6 +1146,7 @@ _defineProperty(QtDesignerForm, "defaultState", {
 });
 export default connect(function (state) {
   return {
-    locale: state.locale.current
+    locale: state.locale.current,
+    editConfigs: state.layers.editConfigs
   };
 }, {})(QtDesignerForm);

package/components/StandardApp.js

@@ -101,6 +101,10 @@ var AppContainerComponent = /*#__PURE__*/function (_React$Component) {
           if (params.t) {
             _this.props.showNotification("missingtheme", LocaleUtils.tr("app.missingtheme", params.t), NotificationType.WARN, true);
             params.l = undefined;
+            params.bl = undefined;
+            params.c = undefined;
+            params.e = undefined;
+            params.s = undefined;
           }
           var userDefaultTheme = Object.fromEntries(_this.props.defaultUrlParams.split("&").map(function (x) {
             return x.split("=");

package/components/ThemeList.js

@@ -1,11 +1,9 @@
 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 _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n2 = 0, F = function F() {}; return { s: F, n: function n() { return _n2 >= r.length ? { done: !0 } : { done: !1, value: r[_n2++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-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 _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 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 _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
 function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
@@ -53,7 +51,7 @@ var ThemeList = /*#__PURE__*/function (_React$Component) {
     }
     _this = _callSuper(this, ThemeList, [].concat(args));
     _defineProperty(_this, "state", {
-      expandedGroups: [],
+      expandedGroups: {},
       visibleThemeInfoMenu: null
     });
     _defineProperty(_this, "groupMatchesFilter", function (group, filter) {
@@ -74,6 +72,7 @@ var ThemeList = /*#__PURE__*/function (_React$Component) {
       return false;
     });
     _defineProperty(_this, "renderThemeGroup", function (group, filter) {
+      var defaultExpanded = _this.props.expandGroups;
       var assetsPath = ConfigUtils.getAssetsPath();
       var subdirs = group && group.subdirs ? group.subdirs : [];
       if (filter) {
@@ -82,7 +81,8 @@ var ThemeList = /*#__PURE__*/function (_React$Component) {
         });
       }
       var subtree = subdirs.map(function (subdir) {
-        var expanded = !_this.props.collapsibleGroups || filter || _this.state.expandedGroups.includes(subdir.id) || _this.props.activeTheme && _this.groupContainsActiveTheme(subdir);
+        var _this$state$expandedG;
+        var expanded = !_this.props.collapsibleGroups || filter || ((_this$state$expandedG = _this.state.expandedGroups[subdir.id]) !== null && _this$state$expandedG !== void 0 ? _this$state$expandedG : defaultExpanded) || _this.props.activeTheme && _this.groupContainsActiveTheme(subdir);
         if (isEmpty(subdir.items) && isEmpty(subdir.subdirs)) {
           return null;
         }
@@ -93,15 +93,13 @@ var ThemeList = /*#__PURE__*/function (_React$Component) {
           onClick: function onClick() {
             return _this.setState(function (state) {
               return {
-                expandedGroups: expanded ? state.expandedGroups.filter(function (id) {
-                  return id !== subdir.id;
-                }) : [].concat(_toConsumableArray(state.expandedGroups), [subdir.id])
+                expandedGroups: _objectSpread(_objectSpread({}, state.expandedGroups), {}, _defineProperty({}, subdir.id, !expanded))
               };
             });
           }
         }, _this.props.collapsibleGroups ? /*#__PURE__*/React.createElement(Icon, {
           icon: expanded ? "collapse" : "expand"
-        }) : null, " ", subdir.title), expanded ? _this.renderThemeGroup(subdir, filter) : null);
+        }) : null, " ", subdir.titleMsgId ? LocaleUtils.tr(subdir.titleMsgId) : subdir.title), expanded ? _this.renderThemeGroup(subdir, filter) : null);
       });
       var activeThemeId = _this.props.activeTheme ? _this.props.activeTheme.id : null;
       var addLayersTitle = LocaleUtils.tr("themeswitcher.addlayerstotheme");
@@ -358,6 +356,7 @@ _defineProperty(ThemeList, "propTypes", {
   collapsibleGroups: PropTypes.bool,
   defaultUrlParams: PropTypes.string,
   dontPreserveSettingsOnSwitch: PropTypes.bool,
+  expandGroups: PropTypes.bool,
   filter: PropTypes.string,
   layers: PropTypes.array,
   setActiveLayerInfo: PropTypes.func,

package/components/map3d/Map3D.js

@@ -687,7 +687,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       _this2.objectMap = {};
       // Add 3d tiles
       (((_this2$props$theme$ma9 = _this2.props.theme.map3d) === null || _this2$props$theme$ma9 === void 0 ? void 0 : _this2$props$theme$ma9.tiles3d) || []).forEach(function (entry) {
-        var _entry$title;
+        var _entry$visibility, _entry$title;
         var tiles = new Tiles3D({
           url: MiscUtils.resolveAssetsPath(entry.url),
           errorTarget: 32
@@ -723,7 +723,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         _this2.instance.add(tiles);
         _this2.objectMap[entry.name] = tiles;
         sceneObjects[entry.name] = {
-          visibility: true,
+          visibility: (_entry$visibility = entry.visibility) !== null && _entry$visibility !== void 0 ? _entry$visibility : true,
           opacity: 255,
           layertree: true,
           title: (_entry$title = entry.title) !== null && _entry$title !== void 0 ? _entry$title : entry.name,
@@ -740,7 +740,10 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
 
       // Add other objects
       (((_this2$props$theme$ma10 = _this2.props.theme.map3d) === null || _this2$props$theme$ma10 === void 0 ? void 0 : _this2$props$theme$ma10.objects3d) || []).forEach(function (entry) {
-        importGltf(MiscUtils.resolveAssetsPath(entry.url), entry.name, _this2.state.sceneContext);
+        var _entry$visibility2;
+        importGltf(MiscUtils.resolveAssetsPath(entry.url), entry.name, _this2.state.sceneContext, {
+          visibility: (_entry$visibility2 = entry.visibility) !== null && _entry$visibility2 !== void 0 ? _entry$visibility2 : true
+        });
       });
       _this2.setState(function (state) {
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2025.10.30",
+    "version": "2025.11.12",
     "description": "QGIS Web Client",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",
@@ -23,6 +23,7 @@
         "@loaders.gl/shapefile": "^4.3.3",
         "@loaders.gl/zip": "^4.3.3",
         "@mapbox/shp-write": "^0.4.3",
+        "@norbulcz/num-parse": "^0.1.0",
         "@panoramax/web-viewer": "^4.0.1",
         "@reduxjs/toolkit": "^2.4.0",
         "@turf/buffer": "^6.5.0",

package/plugins/Cyclomedia.js

@@ -142,7 +142,8 @@ var Cyclomedia = /*#__PURE__*/function (_React$Component) {
         styleOptions: {
           img: "cyclomedia-cone",
           rotation: posData.yaw,
-          size: dimensions
+          size: dimensions,
+          anchor: [0.5, 1]
         }
       };
       var layer = {
@@ -181,7 +182,7 @@ var Cyclomedia = /*#__PURE__*/function (_React$Component) {
         }
       }
       var loginOauth = !!_this.props.clientId && !_this.state.loginFailed;
-      return "\n            <!DOCTYPE html>\n            <html>\n            <head>\n            <script type=\"text/javascript\" src=\"https://unpkg.com/react@16.12.0/umd/react.production.min.js\"></script>\n            <script type=\"text/javascript\" src=\"https://unpkg.com/react-dom@16.12.0/umd/react-dom.production.min.js\"></script>\n            <script type=\"text/javascript\" src=\"https://streetsmart.cyclomedia.com/api/v".concat(_this.props.cyclomediaVersion, "/StreetSmartApi.js\"></script>\n            <script type=\"text/javascript\">\n            let apiInitialized = false;\n            let initCallback = null;\n            let posCallback = null;\n            let measureCallback = null;\n\n            function initApi() {\n                StreetSmartApi.init({\n                    targetElement: document.getElementById(\"streetsmartApi\"),\n                    username: \"").concat(_this.state.username || undefined, "\",\n                    password: \"").concat(_this.state.password || undefined, "\",\n                    apiKey: \"").concat(_this.props.apikey, "\",\n                    clientId: \"").concat(_this.props.clientId, "\",\n                    loginOauth: ").concat(loginOauth, ",\n                    loginRedirectUri: \"").concat(_this.props.loginRedirectUri, "\",\n                    logoutRedirectUri: \"").concat(_this.props.logoutRedirectUri, "\",\n                    srs: \"").concat(_this.props.projection, "\",\n                    locale: \"").concat(lang, "\",\n                    configurationUrl: 'https://atlas.cyclomedia.com/configuration',\n                    addressSettings: {\n                        locale: \"us\",\n                        database: \"Nokia\"\n                    }\n                }).then(() => {\n                    apiInitialized = true;\n                    if (initCallback) {\n                        initCallback(true);\n                    }\n                }, (e) => {\n                    apiInitialized = false;\n                    if (initCallback) {\n                        initCallback(false, e.message);\n                    }\n                });\n            }\n            function openImage(posStr, crs) {\n                if (!apiInitialized) {\n                    return;\n                }\n                StreetSmartApi.open(posStr, {\n                    viewerType: StreetSmartApi.ViewerType.PANORAMA,\n                    srs: crs,\n                    panoramaViewer: {\n                         closable: false,\n                         maximizable: true,\n                         replace: true,\n                         recordingsVisible: true,\n                         navbarVisible: true,\n                         timeTravelVisible: true,\n                         measureTypeButtonVisible: true,\n                         measureTypeButtonStart: true,\n                         measureTypeButtonToggle: true,\n                     },\n                }).then((result) => {\n                    if (result && result[0]){\n                        window.panoramaViewer = result[0];\n                        window.panoramaViewer.on(StreetSmartApi.Events.panoramaViewer.IMAGE_CHANGE, changeView);\n                        window.panoramaViewer.on(StreetSmartApi.Events.panoramaViewer.VIEW_CHANGE, changeView);\n                        StreetSmartApi.on(StreetSmartApi.Events.measurement.MEASUREMENT_CHANGED, changeMeasurement);\n                        StreetSmartApi.on(StreetSmartApi.Events.measurement.MEASUREMENT_STOPPED, stopMeasurement);\n                    }\n                }).catch((reason) => {\n                    console.log('Failed to create component(s) through API: ' + reason);\n                });\n            }\n            function changeView() {\n                if (posCallback) {\n                    const recording = window.panoramaViewer.getRecording();\n                    const orientation = window.panoramaViewer.getOrientation();\n                    const pos = recording.xyz;\n                    const posData = {\n                        pos: [pos[0], pos[1]],\n                        crs: recording.srs,\n                        yaw: orientation.yaw * Math.PI / 180,\n                        hFov: orientation.hFov * Math.PI / 180.0\n                    }\n                    posCallback(posData);\n                }\n            }\n            function changeMeasurement(e) {\n                measureCallback(e.detail.activeMeasurement);\n            }\n            function stopMeasurement() {\n                measureCallback(null);\n            }\n            function registerCallbacks(_initCallback, _posCallback, _measureCallback) {\n                initCallback = _initCallback;\n                posCallback = _posCallback;\n                measureCallback = _measureCallback;\n            }\n            </script>\n            <style>\n              html, body, #streetsmartApi {height: 100%;}\n            </style>\n            </head>\n            <body style=\"margin: 0\">\n            <div id=\"streetsmartApi\">\n            </div>\n            </body>\n            </html>\n        ");
+      return "\n            <!DOCTYPE html>\n            <html>\n            <head>\n            <script type=\"text/javascript\" src=\"https://unpkg.com/react@18.3.1/umd/react.production.min.js\"></script>\n            <script type=\"text/javascript\" src=\"https://unpkg.com/react-dom@18.3.1/umd/react-dom.production.min.js\"></script>\n            <script type=\"text/javascript\" src=\"https://streetsmart.cyclomedia.com/api/v".concat(_this.props.cyclomediaVersion, "/StreetSmartApi.js\"></script>\n            <script type=\"text/javascript\">\n            let apiInitialized = false;\n            let initCallback = null;\n            let posCallback = null;\n            let measureCallback = null;\n\n            function initApi() {\n                StreetSmartApi.init({\n                    targetElement: document.getElementById(\"streetsmartApi\"),\n                    username: \"").concat(_this.state.username || undefined, "\",\n                    password: \"").concat(_this.state.password || undefined, "\",\n                    apiKey: \"").concat(_this.props.apikey, "\",\n                    clientId: \"").concat(_this.props.clientId, "\",\n                    loginOauth: ").concat(loginOauth, ",\n                    loginRedirectUri: \"").concat(_this.props.loginRedirectUri, "\",\n                    logoutRedirectUri: \"").concat(_this.props.logoutRedirectUri, "\",\n                    srs: \"").concat(_this.props.projection, "\",\n                    locale: \"").concat(lang, "\",\n                    configurationUrl: 'https://atlas.cyclomedia.com/configuration',\n                    addressSettings: {\n                        locale: \"us\",\n                        database: \"Nokia\"\n                    }\n                }).then(() => {\n                    apiInitialized = true;\n                    if (initCallback) {\n                        initCallback(true);\n                    }\n                }, (e) => {\n                    apiInitialized = false;\n                    if (initCallback) {\n                        initCallback(false, e.message);\n                    }\n                });\n            }\n            function openImage(posStr, crs) {\n                if (!apiInitialized) {\n                    return;\n                }\n                StreetSmartApi.open(posStr, {\n                    viewerType: StreetSmartApi.ViewerType.PANORAMA,\n                    srs: crs,\n                    panoramaViewer: {\n                         closable: false,\n                         maximizable: true,\n                         replace: true,\n                         recordingsVisible: true,\n                         navbarVisible: true,\n                         timeTravelVisible: true,\n                         measureTypeButtonVisible: true,\n                         measureTypeButtonStart: true,\n                         measureTypeButtonToggle: true,\n                     },\n                }).then((result) => {\n                    if (result && result[0]){\n                        window.panoramaViewer = result[0];\n                        window.panoramaViewer.on(StreetSmartApi.Events.panoramaViewer.IMAGE_CHANGE, changeView);\n                        window.panoramaViewer.on(StreetSmartApi.Events.panoramaViewer.VIEW_CHANGE, changeView);\n                        StreetSmartApi.on(StreetSmartApi.Events.measurement.MEASUREMENT_CHANGED, changeMeasurement);\n                        StreetSmartApi.on(StreetSmartApi.Events.measurement.MEASUREMENT_STOPPED, stopMeasurement);\n                    }\n                }).catch((reason) => {\n                    console.log('Failed to create component(s) through API: ' + reason);\n                });\n            }\n            function changeView() {\n                if (posCallback) {\n                    const recording = window.panoramaViewer.getRecording();\n                    const orientation = window.panoramaViewer.getOrientation();\n                    const pos = recording.xyz;\n                    const posData = {\n                        pos: [pos[0], pos[1]],\n                        crs: recording.srs,\n                        yaw: orientation.yaw * Math.PI / 180,\n                        hFov: orientation.hFov * Math.PI / 180.0\n                    }\n                    posCallback(posData);\n                }\n            }\n            function changeMeasurement(e) {\n                measureCallback(e.detail.activeMeasurement);\n            }\n            function stopMeasurement() {\n                measureCallback(null);\n            }\n            function registerCallbacks(_initCallback, _posCallback, _measureCallback) {\n                initCallback = _initCallback;\n                posCallback = _posCallback;\n                measureCallback = _measureCallback;\n            }\n            </script>\n            <style>\n              html, body, #streetsmartApi {height: 100%;}\n            </style>\n            </head>\n            <body style=\"margin: 0\">\n            <div id=\"streetsmartApi\">\n            </div>\n            </body>\n            </html>\n        ");
     });
     _defineProperty(_this, "addRecordingsWFS", function () {
       var layer = {
@@ -235,7 +236,7 @@ var Cyclomedia = /*#__PURE__*/function (_React$Component) {
     });
     _this.iframe = null;
     _this.iframePollIntervall = null;
-    if (props.credentialUserInfoFields) {
+    if (props.credentialUserInfoFields && props.userInfos) {
       _this.state.username = props.userInfos[props.credentialUserInfoFields.username];
       _this.state.password = props.userInfos[props.credentialUserInfoFields.password];
     }
@@ -417,7 +418,7 @@ _defineProperty(Cyclomedia, "propTypes", {
   userInfos: PropTypes.object
 });
 _defineProperty(Cyclomedia, "defaultProps", {
-  cyclomediaVersion: '24.1',
+  cyclomediaVersion: '25.7',
   displayMeasurements: true,
   geometry: {
     initialWidth: 480,