qwc2 2026.3.18 → 2026.3.30

package/README.md

@@ -1,4 +1,4 @@
-![Logo](https://raw.githubusercontent.com/qgis/qwc2/refs/heads/master/static/assets/img/qwc-logo.svg) QGIS Web Client
+![Logo](https://raw.githubusercontent.com/qgis/qwc2/refs/heads/master/static/assets/img/qwc-logo.svg) QGIS Web Client · [qwc.app](https://qwc.app)
 =================
 
 ## Introduction
@@ -10,28 +10,7 @@ The `qwc2` NPM package can be used as a dependency to build a custom QWC applica
 
 ### Main Features
 
-- Modular and easily configurable and extensible
-- Responsive, separately configurable for desktop and mobile devices
-- Theme switcher
-- Search with configurable search providers
-- Layer tree
-  * Toggle layers and groups
-  * Change layer order and opacity
-  * Import external WMS/WFS/WMTS/GeoJSON/KML layers
-  * Compare layers
-- Feature info
-- Printing using QGIS print layouts
-- Share permalinks
-- Bookmarks
-- Measuring tools
-- Height profile
-- Redlining
-- Editing and attribute table
-- Attribute table
-- Export map (raster images, DXF)
-- Time manager for temporal layers
-- Themeable with color schemes
-- [Additional plugins!](https://qwc-services.github.io/master/references/qwc2_plugins/)
+See [qwc.app/features](https://qwc.app/features).
 
 ## Quick start
 

package/components/AppMenu.js

@@ -72,8 +72,8 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
         _this.props.setCurrentTask(null);
       }
       _this.props.onMenuToggled(!_this.state.menuVisible);
-      if (_this.props.menuCompact) {
-        _this.props.setMenuMargin(!_this.state.menuVisible ? MiscUtils.convertEmToPx(3.75) : 0, 0);
+      if (_this.props.menuDisplayMode !== "normal") {
+        _this.props.setMenuMargin(!_this.state.menuVisible ? MiscUtils.convertEmToPx(3.5) : 0, 0);
       }
       _this.setState(function (state) {
         return {
@@ -84,7 +84,7 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
       });
     });
     _defineProperty(_this, "checkCloseMenu", function (ev) {
-      if (_this.menuEl && !_this.menuEl.contains(ev.target) && !_this.props.keepMenuOpen) {
+      if (_this.menuEl && !_this.menuEl.contains(ev.target) && _this.props.menuDisplayMode === "normal") {
         _this.toggleMenu();
         MiscUtils.killEvent(ev);
       }
@@ -98,7 +98,7 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
       });
     });
     _defineProperty(_this, "onMenuitemClicked", function (item) {
-      if (!_this.props.keepMenuOpen && _this.state.menuVisible) {
+      if (_this.props.menuDisplayMode === "normal" && _this.state.menuVisible) {
         _this.toggleMenu();
       }
       if (item.url) {
@@ -111,6 +111,10 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "renderMenuItems", function (items, level, filter) {
       var submenu = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
       return (items || []).map(function (item) {
+        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 comment = item.comment ? LocaleUtils.tr.apply(LocaleUtils, ["appmenu.items." + item.key + (item.mode || "") + "_comment"].concat(_toConsumableArray(trargs))) : "";
+        var labelclass = _this.props.menuDisplayMode === "icononly" ? "appmenu-menu-item-tooltip" : "appmenu-menu-item-label";
         if (item.subitems) {
           var _item$key;
           var expanded = filter || _this.state.submenusVisible[level] === item.key;
@@ -123,7 +127,6 @@ 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,
@@ -137,14 +140,12 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
             tabIndex: 0
           }, /*#__PURE__*/React.createElement(Icon, {
             icon: item.icon,
-            size: "xlarge",
-            title: _this.props.menuIconOnly ? label : null
-          }), !_this.props.menuIconOnly ? label : null), subitems];
+            size: "xlarge"
+          }), /*#__PURE__*/React.createElement("span", {
+            className: labelclass
+          }, label)), 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 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
@@ -162,13 +163,10 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
               tabIndex: 0
             }, /*#__PURE__*/React.createElement(Icon, {
               icon: item.icon,
-              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", {
-              className: "appmenu-menu-item-comment"
-            }, comment) : null) : null);
+              size: "xlarge"
+            }), /*#__PURE__*/React.createElement("span", {
+              className: labelclass
+            }, label));
           }
           return null;
         }
