qwc2 2026.7.30 → 2026.8.2

package/components/ResizeableWindow.js

@@ -44,7 +44,8 @@ var ResizeableWindow = /*#__PURE__*/function (_React$Component) {
     _classCallCheck(this, ResizeableWindow);
     _this = _callSuper(this, ResizeableWindow, [props]);
     _defineProperty(_this, "state", {
-      geometry: null
+      geometry: null,
+      withinMapContainer: false
     });
     _defineProperty(_this, "updateSize", function (size) {
       _this.rnd.updateSize(size);
@@ -163,7 +164,7 @@ var ResizeableWindow = /*#__PURE__*/function (_React$Component) {
       var splitTopAndBottomBar = _this.props.splitTopAndBottomBar && _this.props.splitScreenWhenDocked && (docked || maximized);
       var marginLeft = 0;
       var marginRight = 0;
-      if (!splitTopAndBottomBar) {
+      if (!splitTopAndBottomBar && !_this.state.withinMapContainer) {
         marginLeft = _this.props.mapMargins.outerLeft + _this.props.menuMargins.left;
         marginRight = _this.props.mapMargins.outerRight + _this.props.menuMargins.right;
       }
@@ -282,6 +283,7 @@ var ResizeableWindow = /*#__PURE__*/function (_React$Component) {
       if (!container) {
         return;
       }
+      var withinMapContainer = !!container.closest('.map-container');
       var width = Math.min(_this.props.initialWidth, container.offsetWidth);
       var height = Math.min(_this.props.initialHeight, container.offsetHeight);
       var geometry = null;
@@ -304,7 +306,8 @@ var ResizeableWindow = /*#__PURE__*/function (_React$Component) {
         _this.props.setSplitScreen(_this.id, dockSide, dockSize, _this.props.splitTopAndBottomBar);
       }
       _this.setState({
-        geometry: geometry
+        geometry: geometry,
+        withinMapContainer: withinMapContainer
       });
     });
     _defineProperty(_this, "computeInitialX", function (container, x) {

package/components/map3d/EditDataset3D.js

@@ -107,7 +107,7 @@ var EditDataset3D = /*#__PURE__*/function (_React$Component) {
       _this.transformControls.addEventListener('dragging-changed', function (event) {
         _this.props.sceneContext.scene.view.controls.enabled = !event.value;
       });
-      _this.props.sceneContext.scene.view.controls.addEventListener('change', _this.updateTransformHelper);
+      _this.props.sceneContext.eventDispatcher.addEventListener('cameraChanged', _this.updateTransformHelper);
       _this.props.sceneContext.scene.notifyChange();
     });
     _defineProperty(_this, "onHide", function () {
@@ -117,7 +117,7 @@ var EditDataset3D = /*#__PURE__*/function (_React$Component) {
       _this.transformControls = null;
       var domElement = _this.props.sceneContext.scene.renderer.domElement;
       domElement.removeEventListener('keydown', _this.onKeyDown);
-      _this.props.sceneContext.scene.view.controls.removeEventListener('change', _this.updateTransformHelper);
+      _this.props.sceneContext.eventDispatcher.removeEventListener('cameraChanged', _this.updateTransformHelper);
       _this.props.sceneContext.scene.notifyChange();
       _this.setState(EditDataset3D.defaultState);
     });

package/components/map3d/HeightProfile3D.js

@@ -107,7 +107,7 @@ var HeightProfilePrintDialog = /*#__PURE__*/function (_React$PureComponent) {
       this.externalWindow.addEventListener('load', this.setWindowContent, false);
       this.externalWindow.addEventListener('resize', this.windowResized, false);
       window.addEventListener('beforeunload', this.closePrintWindow);
-      this.props.sceneContext.scene.view.controls.addEventListener('change', this.scheduleRefreshImage);
+      this.props.sceneContext.eventDispatcher.addEventListener('cameraChanged', this.scheduleRefreshImage);
     }
   }, {
     key: "componentDidUpdate",
@@ -121,7 +121,7 @@ var HeightProfilePrintDialog = /*#__PURE__*/function (_React$PureComponent) {
     value: function componentWillUnmount() {
       this.closePrintWindow();
       window.removeEventListener('beforeunload', this.closePrintWindow);
-      this.props.sceneContext.scene.view.controls.removeEventListener('change', this.scheduleRefreshImage);
+      this.props.sceneContext.eventDispatcher.removeEventListener('cameraChanged', this.scheduleRefreshImage);
     }
   }, {
     key: "render",

package/components/map3d/Map3D.js

@@ -721,6 +721,12 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
     _defineProperty(_this2, "getMap", function () {
       return _this2.map;
     });
+    _defineProperty(_this2, "onCameraChanged", function (center, camera, fov) {
+      _this2.state.sceneContext.eventDispatcher.dispatchEvent({
+        type: 'cameraChanged'
+      });
+      _this2.props.onCameraChanged(center, camera, fov);
+    });
     _defineProperty(_this2, "renderBaseLayer", function () {
       var baseLayer = _this2.state.sceneContext.baseLayers.find(function (e) {
         return e.visibility === true;
@@ -1456,7 +1462,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       }, /*#__PURE__*/React.createElement(MapControls3D, {
         controlsPosition: this.props.controlsPosition,
         mouseButtons: this.props.mouseButtons,
-        onCameraChanged: this.props.onCameraChanged,
+        onCameraChanged: this.onCameraChanged,
         onControlsSet: this.setupControls,
         sceneContext: this.state.sceneContext
       }, /*#__PURE__*/React.createElement(EditDataset3D, {

package/components/map3d/SearchField3D.js

@@ -129,10 +129,10 @@ var SearchField3D = /*#__PURE__*/function (_React$Component) {
             pin.scale.set(scale, scale, scale);
             pin.updateMatrixWorld();
           };
-          sceneContext.scene.view.controls.addEventListener('change', scaleSearchMarker);
+          sceneContext.eventDispatcher.addEventListener('cameraChanged', scaleSearchMarker);
           searchMarker.addEventListener('removed', function () {
             var _labelEl$parentNode, _labelEl$parentNode$r;
-            sceneContext.scene.view.controls.removeEventListener('change', scaleSearchMarker);
+            sceneContext.eventDispatcher.removeEventListener('cameraChanged', scaleSearchMarker);
             // The label DOM element is not removed when the searchMarker group is removed from the instance
             (_labelEl$parentNode = labelEl.parentNode) === null || _labelEl$parentNode === void 0 || (_labelEl$parentNode$r = _labelEl$parentNode.removeChild) === null || _labelEl$parentNode$r === void 0 || _labelEl$parentNode$r.call(_labelEl$parentNode, labelEl);
           });

package/components/map3d/drawtool/EditTool3D.js

@@ -571,7 +571,7 @@ var EditTool3D = /*#__PURE__*/function (_React$Component) {
           selectCount: 1
         });
       }
-      this.props.sceneContext.scene.view.controls.addEventListener('change', this.updateTransformHelper);
+      this.props.sceneContext.eventDispatcher.addEventListener('cameraChanged', this.updateTransformHelper);
       this.props.sceneContext.scene.notifyChange();
     }
   }, {
@@ -647,7 +647,7 @@ var EditTool3D = /*#__PURE__*/function (_React$Component) {
       this.props.sceneContext.scene.remove(this.transformControls.getHelper());
       this.transformControls.dispose();
       var domElement = this.props.sceneContext.scene.renderer.domElement;
-      this.props.sceneContext.scene.view.controls.removeEventListener('change', this.updateTransformHelper);
+      this.props.sceneContext.eventDispatcher.removeEventListener('cameraChanged', this.updateTransformHelper);
       domElement.removeEventListener("pointerdown", this.selectShapeOnRelease);
       domElement.removeEventListener('keydown', this.onKeyDown);
       this.props.sceneContext.scene.notifyChange();

package/components/map3d/layers/VectorLayer3D.js

@@ -66,7 +66,9 @@ export default {
     var crs = CoordinateSystem.get(projection);
     return new StaticFeatureSource({
       coordinateSystem: crs,
-      features: colorlayer.source.source.getFeatures()
+      features: colorlayer.source.source.getFeatures().filter(function (f) {
+        return f.getGeometry().getType() === "Polygon";
+      })
     });
   }
 };

package/components/map3d/utils/FirstPersonControls3D.js

@@ -288,6 +288,11 @@ var FirstPersonControls3D = /*#__PURE__*/function (_Controls) {
         this.update();
       }
     }
+  }, {
+    key: "getAzimuthalAngle",
+    value: function getAzimuthalAngle() {
+      return this.yaw;
+    }
   }, {
     key: "dispose",
     value: function dispose() {

package/package.json

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

package/plugins/ObliqueView.js

@@ -212,6 +212,18 @@ var ObliqueView = /*#__PURE__*/function (_React$Component) {
         _this.focusedMap = null;
       }
     });
+    _defineProperty(_this, "trackPointerFocus", function (ev) {
+      var _this$map2, _this$map2$getTargetE, _mapEl$contains2, _mapObliqueEl$contain2;
+      var mapEl = document.getElementById("map");
+      var mapObliqueEl = (_this$map2 = _this.map) === null || _this$map2 === void 0 || (_this$map2$getTargetE = _this$map2.getTargetElement) === null || _this$map2$getTargetE === void 0 ? void 0 : _this$map2$getTargetE.call(_this$map2);
+      if (mapEl !== null && mapEl !== void 0 && (_mapEl$contains2 = mapEl.contains) !== null && _mapEl$contains2 !== void 0 && _mapEl$contains2.call(mapEl, ev.target)) {
+        _this.focusedMap = "map";
+      } else if (mapObliqueEl !== null && mapObliqueEl !== void 0 && (_mapObliqueEl$contain2 = mapObliqueEl.contains) !== null && _mapObliqueEl$contain2 !== void 0 && _mapObliqueEl$contain2.call(mapObliqueEl, ev.target)) {
+        _this.focusedMap = "mapOblique";
+      } else {
+        _this.focusedMap = null;
+      }
+    });
     var controls = ol.control.defaults({
       zoom: false,
       attribution: false,
@@ -251,6 +263,7 @@ var ObliqueView = /*#__PURE__*/function (_React$Component) {
     key: "componentDidMount",
     value: function componentDidMount() {
       window.addEventListener('focus', this.trackFocus, true);
+      window.addEventListener('pointerdown', this.trackPointerFocus);
       if (this.props.startupParams.v === "oblique") {
         this.props.setViewMode(ViewMode._Oblique);
       }
@@ -259,6 +272,7 @@ var ObliqueView = /*#__PURE__*/function (_React$Component) {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
       window.removeEventListener('focus', this.trackFocus);
+      window.removeEventListener('pointerdown', this.trackPointerFocus);
     }
   }, {
     key: "componentDidUpdate",

package/plugins/View3D.js

@@ -168,6 +168,18 @@ var View3D = /*#__PURE__*/function (_React$Component) {
         _this.focusedMap = null;
       }
     });
+    _defineProperty(_this, "trackPointerFocus", function (ev) {
+      var _mapEl$contains2, _map3dEl$contains2;
+      var mapEl = document.getElementById("map");
+      var map3dEl = document.getElementById("map3d");
+      if (mapEl !== null && mapEl !== void 0 && (_mapEl$contains2 = mapEl.contains) !== null && _mapEl$contains2 !== void 0 && _mapEl$contains2.call(mapEl, ev.target)) {
+        _this.focusedMap = "map";
+      } else if (map3dEl !== null && map3dEl !== void 0 && (_map3dEl$contains2 = map3dEl.contains) !== null && _map3dEl$contains2 !== void 0 && _map3dEl$contains2.call(map3dEl, ev.target)) {
+        _this.focusedMap = "map3d";
+      } else {
+        _this.focusedMap = null;
+      }
+    });
     _this.map3dComponent = null;
     _this.map3dComponentRef = null;
     _this.focusedMap = null;
@@ -255,12 +267,14 @@ var View3D = /*#__PURE__*/function (_React$Component) {
         this.props.setViewMode(ViewMode._3DSplitscreen);
       }
       window.addEventListener('focus', this.trackFocus, true);
+      window.addEventListener('pointerdown', this.trackPointerFocus);
       this.syncParentStore({});
     }
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
       window.removeEventListener('focus', this.trackFocus);
+      window.removeEventListener('pointerdown', this.trackPointerFocus);
     }
   }, {
     key: "componentDidUpdate",

package/plugins/map/RedliningSupport.js

@@ -152,6 +152,14 @@ var RedliningSupport = /*#__PURE__*/function (_React$Component) {
         deletedKeys.forEach(function (key) {
           _this.selectedFeatures[0].unset(key);
         });
+        if (_this.props.redlining.showmeasurements) {
+          var settings = {
+            displayCrs: _this.props.displayCrs,
+            lenUnit: _this.props.redlining.lenUnit,
+            areaUnit: _this.props.redlining.areaUnit
+          };
+          MeasureUtils.updateFeatureMeasurements(_this.selectedFeatures[0], _this.selectedFeatures[0].get('shape'), _this.props.mapCrs, settings);
+        }
         _this.props.changeRedliningState({
           selectedFeature: feature,
           geomType: feature.shape

package/plugins/map3d/Compare3D.js

@@ -121,14 +121,13 @@ var Compare3D = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_this, "enableArrows", function () {
       _this.props.sceneContext.addSceneObject("__compareArrows", _this.arrows);
-      _this.props.sceneContext.scene.view.controls.addEventListener('change', _this.centerArrowsInView);
+      _this.props.sceneContext.eventDispatcher.addEventListener('cameraChanged', _this.centerArrowsInView);
       var renderer = _this.props.sceneContext.scene.renderer;
       renderer.domElement.addEventListener("pointerdown", _this.dragArrows);
       _this.centerArrowsInView();
     });
     _defineProperty(_this, "disableArrows", function () {
-      var _this$props$sceneCont, _this$props$sceneCont2;
-      (_this$props$sceneCont = _this.props.sceneContext.scene.view.controls) === null || _this$props$sceneCont === void 0 || (_this$props$sceneCont2 = _this$props$sceneCont.removeEventListener) === null || _this$props$sceneCont2 === void 0 || _this$props$sceneCont2.call(_this$props$sceneCont, 'change', _this.centerArrowsInView);
+      _this.props.sceneContext.eventDispatcher.removeEventListener('cameraChanged', _this.centerArrowsInView);
       _this.props.sceneContext.removeSceneObject("__compareArrows");
       _this.props.sceneContext.scene.renderer.domElement.removeEventListener("pointerdown", _this.dragArrows);
     });
@@ -186,11 +185,11 @@ var Compare3D = /*#__PURE__*/function (_React$Component) {
       _this.positionArrows(newPos.x, newPos.y, _this.state.planeA);
     });
     _defineProperty(_this, "positionArrows", function (x, y, alpha) {
-      var _this$props$sceneCont3;
+      var _this$props$sceneCont;
       var target = new Vector3(x, y, 0);
       var distance = _this.props.sceneContext.scene.view.camera.position.distanceTo(target);
       var scale = Math.max(1, distance / 200);
-      var z = (_this$props$sceneCont3 = _this.props.sceneContext.getTerrainHeightFromMap([x, y])) !== null && _this$props$sceneCont3 !== void 0 ? _this$props$sceneCont3 : 0;
+      var z = (_this$props$sceneCont = _this.props.sceneContext.getTerrainHeightFromMap([x, y])) !== null && _this$props$sceneCont !== void 0 ? _this$props$sceneCont : 0;
       _this.arrows.position.x = target.x;
       _this.arrows.position.y = target.y;
       _this.arrows.position.z = z;
@@ -302,9 +301,9 @@ var Compare3D = /*#__PURE__*/function (_React$Component) {
           if (intersection) {
             sceneTarget = intersection.point;
           } else {
-            var _this$props$sceneCont4;
+            var _this$props$sceneCont2;
             sceneTarget = _this.props.sceneContext.scene.view.controls.target.clone();
-            sceneTarget.z = (_this$props$sceneCont4 = _this.props.sceneContext.getTerrainHeightFromMap([sceneTarget.x, sceneTarget.y])) !== null && _this$props$sceneCont4 !== void 0 ? _this$props$sceneCont4 : 0 + 2;
+            sceneTarget.z = (_this$props$sceneCont2 = _this.props.sceneContext.getTerrainHeightFromMap([sceneTarget.x, sceneTarget.y])) !== null && _this$props$sceneCont2 !== void 0 ? _this$props$sceneCont2 : 0 + 2;
           }
           newState.planeX = sceneTarget.x;
           newState.planeY = sceneTarget.y;

package/plugins/map3d/MapLight3D.js

@@ -521,7 +521,7 @@ var MapLight3D = /*#__PURE__*/function (_React$Component) {
           var shadowCameraHelper = new CameraHelper(sunLight.shadow.camera);
           this.props.sceneContext.addSceneObject("__shadowCameraHelper", shadowCameraHelper);
         }
-        this.props.sceneContext.scene.view.controls.addEventListener('change', this.setLighting);
+        this.props.sceneContext.eventDispatcher.addEventListener('cameraChanged', this.setLighting);
         this.setLighting();
       } else if (this.state.lightParams !== prevState.lightParams) {
         if (this.state.lightParams.helpersVisible && !prevState.lightParams.helpersVisible) {
@@ -545,6 +545,7 @@ var MapLight3D = /*#__PURE__*/function (_React$Component) {
       this.props.sceneContext.removeSceneObject("__moonLight");
       this.props.sceneContext.removeSceneObject("__sunLightHelper");
       this.props.sceneContext.removeSceneObject("__shadowCameraHelper");
+      this.props.sceneContext.eventDispatcher.removeEventListener('cameraChanged', this.setLighting);
     }
   }, {
     key: "render",

package/plugins/map3d/OverviewMap3D.js

@@ -60,12 +60,12 @@ var OverviewMap3D = /*#__PURE__*/function (_React$Component) {
   return _createClass(OverviewMap3D, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      this.props.sceneContext.scene.view.controls.addEventListener('change', this.updateViewCone);
+      this.props.sceneContext.eventDispatcher.addEventListener('cameraChanged', this.updateViewCone);
     }
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      this.props.sceneContext.scene.view.controls.removeEventListener('change', this.updateViewCone);
+      this.props.sceneContext.eventDispatcher.removeEventListener('cameraChanged', this.updateViewCone);
     }
   }, {
     key: "componentDidUpdate",

package/plugins/map3d/Viewshed3D.js

@@ -126,7 +126,7 @@ var Viewshed3D = /*#__PURE__*/function (_React$Component) {
       _this.transformControls.attach(_this.observerMesh);
       _this.transformControls.getHelper().updateMatrixWorld();
       scene.add(_this.transformControls.getHelper());
-      _this.props.sceneContext.scene.view.controls.addEventListener('change', _this.updateTransformHelper);
+      _this.props.sceneContext.eventDispatcher.addEventListener('cameraChanged', _this.updateTransformHelper);
       _this.props.sceneContext.scene.notifyChange();
     });
     _defineProperty(_this, "onHide", function () {
@@ -134,7 +134,7 @@ var Viewshed3D = /*#__PURE__*/function (_React$Component) {
       _this.transformControls.removeEventListener('dragging-changed', _this.onControlDrag);
       _this.transformControls.removeEventListener('objectChange', _this.onControlChange);
       _this.transformControls.removeEventListener('change', _this.onControlChange);
-      _this.props.sceneContext.scene.view.controls.removeEventListener('change', _this.updateTransformHelper);
+      _this.props.sceneContext.eventDispatcher.removeEventListener('cameraChanged', _this.updateTransformHelper);
       _this.overriddenMaterials.forEach(function (material) {
         material.onBeforeCompile = material.userData.originalOnBeforeCompile;
         delete material.userData.originalOnBeforeCompile;

package/utils/ServiceLayerUtils.js

@@ -523,7 +523,7 @@ var ServiceLayerUtils = {
           parseAttributeValue: true,
           removeNSPrefix: true,
           processEntities: {
-            maxTotalExpansions: 10000
+            maxTotalExpansions: ConfigUtils.getConfigProp("xmlMaxTotalExpansions", null, 10000)
           }
         };
         resolve({