qwc2 2026.3.18 → 2026.3.24

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/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/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");

package/components/widgets/Input.js

@@ -98,7 +98,8 @@ var Input = /*#__PURE__*/function (_React$Component) {
   }], [{
     key: "getDerivedStateFromProps",
     value: function getDerivedStateFromProps(nextProps, state) {
-      var strValue = String(nextProps.value || "");
+      var _nextProps$value;
+      var strValue = String((_nextProps$value = nextProps.value) !== null && _nextProps$value !== void 0 ? _nextProps$value : "");
       if (state.value !== strValue) {
         return {
           value: strValue,

package/components/widgets/style/ListInput.css

@@ -3,6 +3,7 @@ div.ListInput {
     background-color: var(--list-bg-color);
     padding: 0.25em;
     width: 100%;
+    min-height: 2em;
 }
 
 div.list-input-value {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2026.03.18",
+    "version": "2026.03.24",
     "description": "QGIS Web Client",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",
@@ -32,7 +32,10 @@
         "@vtaits/react-color-picker": "^2.0.0",
         "any-date-parser": "^1.5.4",
         "axios": "^1.13.4",
+        "buffer": "^6.0.3",
         "chart.js": "^4.5.1",
+        "chartjs-adapter-dayjs-4": "^1.0.4",
+        "chartjs-plugin-annotation": "^3.1.0",
         "classnames": "^2.5.1",
         "clone": "^2.1.2",
         "dayjs": "^1.11.19",
@@ -71,7 +74,6 @@
         "proj4": "^2.20.2",
         "prop-types": "^15.8.1",
         "qrcode.react": "^4.2.0",
-        "quick-hull-2d": "^0.1.0",
         "randomcolor": "^0.6.2",
         "react": "^19.2.4",
         "react-chartjs-2": "^5.3.1",
@@ -85,6 +87,7 @@
         "react-swipeable": "^7.0.2",
         "redux-logger": "^3.0.6",
         "reselect": "^5.1.1",
+        "robust-orientation": "^1.2.1",
         "simplepolygon": "^2.0.4",
         "sortablejs": "^1.15.6",
         "suncalc": "^1.9.0",

package/plugins/Editing.js

@@ -618,6 +618,10 @@ var Editing = /*#__PURE__*/function (_React$Component) {
             })) {
               return null;
             }
+            var match = LayerUtils.searchLayer(_this2.props.layers, 'wms_name', mapName, 'name', layerName);
+            if (!match) {
+              return null;
+            }
             return mapName + "#" + layerName;
           });
         }).flat().filter(Boolean);

package/plugins/MapExport.js

@@ -45,6 +45,7 @@ import { setSnappingConfig } from '../actions/map';
 import Icon from '../components/Icon';
 import PrintSelection from '../components/PrintSelection';
 import SideBar from '../components/SideBar';
+import ComboBox from '../components/widgets/ComboBox';
 import NumberInput from '../components/widgets/NumberInput';
 import Spinner from '../components/widgets/Spinner';
 import ConfigUtils from '../utils/ConfigUtils';
@@ -137,14 +138,11 @@ var MapExport = /*#__PURE__*/function (_React$Component) {
       });
       var scaleChooser = null;
       if (!isEmpty(_this.props.allowedScales)) {
-        scaleChooser = /*#__PURE__*/React.createElement("select", {
+        scaleChooser = /*#__PURE__*/React.createElement(ComboBox, {
           onChange: _this.changeScale,
           value: _this.state.scale || ""
-        }, /*#__PURE__*/React.createElement("option", {
-          hidden: true,
-          value: _this.state.scale || ""
-        }, _this.state.scale || ""), _this.props.allowedScales.map(function (scale) {
-          return /*#__PURE__*/React.createElement("option", {
+        }, _this.props.allowedScales.map(function (scale) {
+          return /*#__PURE__*/React.createElement("div", {
             key: scale,
             value: scale
           }, "1 : ", scale);

package/plugins/Measure.js

@@ -60,11 +60,13 @@ var Measure = /*#__PURE__*/function (_React$Component) {
       if (_this.props.clearMeasurementsOnExit) {
         _this.props.changeMeasurementState({
           mode: 'Reset',
-          nextmode: null
+          nextmode: null,
+          measureId: null
         });
       } else {
         _this.props.changeMeasurementState({
-          mode: null
+          mode: null,
+          measureId: null
         });
       }
     });

package/plugins/Redlining.js

@@ -534,7 +534,7 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
             text: LocaleUtils.tr("common.text")
           }
         });
-      } else if (!_this.props.allowGeometryLabels) {
+      } else if (!_this.props.allowGeometryLabels || _this.props.redlining.geomType === "Text" && data.action === "Draw" && data.geomType !== "Text") {
         data = _objectSpread(_objectSpread({}, data), {}, {
           style: {
             text: ''