qwc2 2025.12.18 → 2025.12.24

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2025.12.18",
+    "version": "2025.12.24",
     "description": "QGIS Web Client",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",
@@ -16,75 +16,74 @@
         "geospatial"
     ],
     "dependencies": {
-        "@furkot/webfonts-generator": "^2.0.2",
-        "@kayahr/text-encoding": "^2.0.0",
-        "@loaders.gl/core": "^4.3.3",
-        "@loaders.gl/shapefile": "^4.3.3",
-        "@loaders.gl/zip": "^4.3.3",
+        "@furkot/webfonts-generator": "^2.0.3",
+        "@kayahr/text-encoding": "^2.1.0",
+        "@loaders.gl/core": "^4.3.4",
+        "@loaders.gl/shapefile": "^4.3.4",
+        "@loaders.gl/zip": "^4.3.4",
         "@mapbox/shp-write": "^0.4.3",
         "@norbulcz/num-parse": "^0.1.0",
-        "@panoramax/web-viewer": "^4.0.1",
-        "@reduxjs/toolkit": "^2.4.0",
+        "@panoramax/web-viewer": "^4.2.0",
+        "@reduxjs/toolkit": "^2.11.2",
         "@sourcepole/qwc-giro3d": "^0.44.0-dev",
-        "@turf/buffer": "^6.5.0",
+        "@turf/buffer": "^7.3.1",
         "@turf/clean-coords": "^7.3.1",
-        "@turf/helpers": "^6.5.0",
+        "@turf/helpers": "^7.3.1",
         "@vtaits/react-color-picker": "^2.0.0",
         "any-date-parser": "^1.5.4",
-        "axios": "^1.11.0",
-        "chart.js": "^4.4.7",
+        "axios": "^1.13.2",
+        "chart.js": "^4.5.1",
         "classnames": "^2.5.1",
         "clone": "^2.1.2",
-        "dayjs": "^1.11.13",
+        "dayjs": "^1.11.19",
         "deepmerge": "^4.3.1",
         "diacritics": "^1.3.0",
-        "dompurify": "^3.2.6",
-        "driver.js": "^1.3.6",
+        "dompurify": "^3.3.1",
+        "driver.js": "^1.4.0",
         "expr-eval": "^2.0.2",
-        "fast-xml-parser": "^4.5.0",
+        "fast-xml-parser": "^5.3.3",
         "file-saver": "^2.0.5",
         "flat": "^6.0.1",
         "formdata-json": "^1.0.0",
         "geojson-bounding-box": "^0.2.0",
-        "html-react-parser": "^5.2.0",
+        "html-react-parser": "^5.2.11",
         "ismobilejs": "^1.1.1",
-        "js-yaml": "^4.1.0",
+        "js-yaml": "^4.1.1",
         "jszip": "^3.10.1",
         "lodash.isempty": "^4.4.0",
         "lodash.isequal": "^4.5.0",
-        "lodash.omit": "^4.5.0",
         "mime-to-extensions": "^1.0.2",
         "mkdirp": "^3.0.1",
         "mousetrap": "^1.6.5",
         "nearley": "^2.20.1",
         "object-path": "^0.11.8",
-        "ol": "^10.3.1",
-        "ol-ext": "^4.0.24",
-        "ol-mapbox-style": "^12.3.5",
-        "painterro": "^1.2.87",
+        "ol": "^10.7.0",
+        "ol-ext": "^4.0.37",
+        "ol-mapbox-style": "^13.2.0",
+        "painterro": "^1.2.92",
         "parse-css-color": "^0.2.1",
         "path-browserify": "^1.0.1",
         "pdf-lib": "^1.17.1",
-        "pdfjs-dist": "^4.9.155",
+        "pdfjs-dist": "^5.4.449",
         "point-in-polygon": "^1.1.0",
         "polygon-intersect-test": "^1.0.1",
-        "proj4": "^2.15.0",
+        "proj4": "^2.20.2",
         "prop-types": "^15.8.1",
-        "qrcode.react": "^4.1.0",
+        "qrcode.react": "^4.2.0",
         "randomcolor": "^0.6.2",
-        "react": "^18.3.1",
-        "react-chartjs-2": "^5.2.0",
-        "react-dom": "^18.3.1",
+        "react": "^19.2.3",
+        "react-chartjs-2": "^5.3.1",
+        "react-dom": "^19.2.3",
         "react-google-recaptcha": "^3.1.0",
-        "react-redux": "^9.1.2",
-        "react-reverse-portal": "^2.1.2",
-        "react-rnd": "^10.4.13",
-        "react-share": "^5.1.1",
+        "react-redux": "^9.2.0",
+        "react-reverse-portal": "^2.3.0",
+        "react-rnd": "^10.5.2",
+        "react-share": "^5.2.2",
         "react-sortablejs": "^1.5.1",
         "react-swipeable": "^7.0.2",
         "redux-logger": "^3.0.6",
         "reselect": "^5.1.1",
-        "simplepolygon": "^1.2.3",
+        "simplepolygon": "^2.0.2",
         "sortablejs": "^1.15.6",
         "suncalc": "^1.9.0",
         "svgpath": "^2.6.0",
@@ -94,36 +93,36 @@
         "toposort": "^2.0.2",
         "url": "^0.11.4",
         "utif": "^3.1.0",
-        "uuid": "^11.0.3",
+        "uuid": "^13.0.0",
         "xlsx": "^0.18.5"
     },
     "devDependencies": {
-        "@babel/cli": "^7.27.0",
-        "@babel/core": "^7.26.0",
-        "@babel/eslint-parser": "^7.25.9",
-        "@babel/plugin-transform-class-properties": "^7.25.9",
-        "@babel/plugin-transform-object-rest-spread": "^7.25.9",
-        "@babel/preset-env": "^7.26.0",
-        "@babel/preset-react": "^7.26.3",
+        "@babel/cli": "^7.28.3",
+        "@babel/core": "^7.28.5",
+        "@babel/eslint-parser": "^7.28.5",
+        "@babel/plugin-transform-class-properties": "^7.27.1",
+        "@babel/plugin-transform-object-rest-spread": "^7.28.4",
+        "@babel/preset-env": "^7.28.5",
+        "@babel/preset-react": "^7.28.5",
         "@microsoft/eslint-formatter-sarif": "^3.1.0",
-        "@types/react": "^18.3.1",
-        "babel-loader": "^9.2.1",
+        "@types/react": "^19.2.7",
+        "@types/three": "^0.170.0",
+        "babel-loader": "^10.0.0",
         "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-        "clean-webpack-plugin": "^4.0.0",
-        "copy-webpack-plugin": "^12.0.2",
+        "copy-webpack-plugin": "^13.0.1",
         "css-loader": "^7.1.2",
-        "eslint": "^8.56.0",
-        "eslint-plugin-perfectionist": "^2.10.0",
-        "eslint-plugin-react": "^7.37.2",
-        "html-webpack-plugin": "^5.6.4",
-        "react-docgen": "^5.4.3",
+        "eslint": "^9.39.2",
+        "eslint-plugin-perfectionist": "^5.1.0",
+        "eslint-plugin-react": "^7.37.5",
+        "html-webpack-plugin": "^5.6.5",
+        "react-docgen": "^8.0.2",
         "source-map-loader": "^5.0.0",
         "style-loader": "^4.0.0",
-        "typescript": "^5.7.2",
-        "webpack": "^5.97.1",
+        "typescript": "^5.9.3",
+        "webpack": "^5.104.1",
         "webpack-bundle-size-analyzer": "^3.1.0",
-        "webpack-cli": "^5.1.4",
-        "webpack-dev-server": "^5.1.0"
+        "webpack-cli": "^6.0.1",
+        "webpack-dev-server": "^5.2.2"
     },
     "bin": {
         "qwc_build_iconfont": "./scripts/makeIconkit.js",

package/plugins/API.js

@@ -69,18 +69,18 @@ import QtDesignerForm from '../components/QtDesignerForm';
 import ResizeableWindow from '../components/ResizeableWindow';
 import SearchBox from '../components/SearchBox';
 import ServiceInfoWindow from '../components/ServiceInfoWindow';
+import ShareLink from '../components/share/ShareLink';
+import ShareQRCode from '../components/share/ShareQRCode';
+import ShareSocials from '../components/share/ShareSocials';
 import SideBar from '../components/SideBar';
 import { Swipeable } from '../components/Swipeable';
 import TaskBar from '../components/TaskBar';
 import ThemeLayersListWindow from '../components/ThemeLayersListWindow';
 import ThemeList from '../components/ThemeList';
-import Toolbar from '../components/Toolbar';
-import ShareLink from '../components/share/ShareLink';
-import ShareQRCode from '../components/share/ShareQRCode';
-import ShareSocials from '../components/share/ShareSocials';
 import FixedTimeline from '../components/timeline/FixedTimeline';
 import InfiniteTimeline from '../components/timeline/InfiniteTimeline';
 import TimelineFeaturesSlider from '../components/timeline/TimelineFeaturesSlider';
+import Toolbar from '../components/Toolbar';
 import AccordeonWidget from '../components/widgets/AccordeonWidget';
 import ButtonBar from '../components/widgets/ButtonBar';
 import ColorButton from '../components/widgets/ColorButton';

package/plugins/FeatureForm.js

@@ -259,7 +259,7 @@ var FeatureForm = /*#__PURE__*/function (_React$Component) {
             },
             value: this.state.selectedFeature
           }, Object.entries(this.state.pickedFeatures).map(function (_ref7) {
-            var _ref9, _ref10, _match$layer$translat, _match$layer$translat2, _match$sublayer;
+            var _ref9, _ref0, _match$layer$translat, _match$layer$translat2, _match$sublayer;
             var _ref8 = _slicedToArray(_ref7, 2),
               id = _ref8[0],
               feature = _ref8[1];
@@ -270,7 +270,7 @@ var FeatureForm = /*#__PURE__*/function (_React$Component) {
               featureId = _id$split2[2];
             var editConfig = _this2.props.editConfigs[mapName][layerName];
             var match = LayerUtils.searchLayer(_this2.props.layers, 'wms_name', mapName, 'name', layerName);
-            var layerTitle = (_ref9 = (_ref10 = (_match$layer$translat = (_match$layer$translat2 = match.layer.translations) === null || _match$layer$translat2 === void 0 || (_match$layer$translat2 = _match$layer$translat2.layertree) === null || _match$layer$translat2 === void 0 ? void 0 : _match$layer$translat2[layerName]) !== null && _match$layer$translat !== void 0 ? _match$layer$translat : editConfig.layerTitle) !== null && _ref10 !== void 0 ? _ref10 : match === null || match === void 0 || (_match$sublayer = match.sublayer) === null || _match$sublayer === void 0 ? void 0 : _match$sublayer.title) !== null && _ref9 !== void 0 ? _ref9 : layerName;
+            var layerTitle = (_ref9 = (_ref0 = (_match$layer$translat = (_match$layer$translat2 = match.layer.translations) === null || _match$layer$translat2 === void 0 || (_match$layer$translat2 = _match$layer$translat2.layertree) === null || _match$layer$translat2 === void 0 ? void 0 : _match$layer$translat2[layerName]) !== null && _match$layer$translat !== void 0 ? _match$layer$translat : editConfig.layerTitle) !== null && _ref0 !== void 0 ? _ref0 : match === null || match === void 0 || (_match$sublayer = match.sublayer) === null || _match$sublayer === void 0 ? void 0 : _match$sublayer.title) !== null && _ref9 !== void 0 ? _ref9 : layerName;
             var featureName = editConfig.displayField ? feature.properties[editConfig.displayField] : featureText + " " + featureId;
             return /*#__PURE__*/React.createElement("option", {
               key: id,

package/plugins/FeatureSearch.js

@@ -294,18 +294,18 @@ var FeatureSearch = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_this, "reloadSelectOptions", function () {
       var _this$state$searchPro, _this$state$searchPro2;
-      Object.entries((_this$state$searchPro = (_this$state$searchPro2 = _this.state.searchProviders[_this.state.selectedProvider]) === null || _this$state$searchPro2 === void 0 || (_this$state$searchPro2 = _this$state$searchPro2.params) === null || _this$state$searchPro2 === void 0 ? void 0 : _this$state$searchPro2.fields) !== null && _this$state$searchPro !== void 0 ? _this$state$searchPro : {}).forEach(function (_ref10) {
-        var _ref11 = _slicedToArray(_ref10, 2),
-          name = _ref11[0],
-          fieldcfg = _ref11[1];
+      Object.entries((_this$state$searchPro = (_this$state$searchPro2 = _this.state.searchProviders[_this.state.selectedProvider]) === null || _this$state$searchPro2 === void 0 || (_this$state$searchPro2 = _this$state$searchPro2.params) === null || _this$state$searchPro2 === void 0 ? void 0 : _this$state$searchPro2.fields) !== null && _this$state$searchPro !== void 0 ? _this$state$searchPro : {}).forEach(function (_ref0) {
+        var _ref1 = _slicedToArray(_ref0, 2),
+          name = _ref1[0],
+          fieldcfg = _ref1[1];
         if (fieldcfg.type === "select") {
           if (fieldcfg.options_query) {
             var _this$state$providerS3;
             var url = fieldcfg.options_query;
-            Object.entries(_this.state.formValues).forEach(function (_ref12) {
-              var _ref13 = _slicedToArray(_ref12, 2),
-                key = _ref13[0],
-                value = _ref13[1];
+            Object.entries(_this.state.formValues).forEach(function (_ref10) {
+              var _ref11 = _slicedToArray(_ref10, 2),
+                key = _ref11[0],
+                value = _ref11[1];
               url = url.replace("$".concat(key, "$"), value);
             });
             if (((_this$state$providerS3 = _this.state.providerSelectOptions[name]) === null || _this$state$providerS3 === void 0 ? void 0 : _this$state$providerS3.source) !== url) {
@@ -415,10 +415,10 @@ var FeatureSearch = /*#__PURE__*/function (_React$Component) {
         this.setState(function (state) {
           var _state$searchProvider;
           return {
-            formValues: Object.entries(((_state$searchProvider = state.searchProviders[state.selectedProvider]) === null || _state$searchProvider === void 0 || (_state$searchProvider = _state$searchProvider.params) === null || _state$searchProvider === void 0 ? void 0 : _state$searchProvider.fields) || []).reduce(function (res, _ref14) {
-              var _ref15 = _slicedToArray(_ref14, 2),
-                field = _ref15[0],
-                cfg = _ref15[1];
+            formValues: Object.entries(((_state$searchProvider = state.searchProviders[state.selectedProvider]) === null || _state$searchProvider === void 0 || (_state$searchProvider = _state$searchProvider.params) === null || _state$searchProvider === void 0 ? void 0 : _state$searchProvider.fields) || []).reduce(function (res, _ref12) {
+              var _ref13 = _slicedToArray(_ref12, 2),
+                field = _ref13[0],
+                cfg = _ref13[1];
               return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, field, ""));
             }, {})
           };

package/plugins/GeometryDigitizer.js

@@ -32,7 +32,6 @@ import React from 'react';
 import { connect } from 'react-redux';
 import polySelfIntersections from 'geojson-polygon-self-intersections';
 import isEmpty from 'lodash.isempty';
-import omit from 'lodash.omit';
 import PropTypes from 'prop-types';
 import { LayerRole, removeLayer, addLayerFeatures, removeLayerFeatures, clearLayer } from '../actions/layers';
 import { changeRedliningState, resetRedliningState } from '../actions/redlining';
@@ -67,16 +66,16 @@ import './style/Redlining.css';
  *   "pluginData": {
  *     "geometryLinks": [
  *       {
- *         "name": "<geomLinkName>",                // Link name referenced in theme item
- *         "title": "<geomLinkTitle>",              // Link title, displayed in the selection combo
- *         "geomType": ["<geomType>", "<geomType>"] // Supported geometry types (Point, LineString, Polygon)
- *         "format": "wkt|geojson",                 // Format of data to send to application
- *         "url": "<targetApplicationUrl>",         // Application target URL, receiving the POST submit. Can contain the $username$ placeholder parameter.
- *         "params": {"<key>": "<value>", ...}      // Optional: additional form parameters to post to URL
- *         "target": "<target>" | {                 // Optional: form POST target which to display the result
- *           "iframedialog": true,                  // Use an iframe dialog
- *           "w": <dialogWidth>,                    // Dialog width
- *           "h": <dialogHeight>                    // Dialog height
+ *         "name": "<geomLinkName>",                 // Link name referenced in theme item
+ *         "title": "<geomLinkTitle>",               // Link title, displayed in the selection combo
+ *         "geomType": ["<geomType>", "<geomType>"], // Supported geometry types (Point, LineString, Polygon)
+ *         "format": "wkt|geojson",                  // Format of data to send to application
+ *         "url": "<targetApplicationUrl>",          // Application target URL, receiving the POST submit. Can contain the $username$ placeholder parameter.
+ *         "params": {"<key>": "<value>", ...}       // Optional: additional form parameters to post to URL
+ *         "target": "<target>" | {                  // Optional: form POST target which to display the result
+ *           "iframedialog": true,                   // Use an iframe dialog
+ *           "w": <dialogWidth>,                     // Dialog width
+ *           "h": <dialogHeight>                     // Dialog height
  *         }
  *       }
  *     ]
@@ -511,8 +510,8 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
       }).join(";") : JSON.stringify({
         type: "FeatureCollection",
         features: supportedFeatures.map(function (feature) {
-          var newFeature = omit(feature, EXCLUDE_PROPS);
-          newFeature.properties = omit(newFeature.properties, EXCLUDE_ATTRS);
+          var newFeature = MiscUtils.objectOmit(feature, EXCLUDE_PROPS);
+          newFeature.properties = MiscUtils.objectOmit(newFeature.properties, EXCLUDE_ATTRS);
           return newFeature;
         })
       });

package/plugins/Map.js

@@ -36,9 +36,10 @@ import { connect } from 'react-redux';
 import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
 import { LayerRole } from '../actions/layers';
-import { MapContainerPortalContext } from '../components/PluginsContainer';
 import OlLayer from '../components/map/OlLayer';
 import OlMap from '../components/map/OlMap';
+import { MapContainerPortalContext } from '../components/PluginsContainer';
+import ViewSwitcher from '../components/ViewSwitcher';
 import Spinner from '../components/widgets/Spinner';
 import LayerUtils from '../utils/LayerUtils';
 import LocaleUtils from '../utils/LocaleUtils';
@@ -273,7 +274,10 @@ var Map = /*#__PURE__*/function (_React$Component) {
         mapOptions: this.props.mapOptions
       }, this.props.map, {
         fullExtent: (_this$props$theme = this.props.theme) === null || _this$props$theme === void 0 ? void 0 : _this$props$theme.bbox
-      }), this.renderLayers(), this.renderSupportTools())), loadingIndicator], this.context);
+      }), this.renderLayers(), this.renderSupportTools())), /*#__PURE__*/React.createElement(ViewSwitcher, {
+        key: "ViewSwitcher",
+        position: this.props.viewSwitcherPosition
+      }), loadingIndicator], this.context);
     }
   }]);
 }(React.Component);
@@ -303,7 +307,9 @@ _defineProperty(Map, "propTypes", {
   tools: PropTypes.object,
   /** Options to pass to the map support plugins, in the form `{"<Name>": {<options>}}`.
    * Refer to the documentation of the <a href="#mapSupportPlugins">Map support plugins</a> for settable options. */
-  toolsOptions: PropTypes.object
+  toolsOptions: PropTypes.object,
+  /** Position of the view switcher button. */
+  viewSwitcherPosition: PropTypes.number
 });
 _defineProperty(Map, "defaultProps", {
   mapOptions: {},
@@ -311,7 +317,8 @@ _defineProperty(Map, "defaultProps", {
   swipeGeometryTypeBlacklist: [],
   swipeLayerNameBlacklist: [],
   tools: {},
-  toolsOptions: {}
+  toolsOptions: {},
+  viewSwitcherPosition: 6
 });
 export default (function (tools) {
   return connect(function (state) {

package/plugins/MapFilter.js

@@ -145,7 +145,7 @@ var MapFilter = /*#__PURE__*/function (_React$Component) {
           var expr = '';
           try {
             expr = JSON.parse(entry.expr);
-          } catch (e) {
+          } catch (_unused) {
             return;
           }
           if (layerExpressions[entry.layer]) {
@@ -225,7 +225,7 @@ var MapFilter = /*#__PURE__*/function (_React$Component) {
         var expr = null;
         try {
           expr = JSON.parse(entry.expr);
-        } catch (e) {
+        } catch (_unused2) {
           return null;
         }
         return {
@@ -339,7 +339,7 @@ var MapFilter = /*#__PURE__*/function (_React$Component) {
         var filterexpr = null;
         try {
           filterexpr = JSON.parse(_this.state.filterEditor.value);
-        } catch (e) {
+        } catch (_unused3) {
           // Pass
         }
         if (!Array.isArray(filterexpr) || !_validateExpression(filterexpr)) {
@@ -704,16 +704,16 @@ var MapFilter = /*#__PURE__*/function (_React$Component) {
         if (!prevProps.theme && (_this$props$startupPa = this.props.startupParams) !== null && _this$props$startupPa !== void 0 && _this$props$startupPa.f) {
           try {
             var startupConfig = JSON.parse(this.props.startupParams.f);
-            Object.entries(startupConfig).forEach(function (_ref10) {
-              var _ref11 = _slicedToArray(_ref10, 2),
-                filterId = _ref11[0],
-                values = _ref11[1];
+            Object.entries(startupConfig).forEach(function (_ref0) {
+              var _ref1 = _slicedToArray(_ref0, 2),
+                filterId = _ref1[0],
+                values = _ref1[1];
               if (filterId in filters) {
                 filters[filterId].active = true;
-                Object.entries(values).forEach(function (_ref12) {
-                  var _ref13 = _slicedToArray(_ref12, 2),
-                    fieldId = _ref13[0],
-                    value = _ref13[1];
+                Object.entries(values).forEach(function (_ref10) {
+                  var _ref11 = _slicedToArray(_ref10, 2),
+                    fieldId = _ref11[0],
+                    value = _ref11[1];
                   filters[filterId].values[fieldId] = value;
                 });
               }
@@ -737,7 +737,7 @@ var MapFilter = /*#__PURE__*/function (_React$Component) {
                 }));
               }, {});
             }
-          } catch (e) {
+          } catch (_unused4) {
             /* eslint-disable-next-line */
             console.log("Error while parsing startup filter");
           }

package/plugins/MapTip.js

@@ -29,11 +29,11 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  * LICENSE file in the root directory of this source tree.
  */
 
+import htmlReactParser, { domToReact } from 'html-react-parser';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { connect } from 'react-redux';
 import DOMPurify from 'dompurify';
-import htmlReactParser, { domToReact } from 'html-react-parser';
 import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
 import { v4 as uuidv4 } from 'uuid';