qwc2 2025.10.16 → 2025.10.24

package/icons/circle_full.svg

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generated by IcoMoon.io -->
+
+<svg
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg6"
+   sodipodi:docname="record.svg"
+   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>uniE250</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1172"
+     id="namedview8"
+     showgrid="true"
+     inkscape:zoom="20.85965"
+     inkscape:cx="11.697224"
+     inkscape:cy="10.810344"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6"
+     inkscape:pagecheckerboard="0"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid823"
+       originx="0"
+       originy="0"
+       spacingy="1"
+       spacingx="1"
+       units="px" />
+  </sodipodi:namedview>
+  <title
+     id="title2">uniE250</title>
+  <rect
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stop-color:#000000"
+     id="rect866"
+     width="18"
+     height="18"
+     x="3"
+     y="3"
+     ry="9" />
+</svg>

package/package.json

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

package/plugins/AttributeTable.js

@@ -75,6 +75,7 @@ var AttributeTable = /*#__PURE__*/function (_React$Component) {
         allowAddForGeometryLayers: this.props.allowAddForGeometryLayers,
         iface: this.props.iface,
         initialLayer: (_this$props$taskData = this.props.taskData) === null || _this$props$taskData === void 0 ? void 0 : _this$props$taskData.layer,
+        limitToExtent: this.props.limitToExtent,
         role: "body",
         showEditFormButton: this.props.showEditFormButton,
         showHiddenFields: this.props.showHiddenFields,
@@ -90,6 +91,8 @@ _defineProperty(AttributeTable, "propTypes", {
   allowAddForGeometryLayers: PropTypes.bool,
   blocked: PropTypes.bool,
   iface: PropTypes.object,
+  /** Whether to limit to the extent by default. */
+  limitToExtent: PropTypes.bool,
   setCurrentTask: PropTypes.func,
   /** Whether to show a button to open the edit form for selected layer. Requires the Editing plugin to be enabled. */
   showEditFormButton: PropTypes.bool,
@@ -102,6 +105,7 @@ _defineProperty(AttributeTable, "propTypes", {
   zoomLevel: PropTypes.number
 });
 _defineProperty(AttributeTable, "defaultProps", {
+  limitToExtent: false,
   zoomLevel: 1000,
   showEditFormButton: true,
   showHiddenFields: true,

package/plugins/GeometryDigitizer.js

@@ -622,6 +622,9 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
       }), this.renderOutputWindow(), this.state.pickGeomType ? /*#__PURE__*/React.createElement(PickFeature, {
         featurePicked: this.selectFeature,
         key: "FeaturePicker",
+        layerFilterFunc: function layerFilterFunc(layer) {
+          return !layer.id.startsWith("__geomdigitizer");
+        },
         pickGeomType: this.state.pickGeomType
       }) : null];
     }

package/plugins/HeightProfile.js

@@ -208,6 +208,8 @@ var HeightProfilePrintDialog_ = /*#__PURE__*/function (_React$PureComponent) {
     value: function componentDidMount() {
       var templatePath = MiscUtils.resolveAssetsPath(this.props.templatePath);
       this.externalWindow = window.open(templatePath, LocaleUtils.tr("heightprofile.title"), "toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes");
+      // Inherit API
+      this.externalWindow.qwc2 = window.qwc2;
       this.externalWindow.addEventListener('load', this.setWindowContent, false);
       this.externalWindow.addEventListener('resize', this.windowResized, false);
       window.addEventListener('beforeunload', this.closePrintWindow);

package/plugins/Identify.js

@@ -94,7 +94,7 @@ var Identify = /*#__PURE__*/function (_React$Component) {
                 };
               });
               if (response) {
-                _this.parseResult(response, l, request.params.info_format, clickPoint);
+                _this.parseResult(response, l, request.params.info_format, clickPoint, _this.props.click.modifiers.ctrl);
               }
             });
           });
