qwc2 2026.2.27 → 2026.3.24

package/components/AppMenu.js

@@ -123,6 +123,7 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
             "appmenu-submenu": true,
             "appmenu-submenu-expanded": expanded
           });
+          var label = item.title ? LocaleUtils.tr(item.title) : LocaleUtils.tr("appmenu.items." + item.key);
           return [/*#__PURE__*/React.createElement("div", {
             className: className,
             key: (_item$key = item.key) !== null && _item$key !== void 0 ? _item$key : item.title,
@@ -136,13 +137,14 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
             tabIndex: 0
           }, /*#__PURE__*/React.createElement(Icon, {
             icon: item.icon,
-            size: "xlarge"
-          }), item.title ? LocaleUtils.tr(item.title) : LocaleUtils.tr("appmenu.items." + item.key)), subitems];
+            size: "xlarge",
+            title: _this.props.menuIconOnly ? label : null
+          }), !_this.props.menuIconOnly ? label : null), subitems];
         } else {
           var trargs = item.trargs || [];
-          var label = item.title ? LocaleUtils.tr.apply(LocaleUtils, [item.title].concat(_toConsumableArray(trargs))) : LocaleUtils.tr.apply(LocaleUtils, ["appmenu.items." + item.key + (item.mode || "")].concat(_toConsumableArray(trargs)));
+          var _label = item.title ? LocaleUtils.tr.apply(LocaleUtils, [item.title].concat(_toConsumableArray(trargs))) : LocaleUtils.tr.apply(LocaleUtils, ["appmenu.items." + item.key + (item.mode || "")].concat(_toConsumableArray(trargs)));
           var comment = item.comment ? LocaleUtils.tr.apply(LocaleUtils, ["appmenu.items." + item.key + (item.mode || "") + "_comment"].concat(_toConsumableArray(trargs))) : "";
-          if (!filter || removeDiacritics(label.toLowerCase()).match(filter) || comment && removeDiacritics(comment.toLowerCase()).match(filter)) {
+          if (!filter || removeDiacritics(_label.toLowerCase()).match(filter) || comment && removeDiacritics(comment.toLowerCase()).match(filter)) {
             var _className = classnames({
               "appmenu-menu-item": true,
               "appmenu-menu-item-nested": submenu
@@ -160,12 +162,13 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
               tabIndex: 0
             }, /*#__PURE__*/React.createElement(Icon, {
               icon: item.icon,
-              size: "xlarge"
-            }), /*#__PURE__*/React.createElement("span", {
+              size: "xlarge",
+              title: _this.props.menuIconOnly ? _label : null
+            }), !_this.props.menuIconOnly ? /*#__PURE__*/React.createElement("span", {
               className: "appmenu-menu-item-label"
-            }, label, comment ? /*#__PURE__*/React.createElement("div", {
+            }, _label, comment ? /*#__PURE__*/React.createElement("div", {
               className: "appmenu-menu-item-comment"
-            }, comment) : null));
+            }, comment) : null) : null);
           }
           return null;
         }
@@ -284,6 +287,7 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
         "appmenu-blocked": this.props.currentTaskBlocked,
         "appmenu-visible": visible,
         "appmenu-compact": this.props.menuCompact,
+        "appmenu-icononly": this.props.menuIconOnly,
         "appmenu-nolabel": !showLabel
       });
       var filter = this.state.filter ? new RegExp(removeDiacritics(this.state.filter).replace(/[-[\]/{}()*+?.\\^$|]/g, "\\$&"), "i") : null;
@@ -360,6 +364,7 @@ _defineProperty(AppMenu, "propTypes", {
   currentTaskBlocked: PropTypes.bool,
   keepMenuOpen: PropTypes.bool,
   menuCompact: PropTypes.bool,
+  menuIconOnly: PropTypes.bool,
   menuItems: PropTypes.array,
   onMenuToggled: PropTypes.func,
   openExternalUrl: PropTypes.func,

package/components/AttributeTableWidget.js

@@ -38,7 +38,7 @@ import { connect } from 'react-redux';
 import FileSaver from 'file-saver';
 import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
-import { LayerRole, addLayerFeatures, removeLayer } from '../actions/layers';
+import { LayerRole, addLayerFeatures, removeLayer, refreshLayer } from '../actions/layers';
 import { zoomToExtent, zoomToPoint } from '../actions/map';
 import { setCurrentTask, setCurrentTaskBlocked } from '../actions/task';
 import EditComboField from '../components/EditComboField';
@@ -485,6 +485,10 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
         return newState;
       }, function () {
         if (reload) {
+          var mapPrefix = _this.state.curEditConfig.editDataset.split(".")[0];
+          _this.props.refreshLayer(function (layer) {
+            return layer.wms_name === mapPrefix;
+          });
           _this.reload(_this.state.loadedLayer, true);
         }
       });
