qwc2 2026.2.25 → 2026.2.27

package/components/map3d/Map3D.js

@@ -170,7 +170,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       var _this2$state$sceneCon;
       var currentBaseLayer = ((_this2$state$sceneCon = _this2.state.sceneContext.baseLayers.find(function (l) {
         return l.visibility === true;
-      })) === null || _this2$state$sceneCon === void 0 ? void 0 : _this2$state$sceneCon.name) || "";
+      })) === null || _this2$state$sceneCon === void 0 ? void 0 : _this2$state$sceneCon.name) || null;
       if (visibility && layer.name === currentBaseLayer) {
         // Nothing changed
         return;
@@ -594,7 +594,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       }
       // Ensure labels are removed
       object.traverse(function (c) {
-        if (c.isCSS2DObject) {
+        if (c.isCSS2DObject && c.element.parentNode) {
           c.element.parentNode.removeChild(c.element);
         }
       });
@@ -645,6 +645,9 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
     });
     _defineProperty(_this2, "applySceneObjectState", function (objectId, options, prevOptions, objectTree) {
       var object = _this2.objectMap[objectId];
+      if (!object) {
+        return;
+      }
       var changed = false;
       if (options.visibility !== prevOptions.visibility || options.opacity !== (prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.opacity)) {
         var _objectTree$options$p;
@@ -935,7 +938,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
               visibility: (_entry$visibility3 = entry.visibility) !== null && _entry$visibility3 !== void 0 ? _entry$visibility3 : true,
               opacity: 255
             };
-            _this2.importObject3D(entry, entry.name, false, {}, false, function () {
+            _this2.importObject3D(MiscUtils.resolveAssetsPath(entry.url), entry.name, false, {}, false, function () {
               _this2.applySceneObjectState(entry.name, objectTree[entry.name], {}, objectTree);
             });
             nodeIds.push(entry.name);
@@ -1300,10 +1303,13 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         }
       });
       _this2.state.sceneContext.restoreView(data);
-      var bl3d = (_data$baseLayer = data.baseLayer) !== null && _data$baseLayer !== void 0 ? _data$baseLayer : "";
-      _this2.setBaseLayer({
-        name: bl3d
-      }, bl3d !== "null");
+      if (((_data$baseLayer = data.baseLayer) !== null && _data$baseLayer !== void 0 ? _data$baseLayer : null) !== null) {
+        var _data$baseLayer2;
+        var bl3d = (_data$baseLayer2 = data.baseLayer) !== null && _data$baseLayer2 !== void 0 ? _data$baseLayer2 : "";
+        _this2.setBaseLayer({
+          name: bl3d
+        }, bl3d !== "null");
+      }
       _this2.state.sceneContext.scene.notifyChange();
     });
     _this2.container = null;