@@ -229,6 +229,7 @@ var Identify = /*#__PURE__*/function (_React$Component) {
       });
     });
     _defineProperty(_this, "parseResult", function (response, layer, format, clickPoint) {
+      var ctrlPick = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
       var newResults = IdentifyUtils.parseResponse(response, layer, format, clickPoint, _this.props.map.projection, _this.props.featureInfoReturnsLayerName);
       // Merge with previous
       _this.setState(function (state) {
@@ -239,10 +240,13 @@ var Identify = /*#__PURE__*/function (_React$Component) {
             features = _ref4[1];
           var key = layer.url + "#" + layername;
           identifyResults[key] = features.reduce(function (result, feature) {
-            if (result.find(function (f) {
+            var idx = result.findIndex(function (f) {
               return f.id === feature.id;
-            }) === undefined) {
+            });
+            if (idx === -1) {
               result.push(feature);
+            } else if (ctrlPick === true) {
+              result.splice(idx, 1);
             }
             return result;
           }, identifyResults[key] || []);

package/plugins/ObjectList.js

@@ -0,0 +1,116 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
+function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
+function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
+function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
+ * Copyright 2024 Sourcepole AG
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import React from 'react';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+import { setCurrentTask } from '../actions/task';
+import AttributeTableWidget from '../components/AttributeTableWidget';
+import ResizeableWindow from '../components/ResizeableWindow';
+import EditingInterface from '../utils/EditingInterface';
+import LocaleUtils from '../utils/LocaleUtils';
+
+/**
+ * Display layer object lists in a dialog.
+ *
+ * The object list is similar to the attribute table, but displays only the display field for each object and contains no edit functionality.
+ *
+ * To make a layer available in the object list, create a a data resource and matching permissions for it in the `qwc-admin-gui`.
+ *
+ * This plugin queries the dataset via the editing service specified by
+ * `editServiceUrl` in `config.json` (by default the `qwc-data-service`).
+ */
+var ObjectList = /*#__PURE__*/function (_React$Component) {
+  function ObjectList() {
+    var _this;
+    _classCallCheck(this, ObjectList);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _callSuper(this, ObjectList, [].concat(args));
+    _defineProperty(_this, "onClose", function () {
+      _this.props.setCurrentTask(null);
+    });
+    return _this;
+  }
+  _inherits(ObjectList, _React$Component);
+  return _createClass(ObjectList, [{
+    key: "render",
+    value: function render() {
+      var _this$props$taskData;
+      if (!this.props.active) {
+        return null;
+      }
+      return /*#__PURE__*/React.createElement(ResizeableWindow, {
+        dockable: "bottom",
+        icon: "editing",
+        initialHeight: 480,
+        initialWidth: 800,
+        initiallyDocked: true,
+        onClose: this.onClose,
+        splitScreenWhenDocked: true,
+        title: LocaleUtils.tr("appmenu.items.ObjectList")
+      }, /*#__PURE__*/React.createElement(AttributeTableWidget, {
+        iface: this.props.iface,
+        initialLayer: (_this$props$taskData = this.props.taskData) === null || _this$props$taskData === void 0 ? void 0 : _this$props$taskData.layer,
+        limitToExtent: this.props.limitToExtent,
+        readOnly: true,
+        role: "body",
+        showDisplayFieldOnly: true,
+        showEditFormButton: false,
+        showHiddenFields: false,
+        showLimitToExtent: this.props.showLimitToExtent,
+        zoomLevel: this.props.zoomLevel
+      }));
+    }
+  }]);
+}(React.Component);
+_defineProperty(ObjectList, "propTypes", {
+  active: PropTypes.bool,
+  iface: PropTypes.object,
+  /** Whether to limit to the extent by default. */
+  limitToExtent: PropTypes.bool,
+  setCurrentTask: PropTypes.func,
+  /** Whether to show the "Limit to extent" checkbox */
+  showLimitToExtent: PropTypes.bool,
+  taskData: PropTypes.object,
+  /** The zoom level for zooming to point features. */
+  zoomLevel: PropTypes.number
+});
+_defineProperty(ObjectList, "defaultProps", {
+  limitToExtent: false,
+  zoomLevel: 1000,
+  showHiddenFields: true,
+  showLimitToExtent: true
+});
+export default (function () {
+  var iface = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : EditingInterface;
+  return connect(function (state) {
+    return {
+      active: state.task.id === "ObjectList",
+      iface: iface,
+      taskData: state.task.id === "ObjectList" ? state.task.data : null
+    };
+  }, {
+    setCurrentTask: setCurrentTask
+  })(ObjectList);
+});

package/plugins/Redlining.js

@@ -34,8 +34,6 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 
 import React from 'react';
 import { connect } from 'react-redux';
-import FileSaver from 'file-saver';
-import ol from 'openlayers';
 import PropTypes from 'prop-types';
 import { LayerRole, addLayer } from '../actions/layers';
 import { setSnappingConfig } from '../actions/map';
@@ -51,8 +49,6 @@ import VectorLayerPicker from '../components/widgets/VectorLayerPicker';
 import ConfigUtils from '../utils/ConfigUtils';
 import { END_MARKERS } from '../utils/FeatureStyles';
 import LocaleUtils from '../utils/LocaleUtils';
-import MapUtils from '../utils/MapUtils';
-import VectorLayerUtils from '../utils/VectorLayerUtils';
 import './style/Redlining.css';
 
 /**
@@ -134,7 +130,7 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
           geomType: "LineString",
           text: ""
         }
-      }, {
+      }, [{
         key: "Polygon",
         tooltip: LocaleUtils.tr("redlining.polygon"),
         icon: "polygon",
@@ -143,7 +139,7 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
           geomType: "Polygon",
           text: ""
         }
-      }, [toolEnabled("Circle") ? {
+      }, toolEnabled("Circle") ? {
         key: "Circle",
         tooltip: LocaleUtils.tr("redlining.circle"),
         icon: "circle",
@@ -238,6 +234,10 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
         key: "NumericInput",
         tooltip: LocaleUtils.tr("redlining.numericinput"),
         icon: "numericinput"
+      }, {
+        key: "FeatureAttributes",
+        tooltip: LocaleUtils.tr("redlining.attributes"),
+        icon: "list-alt"
       }] : [];
       for (var _i = 0, _Object$values = Object.values(_this.props.plugins || {}); _i < _Object$values.length; _i++) {
         var plugin = _Object$values[_i];
@@ -300,11 +300,11 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
       })), /*#__PURE__*/React.createElement("div", {
         className: "redlining-groupcontrol"
       }, /*#__PURE__*/React.createElement("div", null, "\xA0"), /*#__PURE__*/React.createElement(ButtonBar, {
-        active: _this.props.redlining.numericInput ? "NumericInput" : null,
+        active: _this.props.redlining.extraAction,
         buttons: extraButtons,
-        onClick: function onClick() {
+        onClick: function onClick(key) {
           return _this.props.changeRedliningState({
-            numericInput: !_this.props.redlining.numericInput
+            extraAction: key
           });
         }
       })), toolEnabled("Export") ? /*#__PURE__*/React.createElement("div", {
@@ -325,52 +325,11 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
         value: "kml"
       }, "KML"))) : null), controls);
     });
-    _defineProperty(_this, "export", function (type) {
-      if (type === "geojson") {
-        var layer = _this.props.layers.find(function (l) {
-          return l.id === _this.props.redlining.layer;
-        });
-        if (!layer) {
-          return;
-        }
-        var geojson = JSON.stringify({
-          type: "FeatureCollection",
-          features: layer.features.map(function (feature) {
-            var newFeature = _objectSpread(_objectSpread({}, feature), {}, {
-              geometry: VectorLayerUtils.reprojectGeometry(feature.geometry, feature.crs || _this.props.mapCrs, 'EPSG:4326')
-            });
-            delete newFeature.crs;
-            return newFeature;
-          })
-        }, null, ' ');
-        FileSaver.saveAs(new Blob([geojson], {
-          type: "text/plain;charset=utf-8"
-        }), layer.title + ".json");
-      } else if (type === "kml") {
-        var getNativeLayer = MapUtils.getHook(MapUtils.GET_NATIVE_LAYER);
-        var _layer = _this.props.layers.find(function (l) {
-          return l.id === _this.props.redlining.layer;
-        });
-        var nativeLayer = getNativeLayer(_this.props.redlining.layer);
-        if (!nativeLayer) {
-          return;
-        }
-        var kmlFormat = new ol.format.KML();
-        var features = nativeLayer.getSource().getFeatures().map(function (feature) {
-          // Circle is not supported by kml format
-          if (feature.getGeometry() instanceof ol.geom.Circle) {
-            feature = feature.clone();
-            feature.setGeometry(ol.geom.polygonFromCircle(feature.getGeometry()));
-          }
-          return feature;
-        });
-        var data = kmlFormat.writeFeatures(features, {
-          featureProjection: _this.props.mapCrs
-        });
-        FileSaver.saveAs(new Blob([data], {
-          type: "application/vnd.google-earth.kml+xml"
-        }), _layer.title + ".kml");
-      }
+    _defineProperty(_this, "export", function (format) {
+      _this.props.changeRedliningState({
+        action: 'Export',
+        format: format
+      });
     });
     _defineProperty(_this, "renderStandardControls", function () {
       var sizeLabel = LocaleUtils.tr("redlining.line");

package/plugins/map/EditingSupport.js

@@ -33,6 +33,7 @@ import { connect } from 'react-redux';
 import ol from 'openlayers';
 import PropTypes from 'prop-types';
 import { setEditContext } from '../../actions/editing';
+import LocationRecorder from '../../components/LocationRecorder';
 import FeatureStyles from "../../utils/FeatureStyles";
 
 /**
@@ -43,6 +44,9 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
     var _this;
     _classCallCheck(this, EditingSupport);
     _this = _callSuper(this, EditingSupport, [props]);
+    _defineProperty(_this, "state", {
+      showRecordLocation: false
+    });
     _defineProperty(_this, "editStyle", function () {
       var geometryFunction = function geometryFunction(feature) {
         if (feature.getGeometry().getType() === "Point") {
@@ -76,9 +80,10 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "addDrawInteraction", function () {
       _this.reset();
       _this.createLayer();
+      var geomType = _this.props.editContext.geomType.replace(/Z$/, '');
       var drawInteraction = new ol.interaction.Draw({
         stopClick: true,
-        type: _this.props.editContext.geomType.replace(/Z$/, ''),
+        type: geomType,
         source: _this.layer.getSource(),
         condition: function condition(event) {
           return event.originalEvent.buttons === 1;
@@ -89,11 +94,18 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
         _this.currentFeature = evt.feature;
       }, _this);
       drawInteraction.on('drawend', function () {
+        _this.setState({
+          showRecordLocation: false
+        });
         _this.commitCurrentFeature();
         _this.props.map.removeInteraction(drawInteraction);
+        _this.interaction = null;
       }, _this);
       _this.props.map.addInteraction(drawInteraction);
       _this.interaction = drawInteraction;
+      _this.setState({
+        showRecordLocation: ["Point", "LineString"].includes(geomType)
+      });
     });
     _defineProperty(_this, "addEditInteraction", function () {
       _this.reset();
@@ -187,6 +199,15 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
+      if (this.state.showRecordLocation) {
+        var geomType = this.props.editContext.geomType.replace(/Z$/, '');
+        return /*#__PURE__*/React.createElement(LocationRecorder, {
+          drawInteraction: this.interaction,
+          geomType: geomType,
+          key: "LocationRecorder",
+          map: this.props.map
+        });
+      }
       return null;
     }
   }]);

