qwc2 2026.2.2 → 2026.2.4

package/components/IdentifyViewer.js

@@ -82,7 +82,7 @@ var BuiltinExporters = [{
         var feature = MiscUtils.objectOmit(entry, EXCLUDE_PROPS);
         feature.properties = MiscUtils.objectOmit(feature.properties, EXCLUDE_ATTRS);
         if (feature.geometry) {
-          feature.geometry = VectorLayerUtils.reprojectGeometry(feature.geometry, entry, 'EPSG:4326');
+          feature.geometry = VectorLayerUtils.reprojectGeometry(feature.geometry, entry.crs, 'EPSG:4326');
         }
         return feature;
       })

package/components/map3d/Map3D.js

@@ -132,8 +132,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         getSceneIntersection: function getSceneIntersection(x, y, objects) {},
         getSetting: function getSetting(key) {},
         setSetting: function setSetting(key, value) {}
-      }),
-      sceneId: null
+      })
     });
     _defineProperty(_this2, "applyBaseLayer", function () {
       var _baseLayer$name;
@@ -422,7 +421,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         url: MiscUtils.resolveAssetsPath(url)
       });
       // Recenter tile group
-      tiles.tiles.addEventListener('load-tile-set', function (_ref7) {
+      tiles.tiles.addEventListener('load-tileset', function (_ref7) {
         var tileSet = _ref7.tileSet;
         if (tileSet.root.parent === null) {
           var bbox = new Box3();
@@ -692,7 +691,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
           url: MiscUtils.resolveAssetsPath(entry.url),
           errorTarget: 32
         });
-        tiles.tiles.addEventListener('load-tile-set', function () {
+        tiles.tiles.addEventListener('load-tileset', function () {
           _this2.instance.notifyChange(tiles);
         });
         tiles.tiles.addEventListener('needs-update', function () {
@@ -774,6 +773,10 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       _this2.instance.addEventListener('after-entity-update', _this2.instanceOnAfterEntityUpdate);
     });
     _defineProperty(_this2, "instanceOnUpdateStart", function () {
+      var _this2$state$sceneCon2;
+      if (!((_this2$state$sceneCon2 = _this2.state.sceneContext.scene) !== null && _this2$state$sceneCon2 !== void 0 && (_this2$state$sceneCon2 = _this2$state$sceneCon2.view) !== null && _this2$state$sceneCon2 !== void 0 && _this2$state$sceneCon2.controls)) {
+        return;
+      }
       var camera = _this2.instance.view.camera;
       var quality = _this2.state.sceneContext.settings.sceneQuality;
       var isFirstPerson = _this2.state.sceneContext.scene.view.controls.isFirstPerson;
@@ -803,6 +806,10 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       });
     });
     _defineProperty(_this2, "instanceOnUpdateEnd", function () {
+      var _this2$state$sceneCon3;
+      if (!((_this2$state$sceneCon3 = _this2.state.sceneContext.scene) !== null && _this2$state$sceneCon3 !== void 0 && (_this2$state$sceneCon3 = _this2$state$sceneCon3.view) !== null && _this2$state$sceneCon3 !== void 0 && _this2$state$sceneCon3.controls)) {
+        return;
+      }
       Object.entries(_this2.state.sceneContext.sceneObjects).forEach(function (_ref12) {
         var _ref13 = _slicedToArray(_ref12, 2),
           objId = _ref13[0],
@@ -817,7 +824,11 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       });
     });
     _defineProperty(_this2, "instanceOnBeforeEntityUpdate", function (_ref14) {
+      var _this2$state$sceneCon4;
       var entity = _ref14.entity;
+      if (!((_this2$state$sceneCon4 = _this2.state.sceneContext.scene) !== null && _this2$state$sceneCon4 !== void 0 && (_this2$state$sceneCon4 = _this2$state$sceneCon4.view) !== null && _this2$state$sceneCon4 !== void 0 && _this2$state$sceneCon4.controls)) {
+        return;
+      }
       if (entity !== _this2.map) {
         _this2.instance.view.camera.userData.__previousFar = _this2.instance.view.camera.far;
         var quality = _this2.state.sceneContext.settings.sceneQuality;
@@ -827,7 +838,11 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       }
     });
     _defineProperty(_this2, "instanceOnAfterEntityUpdate", function (_ref15) {
+      var _this2$state$sceneCon5;
       var entity = _ref15.entity;
+      if (!((_this2$state$sceneCon5 = _this2.state.sceneContext.scene) !== null && _this2$state$sceneCon5 !== void 0 && (_this2$state$sceneCon5 = _this2$state$sceneCon5.view) !== null && _this2$state$sceneCon5 !== void 0 && _this2$state$sceneCon5.camera)) {
+        return;
+      }
       if (entity !== _this2.map) {
         _this2.instance.view.camera.far = _this2.instance.view.camera.userData.__previousFar;
         delete _this2.instance.view.camera.userData.__previousFar;
@@ -890,8 +905,12 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
     });
     _defineProperty(_this2, "onUnload", function (key) {
       // Ensure scene has not already been disposed
-      if (_this2.state.sceneId === key) {
-        _this2.disposeInstance();
+      if (_this2.state.sceneContext.sceneId === key) {
+        if (_this2.state.sceneContext.rebuildInstance) {
+          _this2.setupInstance();
+        } else {
+          _this2.disposeInstance();
+        }
       }
     });
     _defineProperty(_this2, "setupControls", function (instance) {
@@ -1061,7 +1080,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       }).filter(Boolean);
       return new Promise(function (resolve) {
         Promise.all(promises).then(function (objects) {
-          var _this2$state$sceneCon2, _this2$state$sceneCon3;
+          var _this2$state$sceneCon6, _this2$state$sceneCon7;
           var camera = _this2.state.sceneContext.scene.view.camera.position;
           var target = _this2.state.sceneContext.scene.view.controls.target;
           var layers = Object.entries(_this2.state.sceneContext.colorLayers).map(function (_ref20) {
@@ -1080,10 +1099,10 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
           resolve({
             objects: objects,
             colorLayers: layers,
-            baseLayer: ((_this2$state$sceneCon2 = _this2.state.sceneContext.baseLayers.find(function (layer) {
+            baseLayer: ((_this2$state$sceneCon6 = _this2.state.sceneContext.baseLayers.find(function (layer) {
               return layer.visibility === true;
-            })) === null || _this2$state$sceneCon2 === void 0 ? void 0 : _this2$state$sceneCon2.name) || "",
-            personHeight: (_this2$state$sceneCon3 = _this2.state.sceneContext.scene.view.controls.personHeight) !== null && _this2$state$sceneCon3 !== void 0 ? _this2$state$sceneCon3 : 0,
+            })) === null || _this2$state$sceneCon6 === void 0 ? void 0 : _this2$state$sceneCon6.name) || "",
+            personHeight: (_this2$state$sceneCon7 = _this2.state.sceneContext.scene.view.controls.personHeight) !== null && _this2$state$sceneCon7 !== void 0 ? _this2$state$sceneCon7 : 0,
             camera: [camera.x, camera.y, camera.z],
             target: [target.x, target.y, target.z]
           });
@@ -1182,7 +1201,13 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       var _this3 = this;
       if (this.props.theme !== prevProps.theme) {
         if (this.props.theme.map3d) {
-          this.setupInstance();
+          this.setState(function (state) {
+            return {
+              sceneContext: _objectSpread(_objectSpread({}, state.sceneContext), {}, {
+                rebuildInstance: true
+              })
+            };
+          });
         }
       } else if (this.props.layers !== prevProps.layers) {
         this.setState(function (state) {
@@ -1239,10 +1264,10 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         id: "map3d",
         key: "Map3D",
         ref: this.setupContainer
-      }), this.context), this.state.sceneContext.scene ? /*#__PURE__*/React.createElement(UnloadWrapper, {
-        key: this.state.sceneId,
+      }), this.context), this.state.sceneContext.scene && !this.state.sceneContext.rebuildInstance ? /*#__PURE__*/React.createElement(UnloadWrapper, {
+        key: this.state.sceneContext.sceneId,
         onUnload: this.onUnload,
-        sceneId: this.state.sceneId
+        sceneId: this.state.sceneContext.sceneId
       }, /*#__PURE__*/React.createElement(MapControls3D, {
         controlsPosition: this.props.controlsPosition,
         mouseButtons: this.props.mouseButtons,
@@ -1302,7 +1327,9 @@ _defineProperty(Map3D, "defaultSceneState", {
   collisionObjects: [],
   settings: {
     sceneQuality: 100
-  }
+  },
+  sceneId: null,
+  rebuildInstance: false
 });
 export default connect(function (state) {
   return {

package/components/map3d/drawtool/NumericInput3D.js

@@ -28,6 +28,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 
 import React from 'react';
 import ReactDOM from 'react-dom';
+import CoordinateSystem from '@giro3d/giro3d/core/geographic/coordinate-system/CoordinateSystem';
 import Coordinates from '@giro3d/giro3d/core/geographic/Coordinates';
 import PropTypes from 'prop-types';
 import { Box3 } from 'three';
@@ -137,7 +138,7 @@ var NumericInput3D = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_this, "elevationChanged", function (_ref) {
       var extent = _ref.extent;
-      var crs = _this.props.sceneContext.mapCrs;
+      var crs = CoordinateSystem.fromSrid(_this.props.sceneContext.mapCrs);
       var coo = new Coordinates(crs, _this.state.pos[0], _this.state.pos[1]);
       if (extent.isPointInside(coo)) {
         var _this$props$sceneCont2;

package/package.json

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

package/plugins/style/View3D.css

@@ -2,7 +2,7 @@ div.view3d-busy-overlay {
     position: absolute;
     left: 0;
     right: 0;
-    top: 2.25em;
+    top: 0;
     bottom: 0;
     display: flex;
     align-items: center;