@@ -1383,11 +1389,16 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         this.setState(function (state) {
           return {
             sceneContext: _objectSpread(_objectSpread({}, state.sceneContext), {}, {
-              collisionObjects: Object.entries(state.sceneContext.objectTree).reduce(function (res, entry) {
+              collisionObjects: Object.entries(state.sceneContext.objectTree).reduce(function (res, _ref12) {
+                var _ref13 = _slicedToArray(_ref12, 2),
+                  objectid = _ref13[0],
+                  entry = _ref13[1];
                 if (entry.visibility && entry.opacity > 0) {
-                  var _obj$tiles$group, _obj$tiles;
                   var obj = _this3.objectMap[entry.objectId];
-                  res.push((_obj$tiles$group = (_obj$tiles = obj.tiles) === null || _obj$tiles === void 0 ? void 0 : _obj$tiles.group) !== null && _obj$tiles$group !== void 0 ? _obj$tiles$group : obj);
+                  if (obj) {
+                    var _obj$tiles$group, _obj$tiles;
+                    res.push((_obj$tiles$group = (_obj$tiles = obj.tiles) === null || _obj$tiles === void 0 ? void 0 : _obj$tiles.group) !== null && _obj$tiles$group !== void 0 ? _obj$tiles$group : obj);
+                  }
                 }
                 return res;
               }, [])
@@ -1428,10 +1439,10 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         sceneContext: this.state.sceneContext
       }), /*#__PURE__*/React.createElement(ViewSwitcher, {
         position: 1
-      }), Object.entries(this.props.plugins3d).map(function (_ref12) {
-        var _ref13 = _slicedToArray(_ref12, 2),
-          name = _ref13[0],
-          Component = _ref13[1];
+      }), Object.entries(this.props.plugins3d).map(function (_ref14) {
+        var _ref15 = _slicedToArray(_ref14, 2),
+          name = _ref15[0],
+          Component = _ref15[1];
         return /*#__PURE__*/React.createElement(Suspense, {
           key: name
         }, /*#__PURE__*/React.createElement(Component, _extends({

package/package.json

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

package/plugins/API.js

@@ -156,7 +156,7 @@ var actionFunctions = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_o
  * ```
  * You can also post multiple calls at once as follows:
  * ```
- * * qwcframe.contentWindow.postMessage([{
+ * qwcframe.contentWindow.postMessage([{
  *   "method": "zoomToPoint",
  *   "params": [[2684764, 1247841], 18, "EPSG:2056"]
  * }, {
@@ -269,20 +269,17 @@ var actionFunctions = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_o
  * In addition, the following methods are available on `window.qwc2`:
  */
 var API = /*#__PURE__*/function (_React$Component) {
-  function API() {
+  function API(props) {
     var _this;
     _classCallCheck(this, API);
-    for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
-      _args[_key] = arguments[_key];
-    }
-    _this = _callSuper(this, API, [].concat(_args));
+    _this = _callSuper(this, API, [props]);
     _defineProperty(_this, "handleMessage", function (ev) {
       if (!_this.props.allowedMessageOrigins.includes(ev.origin)) {
         /* eslint-disable-next-line */
         console.warn("Discarding message from not-allowed origin " + ev.origin);
         return;
       }
-      var allowedMemberFunctions = ["addExternalLayer", "getState"];
+      var allowedMemberFunctions = ["addExternalLayer", "getState", "drawGeometry", "onMapClick"];
       if (ev.data === "help") {
         var signatures = Object.fromEntries(Object.entries(actionFunctions).map(function (_ref3) {
           var _val$toString$match$, _val$toString$match;
@@ -305,19 +302,45 @@ var API = /*#__PURE__*/function (_React$Component) {
           var func = message.method;
           var args = (_message$params = message.params) !== null && _message$params !== void 0 ? _message$params : [];
           var result = null;
+          var postResult = true;
           if (func in actionFunctions) {
             var _this$props;
             result = (_this$props = _this.props)[func].apply(_this$props, _toConsumableArray(args));
           } else if (allowedMemberFunctions.includes(func)) {
             var _this2;
+            // Inject proper callback function
+            if (func === "drawGeometry") {
+              args.splice(2, 0, function (features, crs) {
+                if (message.requestId) {
+                  ev.source.postMessage({
+                    requestId: message.requestId,
+                    result: {
+                      features: features,
+                      crs: crs
+                    }
+                  }, ev.origin);
+                }
+              });
+              postResult = false;
+            } else if (func === "onMapClick") {
+              args = [function (click) {
+                if (message.requestId) {
+                  ev.source.postMessage({
+                    requestId: message.requestId,
+                    result: click
+                  }, ev.origin);
+                }
+              }];
+              postResult = false;
+            }
             result = (_this2 = _this)[func].apply(_this2, _toConsumableArray(args));
           } else {
             /* eslint-disable-next-line */
             console.warn("Unhandeled message: " + JSON.stringify(message));
           }
-          if (message.requestId) {
+          if (postResult && message.requestId) {
             ev.source.postMessage({
-              requestId: ev.data.requestId,
+              requestId: message.requestId,
               result: result
             }, ev.origin);
           }
@@ -446,7 +469,9 @@ var API = /*#__PURE__*/function (_React$Component) {
       });
     });
     /**
-     *  Draw geometries, and return these as GeoJSON to the calling application.
+     * Draw geometries, and return these as GeoJSON to the calling application.
+     *
+     * *NOTE*: when calling `drawGeometry` through the `postMessage` interface, omit the `callback` parameter. The response will be sent via the response message.
      *
      * * `geomType`: `Point`, `LineString`, `Polygon`, `Circle` or `Box`.
      * * `message`: A descriptive string to display in the tool taskbar.
@@ -477,6 +502,11 @@ var API = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "getState", function () {
       return _this.props.state;
     });
+    /** Fires the callback on the next click on the map. */
+    _defineProperty(_this, "onMapClick", function (callback) {
+      _this.onclickCallbacks.push(callback);
+    });
+    _this.onclickCallbacks = [];
     return _this;
   }
   _inherits(API, _React$Component);
@@ -589,6 +619,17 @@ var API = /*#__PURE__*/function (_React$Component) {
       window.addEventListener("message", this.handleMessage);
       window.dispatchEvent(new Event("QWC2ApiReady"));
     }
+  }, {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      var _this3 = this;
+      if (this.props.click !== prevProps.click && this.onclickCallbacks.length > 0) {
+        this.onclickCallbacks.forEach(function (cb) {
+          return cb(_objectSpread({}, _this3.props.click));
+        });
+        this.onclickCallbacks = [];
+      }
+    }
   }, {
     key: "render",
     value: function render() {
@@ -600,6 +641,7 @@ _defineProperty(API, "propTypes", {
   addLayer: PropTypes.func,
   /* List of origins which are allowed to post messages via `qwcIframe.postMessage`. */
   allowedMessageOrigins: PropTypes.arrayOf(PropTypes.string),
+  click: PropTypes.object,
   mapCrs: PropTypes.string,
   registerCustomPlugin: PropTypes.func,
   setCurrentTask: PropTypes.func,
@@ -611,6 +653,9 @@ _defineProperty(API, "defaultProps", {
 });
 export default connect(function (state) {
   return {
+    click: state.map.click || {
+      modifiers: {}
+    },
     mapCrs: state.map.projection,
     state: state
   };

package/plugins/TaskButton.js

@@ -55,6 +55,7 @@ var TaskButton = /*#__PURE__*/function (_React$Component) {
       }
       var title = LocaleUtils.tr("appmenu.items." + this.props.task + (this.props.mode || ""));
       return /*#__PURE__*/React.createElement(MapButton, {
+        active: this.props.currentTask === this.props.task,
         icon: this.props.icon,
         onClick: this.buttonClicked,
         position: this.props.position,

package/scripts/gen-plugin-docs.js

@@ -87,7 +87,7 @@ function parsePropDesc(prop) {
       var _ref4 = _slicedToArray(_ref3, 2),
         name = _ref4[0],
         subprop = _ref4[1];
-      return "- " + name + ": " + subprop.description;
+      return "- `" + name + "`: " + subprop.description;
     }).join("<br />");
   } else {
     return prop.description.replaceAll("\n", "<br />");