package/plugins/map/LocateSupport.js

@@ -42,6 +42,11 @@ var LocateSupport = /*#__PURE__*/function (_React$Component) {
     _classCallCheck(this, LocateSupport);
     _this = _callSuper(this, LocateSupport, [props]);
     _defineProperty(_this, "onLocationError", function (err) {
+      // Handle LOCATION_UNAVAILABLE
+      if (err.code === 2 && _this.errorCount < 5) {
+        _this.errorCount += 1;
+        return;
+      }
       _this.props.onLocateError(err.message);
       // User denied geolocation prompt
       if (err.code === 1) {
@@ -79,9 +84,10 @@ var LocateSupport = /*#__PURE__*/function (_React$Component) {
         _this.props.changeLocateState(_this.requestedMode);
         _this.posLayer.setVisible(true);
       }
+      _this.errorCount = 0;
       var mapPos = _this.geolocate.getPosition();
       var wgsPos = CoordinatesUtils.reproject(mapPos, _this.props.projection, "EPSG:4326");
-      _this.props.changeLocatePosition(wgsPos);
+      _this.props.changeLocatePosition(wgsPos, mapPos);
       var point = new ol.geom.Point(mapPos);
       if (_this.props.drawCircle) {
         var circle = new ol.geom.Circle(mapPos, _this.geolocate.getAccuracy());
@@ -181,6 +187,7 @@ var LocateSupport = /*#__PURE__*/function (_React$Component) {
       _this.posPopup.hidden = true;
     };
     _this.requestedMode = 'DISABLED';
+    _this.errorCount = 0;
     return _this;
   }
   _inherits(LocateSupport, _React$Component);