@@ -566,6 +570,10 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
         alert(result);
       } else {
         _this.changedFiles = {};
+        var mapPrefix = _this.state.curEditConfig.editDataset.split(".")[0];
+        _this.props.refreshLayer(function (layer) {
+          return layer.wms_name === mapPrefix;
+        });
         _this.reload(_this.state.loadedLayer, true, {
           changedFeatureIdx: null,
           originalFeatureProps: null,
@@ -1029,7 +1037,10 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
             return _this2.updateFilter("filterField", ev.target.value);
           },
           value: this.state.filterField
-        }, showIdColumn ? /*#__PURE__*/React.createElement("option", {
+        }, /*#__PURE__*/React.createElement("option", {
+          disabled: true,
+          value: ""
+        }, LocaleUtils.tr("common.select")), showIdColumn ? /*#__PURE__*/React.createElement("option", {
           value: "<id>"
         }, this.translateFieldName(primaryKey)) : null, fields.map(function (field) {
           return /*#__PURE__*/React.createElement("option", {
@@ -1239,6 +1250,7 @@ _defineProperty(AttributeTableWidget, "propTypes", {
   mapCrs: PropTypes.string,
   mapScales: PropTypes.array,
   readOnly: PropTypes.bool,
+  refreshLayer: PropTypes.func,
   removeLayer: PropTypes.func,
   setCurrentTask: PropTypes.func,
   setCurrentTaskBlocked: PropTypes.func,
@@ -1279,7 +1291,7 @@ _defineProperty(AttributeTableWidget, "defaultState", {
   originalFeatureProps: null,
   pageSize: 50,
   currentPage: 0,
-  filterField: "id",
+  filterField: "",
   filterOp: "~",
   filterVal: "",
   sortField: null,
@@ -1302,6 +1314,7 @@ export default connect(function (state) {
   };
 }, {
   addLayerFeatures: addLayerFeatures,
+  refreshLayer: refreshLayer,
   removeLayer: removeLayer,
   setCurrentTask: setCurrentTask,
   setCurrentTaskBlocked: setCurrentTaskBlocked,

package/components/CoordinateDisplayer.js

@@ -37,9 +37,11 @@ var CoordinateDisplayer = /*#__PURE__*/function (_React$Component) {
       mousePos: null
     });
     _defineProperty(_this, "getMapMousePos", function (ev) {
-      _this.setState({
-        mousePos: ev.coordinate
-      });
+      if (ev.coordinate) {
+        _this.setState({
+          mousePos: ev.coordinate
+        });
+      }
     });
     return _this;
   }

package/components/IdentifyViewer.js

@@ -620,9 +620,11 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       var inlineExtaAttribs = false;
       var featureReports = _this.state.reports[layerid] || [];
       if (feature.featurereport) {
+        var parts = feature.featurereport.split(".");
         featureReports.push({
           title: null,
-          template: feature.featurereport
+          template: parts.shift(),
+          format: parts.join(".")
         });
       }
       if (feature.type === "text") {
@@ -768,7 +770,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       }) : null, /*#__PURE__*/React.createElement("span", null, [_this.props.showLayerTitles ? feature.layertitle : "", feature.displayname].filter(Boolean).join(": ")), zoomToFeatureButton, /*#__PURE__*/React.createElement(Icon, {
         icon: "info-sign",
         onClick: function onClick() {
-          return _this.showLayerInfo(layerid);
+          return _this.showLayerInfo(layerid, feature.layerinfo);
         }
       }), /*#__PURE__*/React.createElement(Icon, {
         icon: "trash",
@@ -1122,12 +1124,15 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
         });
       });
     });
-    _defineProperty(_this, "showLayerInfo", function (layer) {
+    _defineProperty(_this, "showLayerInfo", function (layer, infolayer) {
       var _layer$split = layer.split('#'),
         _layer$split2 = _slicedToArray(_layer$split, 2),
         layerUrl = _layer$split2[0],
         layerName = _layer$split2[1];
-      var match = LayerUtils.searchLayer(_this.props.layers, 'url', layerUrl, 'name', layerName);
+      if (!infolayer) {
+        infolayer = layerName;
+      }
+      var match = LayerUtils.searchLayer(_this.props.layers, 'url', layerUrl, 'name', infolayer);
       if (match) {
         _this.props.setActiveLayerInfo(match.layer, match.sublayer);
       }
@@ -1154,7 +1159,8 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       text = DOMPurify.sanitize(text, {
         ADD_ATTR: ['target'],
         ADD_TAGS: ["iframe"],
-        FORCE_BODY: true
+        FORCE_BODY: true,
+        ALLOW_UNKNOWN_PROTOCOLS: true
       }).replace('&#10;', '<br />');
       var options = {
         replace: function replace(node) {

package/components/QtDesignerForm.js

@@ -572,7 +572,7 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
         }, inputConstraints, {
           style: fontStyle,
           type: "date",
-          value: value
+          value: value.split("T")[0]
         }));
       } else if (widget["class"] === "QTimeEdit") {
         return /*#__PURE__*/React.createElement("input", _extends({

package/components/SideBar.js

@@ -157,11 +157,11 @@ var SideBar = /*#__PURE__*/function (_React$Component) {
         onPointerDown: this.startSidebarResize
       }), /*#__PURE__*/React.createElement("div", {
         className: "sidebar-titlebar"
-      }, this.state.render ? this.props.extraBeforeContent : null, /*#__PURE__*/React.createElement(Icon, {
+      }, this.state.render ? this.props.extraBeforeContent : null, this.props.icon ? /*#__PURE__*/React.createElement(Icon, {
         className: "sidebar-titlebar-icon",
         icon: this.props.icon,
         size: "large"
-      }), /*#__PURE__*/React.createElement("span", {
+      }) : null, /*#__PURE__*/React.createElement("span", {
         className: "sidebar-titlebar-title"
       }, this.props.title), this.state.render ? this.props.extraTitlebarContent : null, /*#__PURE__*/React.createElement("span", {
         className: "sidebar-titlebar-spacer"

package/components/map/OlMap.js

@@ -185,7 +185,8 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
         constrainRotation: false,
         enableRotation: enableRotation !== false,
         rotation: MapUtils.degreesToRadians(rotation) || 0,
-        extent: extent
+        extent: extent,
+        constrainOnlyCenter: _this.props.mapOptions.constrainOnlyCenter || false
       };
       return new ol.View(viewOptions);
     });
@@ -320,6 +321,11 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
         if (prevProps.bbox.rotation !== this.props.bbox.rotation) {
           view.setRotation(this.props.bbox.rotation);
         }
+        if (prevProps.fullExtent !== this.props.fullExtent) {
+          this.setState({
+            rebuildView: true
+          });
+        }
       }
       if (this.state.rebuildView) {
         this.setState({

package/components/map3d/Map3D.js

@@ -51,7 +51,9 @@ import axios from 'axios';
 import { fromUrl } from "geotiff";
 import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
-import { Vector2, CubeTextureLoader, Group, Raycaster, Mesh, Box3, Vector3, Matrix4 } from 'three';
+import * as THREE from 'three';
+import { Vector2, CubeTextureLoader, Group, Raycaster, Mesh, Box3, Vector3, Matrix4, EventDispatcher, Points } from 'three';
+import { computeBoundsTree, disposeBoundsTree, computeBatchedBoundsTree, disposeBatchedBoundsTree, acceleratedRaycast } from 'three-mesh-bvh';
 import { GLTFExporter } from 'three/addons/exporters/GLTFExporter.js';
 import { GLTFLoader } from 'three/addons/loaders/GLTFLoader';
 import { v4 as uuidv4 } from 'uuid';
@@ -73,6 +75,12 @@ import MapControls3D from './MapControls3D';
 import { updateObjectLabel } from './utils/MiscUtils3D';
 import Tiles3DStyle from './utils/Tiles3DStyle';
 import './style/Map3D.css';
+THREE.BufferGeometry.prototype.computeBoundsTree = computeBoundsTree;
+THREE.BufferGeometry.prototype.disposeBoundsTree = disposeBoundsTree;
+THREE.Mesh.prototype.raycast = acceleratedRaycast;
+THREE.BatchedMesh.prototype.computeBoundsTree = computeBatchedBoundsTree;
+THREE.BatchedMesh.prototype.disposeBoundsTree = disposeBatchedBoundsTree;
+THREE.BatchedMesh.prototype.raycast = acceleratedRaycast;
 
 // Ensures onUnload is called *after* all other children have unmounted
 var UnloadWrapper = /*#__PURE__*/function (_React$Component) {
@@ -138,7 +146,10 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         removeSceneObject: function removeSceneObject(objectId) {},
         updateSceneObject: function updateSceneObject(objectId, options, flags) {},
         zoomToObject: function zoomToObject(objectId) {},
+        objectIsVisible: function objectIsVisible(objectId) {},
+        objectContainsPoints: function objectContainsPoints(object) {},
         getMap: function getMap() {},
+        computeBoundsTree: function computeBoundsTree(object) {},
         setViewToExtent: function setViewToExtent(bounds, angle) {},
         getTerrainHeightFromDTM: function getTerrainHeightFromDTM(scenePos) {},
         getTerrainHeightFromMap: function getTerrainHeightFromMap(scenePos) {},
@@ -175,9 +186,11 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         // Nothing changed
         return;
       }
-      var dtm = _this2.getLayer("__dtm");
-      if (visibility !== dtm.visible) {
-        dtm.visible = visibility;
+      if (visibility !== !!_this2.map.backgroundOpacity) {
+        var dtm = _this2.getLayer("__dtm");
+        if (dtm) {
+          dtm.visible = visibility;
+        }
         _this2.map.receiveShadow = visibility;
         _this2.map.backgroundOpacity = visibility ? 1 : 0;
         _this2.instance.notifyChange(_this2.map);
@@ -477,6 +490,10 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         scene.userData.tilesetName = objectId;
         scene.userData.featureIdAttr = "id";
         Tiles3DStyle.applyTileStyle(scene, tiles.userData, _this2.state.sceneContext);
+        if (_this2.objectContainsPoints(tiles)) {
+          tiles.pointSize = _this2.state.sceneContext.settings.pointSize;
+        }
+        _this2.computeBoundsTree(scene);
         _this2.instance.notifyChange(tiles);
       });
       // Show/hide labels when tile visibility changes
@@ -500,12 +517,16 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       var callback = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : null;
       var loader = new GLTFLoader();
       var processor = function processor(gltf) {
+        var root = gltf.scene;
+        if (root.children.length === 1 && root.children[0].isGroup) {
+          root = root.children[0];
+        }
         // GLTF is Y-UP, we need Z-UP
-        gltf.scene.rotation.x = Math.PI / 2;
-        gltf.scene.updateMatrixWorld(true);
-        gltf.scene.castShadow = true;
-        gltf.scene.receiveShadow = true;
-        gltf.scene.traverse(function (c) {
+        root.rotation.x += Math.PI / 2;
+        root.updateMatrixWorld(true);
+        root.castShadow = true;
+        root.receiveShadow = true;
+        root.traverse(function (c) {
           if (c.geometry) {
             c.castShadow = true;
             c.receiveShadow = true;
@@ -514,19 +535,18 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         });
 
         // Shift root position to center of object
-        gltf.scene.updateMatrixWorld(true);
-        var box = new Box3().setFromObject(gltf.scene);
+        var box = new Box3().setFromObject(root);
         var centerWorld = box.getCenter(new Vector3());
         centerWorld.z = box.min.z;
-        var centerLocal = gltf.scene.worldToLocal(centerWorld.clone());
-        gltf.scene.position.add(centerWorld);
+        var centerLocal = root.worldToLocal(centerWorld.clone());
+        root.position.add(centerWorld);
 
         // Offset children back so the world positions remain unchanged
-        gltf.scene.children.forEach(function (child) {
+        root.children.forEach(function (child) {
           child.position.sub(centerLocal);
         });
-        gltf.scene.updateMatrixWorld(true);
-        _this2.addSceneObject(objectId, gltf.scene, addToLayerTree, treeOptions, showEditTool);
+        root.updateMatrixWorld(true);
+        _this2.addSceneObject(objectId, root, addToLayerTree, treeOptions, showEditTool);
         callback === null || callback === void 0 || callback();
       };
       if (typeof dataOrUrl === 'string') {
@@ -541,6 +561,12 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         });
       }
     });
+    _defineProperty(_this2, "computeBoundsTree", function (group) {
+      group.traverse(function (c) {
+        var _c$geometry, _c$geometry$computeBo;
+        (_c$geometry = c.geometry) === null || _c$geometry === void 0 || (_c$geometry$computeBo = _c$geometry.computeBoundsTree) === null || _c$geometry$computeBo === void 0 || _c$geometry$computeBo.call(_c$geometry);
+      });
+    });
     _defineProperty(_this2, "addSceneObject", function (objectId, object) {
       var addToLayerTree = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var treeOptions = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
@@ -553,6 +579,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       _this2.objectMap[objectId] = object;
       _this2.instance.notifyChange(object);
       if (addToLayerTree) {
+        _this2.computeBoundsTree(object);
         _this2.setState(function (state) {
           var newObjectTree = _objectSpread({}, state.sceneContext.objectTree);
           newObjectTree["null"] = _objectSpread(_objectSpread({}, newObjectTree["null"]), {}, {
@@ -562,7 +589,8 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
             objectId: objectId,
             parent: null,
             visibility: true,
-            opacity: 255
+            opacity: 255,
+            snap: true
           }, treeOptions);
           return {
             sceneContext: _objectSpread(_objectSpread({}, state.sceneContext), {}, {
@@ -749,6 +777,26 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         _this2.state.sceneContext.setViewToExtent(bounds, 0);
       }
     });
+    _defineProperty(_this2, "objectIsVisible", function (objectId) {
+      var objectTree = _this2.state.sceneContext.objectTree;
+      var options = objectTree[objectId];
+      var isVisible = options.opacity > 0 && options.visibility;
+      for (var curId = options.parent; isVisible && curId !== undefined; curId = objectTree[curId].parent) {
+        isVisible && (isVisible = objectTree[curId].visibility);
+      }
+      return isVisible;
+    });
+    _defineProperty(_this2, "objectContainsPoints", function (object) {
+      var containsPoints = false;
+      if (object !== null && object !== void 0 && object.tiles) {
+        object.traverse(function (child) {
+          if (child instanceof Points) {
+            containsPoints = true;
+          }
+        });
+      }
+      return containsPoints;
+    });
     _defineProperty(_this2, "getMap", function () {
       return _this2.map;
     });
@@ -770,7 +818,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       }
     });
     _defineProperty(_this2, "setupInstance", function () {
-      var _this2$props$theme$ma, _this2$props$theme$ma2, _this2$props$theme$ma3, _this2$props$theme$ma4, _this2$props$theme$ma5, _this2$props$theme$ma8, _this2$props$theme$ma9, _this2$props$theme$ma0, _this2$props$theme$ma1;
+      var _this2$props$theme$ma, _this2$props$theme$ma2, _this2$props$theme$ma3, _this2$props$theme$ma4, _this2$props$theme$ma7;
       if (_this2.instance) {
         _this2.disposeInstance();
       }
@@ -794,7 +842,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       _this2.instance.add(_this2.sceneObjectGroup);
 
       // Setup map
-      var initialBbox = (_this2$props$theme$ma = (_this2$props$theme$ma2 = _this2.props.theme.map3d) === null || _this2$props$theme$ma2 === void 0 ? void 0 : _this2$props$theme$ma2.extent) !== null && _this2$props$theme$ma !== void 0 ? _this2$props$theme$ma : _this2.props.theme.initialBbox;
+      var initialBbox = (_this2$props$theme$ma = _this2.props.theme.map3d.extent) !== null && _this2$props$theme$ma !== void 0 ? _this2$props$theme$ma : _this2.props.theme.initialBbox;
       var bounds = CoordinatesUtils.reprojectBbox(initialBbox.bounds, initialBbox.crs, projection);
       var extent = new Extent(crs, bounds[0], bounds[2], bounds[1], bounds[3]);
       _this2.map = new Map({
@@ -819,16 +867,16 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       _this2.instance.scene.background = cubeTexture;
 
       // Setup elevation
-      var demUrl = MiscUtils.resolveAssetsPath((_this2$props$theme$ma3 = (_this2$props$theme$ma4 = _this2.props.theme.map3d) === null || _this2$props$theme$ma4 === void 0 || (_this2$props$theme$ma4 = _this2$props$theme$ma4.dtm) === null || _this2$props$theme$ma4 === void 0 ? void 0 : _this2$props$theme$ma4.url) !== null && _this2$props$theme$ma3 !== void 0 ? _this2$props$theme$ma3 : "");
-      var demCrs = CoordinateSystem.fromSrid(((_this2$props$theme$ma5 = _this2.props.theme.map3d) === null || _this2$props$theme$ma5 === void 0 || (_this2$props$theme$ma5 = _this2$props$theme$ma5.dtm) === null || _this2$props$theme$ma5 === void 0 ? void 0 : _this2$props$theme$ma5.crs) || "EPSG:3857");
+      var demUrl = MiscUtils.resolveAssetsPath((_this2$props$theme$ma2 = (_this2$props$theme$ma3 = _this2.props.theme.map3d.dtm) === null || _this2$props$theme$ma3 === void 0 ? void 0 : _this2$props$theme$ma3.url) !== null && _this2$props$theme$ma2 !== void 0 ? _this2$props$theme$ma2 : "");
+      var demCrs = CoordinateSystem.fromSrid(((_this2$props$theme$ma4 = _this2.props.theme.map3d.dtm) === null || _this2$props$theme$ma4 === void 0 ? void 0 : _this2$props$theme$ma4.crs) || "EPSG:3857");
       if (demUrl) {
-        var _this2$props$theme$ma6, _this2$props$theme$ma7;
+        var _this2$props$theme$ma5, _this2$props$theme$ma6;
         var demSource = new GeoTIFFSource({
           url: demUrl,
           crs: demCrs
         });
-        var demMin = (_this2$props$theme$ma6 = _this2.props.theme.map3d.dtm.min) !== null && _this2$props$theme$ma6 !== void 0 ? _this2$props$theme$ma6 : undefined;
-        var demMax = (_this2$props$theme$ma7 = _this2.props.theme.map3d.dtm.max) !== null && _this2$props$theme$ma7 !== void 0 ? _this2$props$theme$ma7 : undefined;
+        var demMin = (_this2$props$theme$ma5 = _this2.props.theme.map3d.dtm.min) !== null && _this2$props$theme$ma5 !== void 0 ? _this2$props$theme$ma5 : undefined;
+        var demMax = (_this2$props$theme$ma6 = _this2.props.theme.map3d.dtm.max) !== null && _this2$props$theme$ma6 !== void 0 ? _this2$props$theme$ma6 : undefined;
         var elevationLayer = new ElevationLayer({
           name: 'dem',
           extent: extent,
@@ -843,7 +891,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
 
       // Collect baselayers
       var externalLayers = {};
-      var baseLayers = ThemeUtils.createThemeBackgroundLayers(((_this2$props$theme$ma8 = _this2.props.theme.map3d) === null || _this2$props$theme$ma8 === void 0 ? void 0 : _this2$props$theme$ma8.basemaps) || [], _this2.props.themes, null, externalLayers);
+      var baseLayers = ThemeUtils.createThemeBackgroundLayers(_this2.props.theme.map3d.basemaps || [], _this2.props.themes, null, externalLayers);
       baseLayers.push({
         type: "blank",
         name: "",
@@ -872,14 +920,14 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       // Collect color layers
       var colorLayers = _this2.collectColorLayers([], []);
       _this2.objectMap = {};
-      var objects = ((_this2$props$theme$ma9 = _this2.props.theme.map3d) === null || _this2$props$theme$ma9 === void 0 ? void 0 : _this2$props$theme$ma9.objects) || [];
+      var objects = _toConsumableArray((_this2$props$theme$ma7 = _this2.props.theme.map3d.objects) !== null && _this2$props$theme$ma7 !== void 0 ? _this2$props$theme$ma7 : []);
       // Convert legacy flat lists to tree
-      (((_this2$props$theme$ma0 = _this2.props.theme.map3d) === null || _this2$props$theme$ma0 === void 0 ? void 0 : _this2$props$theme$ma0.tiles3d) || []).forEach(function (entry) {
+      (_this2.props.theme.map3d.tiles3d || []).forEach(function (entry) {
         objects.push(_objectSpread(_objectSpread({}, entry), {}, {
           type: "tiles3d"
         }));
       });
-      (((_this2$props$theme$ma1 = _this2.props.theme.map3d) === null || _this2$props$theme$ma1 === void 0 ? void 0 : _this2$props$theme$ma1.objects3d) || []).forEach(function (entry) {
+      (_this2.props.theme.map3d.objects3d || []).forEach(function (entry) {
         objects.push(_objectSpread(_objectSpread({}, entry), {}, {
           type: "object3d"
         }));
@@ -908,12 +956,13 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
             objectTree[groupId].children = _buildObjectTree(entry.items, groupId);
             nodeIds.push(groupId);
           } else if (entry.type === "tiles3d") {
-            var _entry$title, _entry$visibility2;
+            var _entry$title, _entry$visibility2, _entry$snap;
             objectTree[entry.name] = {
               objectId: entry.name,
               parent: parentId,
               title: (_entry$title = entry.title) !== null && _entry$title !== void 0 ? _entry$title : entry.name,
               visibility: (_entry$visibility2 = entry.visibility) !== null && _entry$visibility2 !== void 0 ? _entry$visibility2 : true,
+              snap: (_entry$snap = entry.snap) !== null && _entry$snap !== void 0 ? _entry$snap : true,
               opacity: 255,
               styles: entry.styles || {},
               style: entry.style || Object.keys(entry.styles || {})[0] || null
@@ -930,12 +979,13 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
             _this2.applySceneObjectState(entry.name, objectTree[entry.name], {}, objectTree);
             nodeIds.push(entry.name);
           } else if (entry.type === "object3d") {
-            var _entry$title2, _entry$visibility3;
+            var _entry$title2, _entry$visibility3, _entry$snap2;
             objectTree[entry.name] = {
               objectId: entry.name,
               parent: parentId,
               title: (_entry$title2 = entry.title) !== null && _entry$title2 !== void 0 ? _entry$title2 : entry.name,
               visibility: (_entry$visibility3 = entry.visibility) !== null && _entry$visibility3 !== void 0 ? _entry$visibility3 : true,
+              snap: (_entry$snap2 = entry.snap) !== null && _entry$snap2 !== void 0 ? _entry$snap2 : true,
               opacity: 255
             };
             _this2.importObject3D(MiscUtils.resolveAssetsPath(entry.url), entry.name, false, {}, false, function () {
@@ -964,7 +1014,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       });
 
       // Inspector
-      if (["1", "true"].includes((UrlParams.getParam("inspector") || "").toLowerCase())) {
+      if ((process.env.NODE_ENV !== "production" || _this2.props.forceAllowInspector) && ["1", "true"].includes((UrlParams.getParam("inspector") || "").toLowerCase())) {
         var inspectorContainer = document.createElement("div");
         inspectorContainer.className = 'map3d-inspector';
         _this2.container.appendChild(inspectorContainer);
@@ -1319,6 +1369,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
     _this2.sceneObjectGroup = null;
     _this2.objectMap = {};
     _this2.tilesetStyles = {};
+    _this2.state.sceneContext.eventDispatcher = new EventDispatcher();
     _this2.state.sceneContext.addLayer = _this2.addLayer;
     _this2.state.sceneContext.getLayer = _this2.getLayer;
     _this2.state.sceneContext.removeLayer = _this2.removeLayer;
@@ -1331,13 +1382,17 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
     _this2.state.sceneContext.removeSceneObject = _this2.removeSceneObject;
     _this2.state.sceneContext.updateSceneObject = _this2.updateSceneObject;
     _this2.state.sceneContext.zoomToObject = _this2.zoomToObject;
+    _this2.state.sceneContext.objectIsVisible = _this2.objectIsVisible;
+    _this2.state.sceneContext.objectContainsPoints = _this2.objectContainsPoints;
     _this2.state.sceneContext.getMap = _this2.getMap;
+    _this2.state.computeBoundsTree = _this2.computeBoundsTree;
     _this2.state.sceneContext.getTerrainHeightFromDTM = _this2.getTerrainHeightFromDTM;
     _this2.state.sceneContext.getTerrainHeightFromMap = _this2.getTerrainHeightFromMap;
     _this2.state.sceneContext.getSceneIntersection = _this2.getSceneIntersection;
     _this2.state.sceneContext.getSetting = _this2.getSetting;
     _this2.state.sceneContext.setSetting = _this2.setSetting;
     _this2.state.sceneContext.settings.fov = props.defaultFov;
+    _this2.state.sceneContext.settings.pointSize = props.defaultPointSize;
     _this2.state.sceneContext.settings.sceneQuality = props.defaultSceneQuality;
     registerPermalinkDataStoreHook("map3d", _this2.store3dState);
     return _this2;
@@ -1389,16 +1444,22 @@ 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, _ref12) {
+              collisionObjects: Object.keys(state.sceneContext.objectTree).reduce(function (res, objectId) {
+                var obj = _this3.objectMap[objectId];
+                if (obj !== null && obj !== void 0 && obj.visible) {
+                  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;
+              }, []),
+              snapObjects: Object.entries(state.sceneContext.objectTree).reduce(function (res, _ref12) {
                 var _ref13 = _slicedToArray(_ref12, 2),
-                  objectid = _ref13[0],
+                  objectId = _ref13[0],
                   entry = _ref13[1];
-                if (entry.visibility && entry.opacity > 0) {
-                  var obj = _this3.objectMap[entry.objectId];
-                  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);
-                  }
+                var obj = _this3.objectMap[objectId];
+                if (obj !== null && obj !== void 0 && obj.visible && entry.snap) {
+                  var _obj$tiles$group2, _obj$tiles2;
+                  res.push((_obj$tiles$group2 = (_obj$tiles2 = obj.tiles) === null || _obj$tiles2 === void 0 ? void 0 : _obj$tiles2.group) !== null && _obj$tiles$group2 !== void 0 ? _obj$tiles$group2 : obj);
                 }
                 return res;
               }, [])
@@ -1410,6 +1471,15 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         this.instance.view.camera.fov = this.state.sceneContext.settings.fov;
         this.instance.notifyChange(this.instance.view.camera);
       }
+      if (this.state.sceneContext.settings.pointSize !== prevState.sceneContext.settings.pointSize) {
+        Object.values(this.state.sceneContext.objectTree).map(function (entry) {
+          var obj = _this3.state.sceneContext.getSceneObject(entry.objectId);
+          if (_this3.objectContainsPoints(obj)) {
+            obj.pointSize = _this3.state.sceneContext.settings.pointSize;
+            _this3.instance.notifyChange(obj);
+          }
+        });
+      }
       if (this.state.sceneContext.settings.sceneQuality !== prevState.sceneContext.settings.sceneQuality) {
         var quality = Math.max(20, this.state.sceneContext.settings.sceneQuality);
         this.map.segments = Math.pow(2, Math.floor(quality / 20));
@@ -1456,7 +1526,9 @@ _defineProperty(Map3D, "contextType", MapContainerPortalContext);
 _defineProperty(Map3D, "propTypes", {
   controlsPosition: PropTypes.string,
   defaultFov: PropTypes.number,
+  defaultPointSize: PropTypes.number,
   defaultSceneQuality: PropTypes.number,
+  forceAllowInspector: PropTypes.bool,
   innerRef: PropTypes.func,
   layers: PropTypes.array,
   mouseButtons: PropTypes.object,
@@ -1487,8 +1559,10 @@ _defineProperty(Map3D, "defaultSceneState", {
   colorLayers: {},
   objectTree: {},
   collisionObjects: [],
+  snapObjects: [],
   settings: {
     fov: 30,
+    pointSize: 0,
     sceneQuality: 100
   },
   sceneId: null,

package/components/map3d/MapControls3D.js

@@ -33,7 +33,7 @@ import { connect } from 'react-redux';
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import { MOUSE, Vector3 } from 'three';
-import ConfigUtils from '../../utils/ConfigUtils';
+import personSvg from '../../resources/person.svg';
 import { UrlParams } from '../../utils/PermaLinkUtils';
 import Icon from '../Icon';
 import { MapButtonPortalContext } from '../PluginsContainer';
@@ -85,8 +85,7 @@ var MapControls3D = /*#__PURE__*/function (_React$Component) {
         _this.props.sceneContext.scene.domElement.addEventListener('click', _this.setupFirstPerson, {
           once: true
         });
-        var cursor = ConfigUtils.getAssetsPath() + "/img/person.svg";
-        _this.props.sceneContext.scene.domElement.style.cursor = "url(".concat(cursor, "), pointer");
+        _this.props.sceneContext.scene.domElement.style.cursor = "url(".concat(personSvg, "), pointer");
         _this.setState({
           pickingFirstPerson: true
         });

package/components/map3d/drawtool/CreateTool3D.js

@@ -108,12 +108,13 @@ var CreateTool3D = /*#__PURE__*/function (_React$Component) {
         var mesh = new Mesh(geometry, material);
         mesh.castShadow = true;
         mesh.receiveShadow = true;
-        drawGroup.add(mesh);
         var pos = _this.drawCursor.points[0];
         mesh.position.copy(new Vector3(Math.round(pos.x), Math.round(pos.y), Math.floor(pos.z + 0.5 * s)));
         mesh.updateMatrixWorld();
+        drawGroup.attach(mesh);
         _this.props.sceneContext.scene.notifyChange();
         _this.props.objectCreated(mesh);
+        _this.props.sceneContext.computeBoundsTree(mesh);
       }
     });
     return _this;