@@ -215,7 +213,7 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
         MiscUtils.killEvent(ev);
       } else if (ev.key === 'Escape') {
         var _this$menuBtn, _this$menuBtn$focus;
-        if (!_this.props.menuCompact) {
+        if (_this.props.menuDisplayMode === "normal") {
           _this.toggleMenu();
         }
         (_this$menuBtn = _this.menuBtn) === null || _this$menuBtn === void 0 || (_this$menuBtn$focus = _this$menuBtn.focus) === null || _this$menuBtn$focus === void 0 || _this$menuBtn$focus.call(_this$menuBtn);
@@ -237,7 +235,7 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
   return _createClass(AppMenu, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      if (this.props.showOnStartup) {
+      if (this.props.showOnStartup || this.props.menuDisplayMode !== "normal") {
         this.toggleMenu();
       }
       this.addKeyBindings(this.props.menuItems);
@@ -249,7 +247,7 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps, prevState) {
       var _this2 = this;
-      if (this.state.menuVisible && !prevState.menuVisible && !this.props.menuCompact) {
+      if (this.state.menuVisible && !prevState.menuVisible) {
         // Need to wait until slide in transition is over
         setTimeout(function () {
           var _this2$filterfield, _this2$filterfield$fo;
@@ -259,7 +257,7 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
         setTimeout(function () {
           return document.addEventListener('click', _this2.checkCloseMenu);
         }, 0);
-      } else if (prevState.menuVisible && !this.state.menuVisible && !this.props.menuCompact) {
+      } else if (prevState.menuVisible && !this.state.menuVisible) {
         document.removeEventListener('click', this.checkCloseMenu);
       }
     }
@@ -281,13 +279,13 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
         _this$props$buttonCon;
       var isMobile = ConfigUtils.isMobile();
       var visible = !this.props.currentTaskBlocked && this.state.menuVisible;
-      var showLabel = !this.props.menuCompact && !isMobile;
+      var showLabel = this.props.menuDisplayMode === "normal" && !isMobile;
       var className = classnames({
         "AppMenu": true,
         "appmenu-blocked": this.props.currentTaskBlocked,
         "appmenu-visible": visible,
-        "appmenu-compact": this.props.menuCompact,
-        "appmenu-icononly": this.props.menuIconOnly,
+        "appmenu-compact": this.props.menuDisplayMode === "compact",
+        "appmenu-icononly": this.props.menuDisplayMode === "icononly",
         "appmenu-nolabel": !showLabel
       });
       var filter = this.state.filter ? new RegExp(removeDiacritics(this.state.filter).replace(/[-[\]/{}()*+?.\\^$|]/g, "\\$&"), "i") : null;
@@ -313,6 +311,8 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
       }))]), /*#__PURE__*/React.createElement("div", {
         className: "appmenu-menu-container",
         tabIndex: -1
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "appmenu-menu-aligner"
       }, /*#__PURE__*/React.createElement("div", {
         className: "appmenu-menu",
         inert: !visible,
@@ -321,7 +321,7 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
           _this3.menuEl = el;
           MiscUtils.setupKillTouchEvents(el);
         }
-      }, this.props.showFilterField ? /*#__PURE__*/React.createElement("div", {
+      }, this.props.showFilterField && this.props.menuDisplayMode !== "icononly" ? /*#__PURE__*/React.createElement("div", {
         className: "appmenu-menu-item appmenu-menu-item-filter",
         onFocus: this.focusFilterField,
         onKeyDown: this.keyNav,
@@ -352,7 +352,7 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
           });
         },
         role: "suffix"
-      }))) : null, this.renderMenuItems(this.props.menuItems, 0, filter))));
+      }))) : null, this.renderMenuItems(this.props.menuItems, 0, filter)))));
     }
   }]);
 }(React.Component);
