qwc2 2026.8.2 → 2026.8.5

package/package.json

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

package/plugins/Panoramax.js

@@ -56,9 +56,8 @@ var Panoramax = /*#__PURE__*/function (_React$Component) {
       currentTooltip: '',
       viewerInitialized: false
     });
-    _defineProperty(_this, "onClose", function () {
+    _defineProperty(_this, "cleanUp", function () {
       var _this$viewer;
-      _this.props.setCurrentTask(null);
       _this.props.removeLayer('panoramax-recordings');
       _this.props.removeLayer('panoramaxselection');
       _this.setState({
@@ -73,6 +72,9 @@ var Panoramax = /*#__PURE__*/function (_React$Component) {
       });
       (_this$viewer = _this.viewer) === null || _this$viewer === void 0 || _this$viewer.select(null, null, true);
     });
+    _defineProperty(_this, "onClose", function () {
+      _this.props.setCurrentTask(null);
+    });
     _defineProperty(_this, "initializeViewer", function () {
       var viewerElement = _this.viewerRef.current;
       if (viewerElement) {
@@ -199,6 +201,8 @@ var Panoramax = /*#__PURE__*/function (_React$Component) {
             this.addRecordingsMVT();
           }
         }
+      } else if (prevProps.active && !this.props.active) {
+        this.cleanUp();
       } else if (this.state.selectionGeom && this.state.selectionGeom !== prevState.selectionGeom) {
         this.queryPoint(this.state.selectionGeom);
       }

package/plugins/ScratchDrawing.js

@@ -87,49 +87,59 @@ var ScratchDrawing = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "submitGeometry", function () {
       var _this$props$layers$fi;
       var features = ((_this$props$layers$fi = _this.props.layers.find(function (l) {
-        return l.id === _this.props.redlining.layer;
+        return l.id === _this.layerId;
       })) === null || _this$props$layers$fi === void 0 ? void 0 : _this$props$layers$fi.features) || [];
-      _this.submitted = true;
+      if (_this.props.redlining.selectedFeature) {
+        features = features.filter(function (f) {
+          return f.id !== _this.props.redlining.selectedFeature.id;
+        });
+        features.push(_this.props.redlining.selectedFeature);
+      }
       _this.props.task.data.callback(features, _this.props.projection);
+      _this.submitted = true;
       _this.props.setCurrentTask(null);
     });
     _this.submitted = false;
+    _this.layerId = null;
     return _this;
   }
   _inherits(ScratchDrawing, _React$Component);
   return _createClass(ScratchDrawing, [{
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      // Clear when task changes
-      if (this.props.task.id !== "ScratchDrawing" && prevProps.task.id === "ScratchDrawing") {
-        if (!this.submitted) {
-          prevProps.task.data.callback(null, null);
-          this.submitted = true;
-        }
-        this.props.removeLayer(prevProps.redlining.layer);
-        this.props.resetRedliningState();
-      }
-      // Setup redlining state
-      if (this.props.task !== prevProps.task && this.props.task.id === "ScratchDrawing") {
-        if (prevProps.task.id === "ScratchDrawing") {
-          this.props.removeLayer(prevProps.redlining.layer);
-          if (!this.submitted) {
-            prevProps.task.data.callback(null, null);
-            this.submitted = true;
-          }
-        }
-        this.submitted = false;
+      if (this.props.task.id === "ScratchDrawing" && prevProps.task.id !== "ScratchDrawing") {
         var data = this.props.task.data;
-        var layerId = this.createDrawLayer(data);
+        this.layerId = this.createDrawLayer(data);
         this.props.setSnappingConfig(data.snapping, data.snappingActive);
         this.props.changeRedliningState({
           action: 'PickDraw',
           geomType: data.geomType,
-          layer: layerId,
+          layer: this.layerId,
           layerTitle: null,
           drawMultiple: data.drawMultiple,
           style: this.drawingStyle(data.style)
         });
+      } else if (prevProps.task.id === "ScratchDrawing" && this.props.task !== prevProps.task) {
+        this.props.resetRedliningState();
+        if (!this.submitted) {
+          prevProps.task.data.callback(null, null);
+        }
+        this.submitted = false;
+      } else if (this.props.redlining.layer === null && prevProps.redlining.layer === this.layerId) {
+        this.props.removeLayer(this.layerId);
+        if (this.props.task.id === "ScratchDrawing") {
+          var _data = this.props.task.data;
+          this.layerId = this.createDrawLayer(_data);
+          this.props.setSnappingConfig(_data.snapping, _data.snappingActive);
+          this.props.changeRedliningState({
+            action: 'PickDraw',
+            geomType: _data.geomType,
+            layer: this.layerId,
+            layerTitle: null,
+            drawMultiple: _data.drawMultiple,
+            style: this.drawingStyle(_data.style)
+          });
+        }
       }
     }
   }, {

package/plugins/map3d/OverviewMap3D.js

@@ -60,6 +60,7 @@ var OverviewMap3D = /*#__PURE__*/function (_React$Component) {
   return _createClass(OverviewMap3D, [{
     key: "componentDidMount",
     value: function componentDidMount() {
+      this.updateViewCone();
       this.props.sceneContext.eventDispatcher.addEventListener('cameraChanged', this.updateViewCone);
     }
   }, {

package/plugins/style/BackgroundSwitcher.css

@@ -26,7 +26,7 @@ div.background-switcher {
     transform-origin: right;
     transition: transform 0.1s;
     width: calc(var(--buttons-container-width) - 7em);
-    z-index: 1;
+    z-index: 3;
     display: flex;
     justify-content: flex-end;
     flex-wrap: wrap-reverse;

package/utils/SearchProviders.js

@@ -457,11 +457,15 @@ export var FulltextSearch = /*#__PURE__*/function () {
           items: data.results.filter(function (entry) {
             return entry.feature && entry.feature.bbox;
           }).map(function (entry) {
+            var center = entry.feature.center;
+            if (!center) {
+              center = [0.5 * (entry.feature.bbox[0] + entry.feature.bbox[2]), 0.5 * (entry.feature.bbox[1] + entry.feature.bbox[3])];
+            }
             return {
               id: entry.feature.feature_id,
               text: entry.feature.display,
-              x: 0.5 * (entry.feature.bbox[0] + entry.feature.bbox[2]),
-              y: 0.5 * (entry.feature.bbox[1] + entry.feature.bbox[3]),
+              x: center[0],
+              y: center[1],
               crs: entry.feature.srid ? "EPSG:" + String(entry.feature.srid).replace(/^EPSG:/, '') : null,
               bbox: entry.feature.bbox,
               thumbnail: iconPath + entry.feature.dataproduct_id + ".svg",