@@ -362,8 +362,7 @@ _defineProperty(AppMenu, "propTypes", {
   buttonContents: PropTypes.object,
   buttonLabel: PropTypes.string,
   currentTaskBlocked: PropTypes.bool,
-  keepMenuOpen: PropTypes.bool,
-  menuCompact: PropTypes.bool,
+  menuDisplayMode: PropTypes.string,
   menuIconOnly: PropTypes.bool,
   menuItems: PropTypes.array,
   onMenuToggled: 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';
@@ -388,7 +388,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       };
       newState[stateField] = val;
       // Reset page if a reload is triggered (either filter changed with a set filter value, or filter value cleared)
-      if (newState.filterVal || _this.state.filterVal && !newState.filterVal) {
+      if (newState.filterField && (newState.filterVal || _this.state.filterVal && !newState.filterVal)) {
         newState.currentPage = 0;
         _this.reload(_this.state.selectedLayer, false, newState);
       } else {
@@ -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,
@@ -806,6 +814,13 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       if (this.state.highlightedFeature !== prevState.highlightedFeature || this.state.features !== prevState.features || this.state.selectedFeatures !== prevState.selectedFeatures) {
         this.highlightFeatures();
       }
+      if (this.state.loadedLayer !== prevState.loadedLayer && this.props.showDisplayFieldOnly) {
+        this.setState(function (state) {
+          return {
+            filterField: state.curEditConfig.displayField
+          };
+        });
+      }
     }
   }, {
     key: "componentWillUnmount",
@@ -1029,7 +1044,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 +1257,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 +1298,7 @@ _defineProperty(AttributeTableWidget, "defaultState", {
   originalFeatureProps: null,
   pageSize: 50,
   currentPage: 0,
-  filterField: "id",
+  filterField: "",
   filterOp: "~",
   filterVal: "",
   sortField: null,
@@ -1302,6 +1321,7 @@ export default connect(function (state) {
   };
 }, {
   addLayerFeatures: addLayerFeatures,
+  refreshLayer: refreshLayer,
   removeLayer: removeLayer,
   setCurrentTask: setCurrentTask,
   setCurrentTaskBlocked: setCurrentTaskBlocked,

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);
       }

package/components/SearchBox.js

@@ -1025,12 +1025,13 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
         var text = LocaleUtils.tr("search.existinglayer") + ": " + existingLayerName;
         _this.props.showNotification("existinglayer", text);
       } else {
+        var _existingLayer$role;
         var existingLayer = _this.props.layers.find(function (l) {
           return l.type === layer.type && l.url === layer.url;
         });
         _this.props.addLayer(_objectSpread(_objectSpread({}, layer), {}, {
           srcid: existingLayer === null || existingLayer === void 0 ? void 0 : existingLayer.srcid,
-          role: LayerRole.USERLAYER
+          role: (_existingLayer$role = existingLayer === null || existingLayer === void 0 ? void 0 : existingLayer.role) !== null && _existingLayer$role !== void 0 ? _existingLayer$role : LayerRole.USERLAYER
         }));
       }
       if (_this.props.searchOptions.zoomToLayers && layer.bbox) {

package/components/map3d/Map3D.js

@@ -52,7 +52,7 @@ import { fromUrl } from "geotiff";
 import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
 import * as THREE from 'three';
-import { Vector2, CubeTextureLoader, Group, Raycaster, Mesh, Box3, Vector3, Matrix4, EventDispatcher } 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';
@@ -147,6 +147,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         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) {},
@@ -489,6 +490,9 @@ 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);
       });
@@ -782,6 +786,17 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       }
       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;
     });
@@ -999,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);
@@ -1368,6 +1383,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
     _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;
@@ -1376,6 +1392,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
     _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;
@@ -1454,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));
@@ -1500,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,
@@ -1534,6 +1562,7 @@ _defineProperty(Map3D, "defaultSceneState", {
   snapObjects: [],
   settings: {
     fov: 30,
+    pointSize: 0,
     sceneQuality: 100
   },
   sceneId: null,

package/components/map3d/utils/MiscUtils3D.js

@@ -21,10 +21,10 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
  * LICENSE file in the root directory of this source tree.
  */
 
-import convexHull from 'quick-hull-2d';
 import { Box3, BufferGeometry, Matrix3, Matrix4, Mesh, Vector2, Vector3 } from 'three';
 import { MeshLine, MeshLineMaterial } from 'three.meshline';
 import { CSS2DObject } from "three/addons/renderers/CSS2DRenderer";
+import convexHull from '../../../utils/QuickHull2D';
 export function createLabelObject(text, pos, sceneContext, zoffset) {
   var yoffset = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
   var labelEl = document.createElement("span");
@@ -101,9 +101,10 @@ export function computeOBBXY(mesh) {
   var zmin = Infinity;
   var zmax = -Infinity;
   for (var i = 0; i < n; i++) {
-    pointsxy[i] = [pos.getX(i), pos.getY(i)];
-    zmin = Math.min(zmin, pos.getZ(i));
-    zmax = Math.max(zmax, pos.getZ(i));
+    var p = new Vector3(pos.getX(i), pos.getY(i), pos.getZ(i)).applyMatrix4(mesh.matrixWorld);
+    pointsxy[i] = [p.x, p.y];
+    zmin = Math.min(zmin, p.z);
+    zmax = Math.max(zmax, p.z);
   }
 
   // Compute convex hull
@@ -125,9 +126,9 @@ export function computeOBBXY(mesh) {
     var _vmin = Infinity;
     var _vmax = -Infinity;
     for (var j = 0; j < hull.length; j++) {
-      var p = _construct(Vector2, _toConsumableArray(hull[j]));
-      var pu = p.dot(_u);
-      var pv = p.dot(_v);
+      var _p = _construct(Vector2, _toConsumableArray(hull[j]));
+      var pu = _p.dot(_u);
+      var pv = _p.dot(_v);
       if (pu < _umin) _umin = pu;
       if (pu > _umax) _umax = pu;
       if (pv < _vmin) _vmin = pv;
@@ -153,12 +154,11 @@ export function computeOBBXY(mesh) {
     umax = _best.umax,
     vmin = _best.vmin,
     vmax = _best.vmax;
-  var center = new Vector3(u.x * (umin + umax) / 2 + v.x * (vmin + vmax) / 2, u.y * (umin + umax) / 2 + v.y * (vmin + vmax) / 2, (zmin + zmax) / 2).applyMatrix4(mesh.matrixWorld);
-  var normalMatrix = new Matrix3().getNormalMatrix(mesh.matrixWorld);
+  var center = new Vector3(u.x * (umin + umax) / 2 + v.x * (vmin + vmax) / 2, u.y * (umin + umax) / 2 + v.y * (vmin + vmax) / 2, (zmin + zmax) / 2);
   return {
     center: center,
-    axes: [new Vector3(u.x, u.y, 0).applyMatrix3(normalMatrix).normalize(), new Vector3(v.x, v.y, 0).applyMatrix3(normalMatrix).normalize(), new Vector3(0, 0, 1)],
-    halfSizes: new Vector3((umax - umin) / 2 * Math.hypot(u.x * mesh.scale.x, u.y * mesh.scale.y), (vmax - vmin) / 2 * Math.hypot(v.x * mesh.scale.x, v.y * mesh.scale.y), (zmax - zmin) / 2 * mesh.scale.z)
+    axes: [new Vector3(u.x, u.y, 0), new Vector3(v.x, v.y, 0), new Vector3(0, 0, 1)],
+    halfSizes: new Vector3((umax - umin) / 2, (vmax - vmin) / 2, (zmax - zmin) / 2)
   };
 }
 export var TileMeshHelper = /*#__PURE__*/function () {

package/components/style/AppMenu.css

@@ -36,10 +36,16 @@ div.AppMenu.appmenu-visible .appmenu-label {
     color: var(--app-submenu-text-color-hover);
 }
 
+div.AppMenu .appmenu-icon {
+    width: 3.5em;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
 div.AppMenu .appmenu-icon > span.icon {
     color: var(--app-menu-text-color);
     padding: 0.25em;
-    margin: 0 1em;
     border: 2px solid var(--app-menu-text-color);
     transition: color 0.25s, border-color 0.25s, background-color 0.25s;
 }
@@ -58,47 +64,52 @@ div.AppMenu div.appmenu-menu-container {
     position: absolute;
     top: 100%;
     right: 0;
-    box-shadow: 0px 2px 4px rgba(136, 136, 136, 0.5);
-    width: 20em;
-    max-width: 100vw;
+    width: 100%;
+    overflow-y: auto;
+    overflow-x: hidden;
+    height: calc(var(--plugins-container-height) - var(--topbar-height) - var(--bottombar-height));
+    pointer-events: none;
     opacity: 0;
     transform-origin: top;
     transform: scaleY(0);
     transition: transform 0.25s, opacity 0.25s;
-    overflow-y: auto;
-    max-height: calc(var(--plugins-container-height) - var(--topbar-height) - var(--bottombar-height));
-    border-radius: 0px 0px 0px var(--border-radius);
 }
 
-div.AppMenu.appmenu-compact div.appmenu-menu-container {
-    right: -11.25em;
-    width: 15em;
-    height: calc(var(--plugins-container-height) - var(--topbar-height) - var(--bottombar-height));
-    transition: transform 0.25s, opacity 0.25s, right 0.5s;
-    background: var(--app-menu-bg-color);
-    box-shadow: 0px 0px 4px rgba(136, 136, 136, 0.5);
-    top: 3.5em;
-}
-
-div.AppMenu.appmenu-icononly div.appmenu-menu-container {
-    right: 0;
-    width: auto;
+div.AppMenu.appmenu-visible div.appmenu-menu-container {
+    transform: scaleY(1);
+    opacity: 1;
 }
 
-div.AppMenu.appmenu-compact div.appmenu-menu-container:hover,
-div.AppMenu.appmenu-compact div.appmenu-menu-container:focus-within {
-    right: 0;
+div.AppMenu div.appmenu-menu-aligner {
+    display: flex;
+    justify-content: end;
 }
 
 div.AppMenu div.appmenu-menu {
+    position:  relative;
+    pointer-events: initial;
+    text-align: left;
     background-color: var(--app-menu-bg-color);
+    box-shadow: 0px 2px 4px rgba(136, 136, 136, 0.5);
     text-align: left;
-    font-size: small;
+    width: 22.22em;
+    font-size: 90%;
+    border-radius: 0px 0px 0px var(--border-radius);
 }
 
-div.AppMenu.appmenu-visible div.appmenu-menu-container {
-    transform: scaleY(1);
-    opacity: 1;
+div.AppMenu.appmenu-compact div.appmenu-menu {
+    right: -18.33em;
+    transition: right 0.5s;
+}
+
+div.AppMenu.appmenu-compact div.appmenu-menu:hover,
+div.AppMenu.appmenu-compact div.appmenu-menu:focus-within {
+    right: 0;
+}
+
+div.AppMenu.appmenu-icononly div.appmenu-menu {
+    width: 3.89em;
+    right: 0;
 }
 
 div.appmenu-menu-item {
@@ -106,6 +117,7 @@ div.appmenu-menu-item {
     align-items: center;
     color: var(--app-menu-text-color);
     font-weight: bold;
+    position: relative;
 }
 
 div.appmenu-menu-item:not(:last-child) {
@@ -126,6 +138,25 @@ div.appmenu-menu-item-comment {
     font-size: 90%;
 }
 
+span.appmenu-menu-item-tooltip {
+    position: absolute;
+    display: none;
+    background-color: var(--tooltip-bg-color);
+    border: 1px solid var(--tooltip-border-color);
+    color: var(--tooltip-text-color);
+    font-size: 75%;
+    font-weight: normal;
+    padding: 0.5em;
+    border-radius: 0.5em;
+    white-space: nowrap;
+    right: calc(100% + 0.25em);
+    z-index: 2;
+}
+
+div.appmenu-menu-item:hover span.appmenu-menu-item-tooltip {
+    display: inline;
+}
+
 div.appmenu-submenu-active,
 div.appmenu-submenu-expanded {
     background-color: var(--app-menu-bg-color-hover);