qwc2 2025.12.18 → 2025.12.24

package/actions/display.js

@@ -11,11 +11,11 @@ import ReducerIndex from '../reducers/index';
 ReducerIndex.register("display", displayReducer);
 export var TOGGLE_FULLSCREEN = 'TOGGLE_FULLSCREEN';
 export var SET_VIEW_3D_MODE = 'SET_VIEW_3D_MODE';
-export var View3DMode = {
-  DISABLED: 0,
-  FULLSCREEN: 1,
-  SPLITSCREEN: 2,
-  DISABLING: 3
+export var ViewMode = {
+  _2D: 0,
+  _3DFullscreen: 1,
+  _3DSplitscreen: 2,
+  _Oblique: 3
 };
 export function toggleFullscreen(fullscreen) {
   if (fullscreen) {
@@ -28,7 +28,7 @@ export function toggleFullscreen(fullscreen) {
     fullscreen: fullscreen
   };
 }
-export function setView3dMode(mode) {
+export function setViewMode(mode) {
   return {
     type: SET_VIEW_3D_MODE,
     mode: mode

package/actions/theme.js

@@ -23,7 +23,7 @@ import ReducerIndex from '../reducers/index';
 import themeReducer from '../reducers/theme';
 ReducerIndex.register("theme", themeReducer);
 import isEmpty from 'lodash.isempty';
-import { setView3dMode, View3DMode } from '../actions/display';
+import { ViewMode } from '../actions/display';
 import { setCurrentTask } from '../actions/task';
 import ConfigUtils from '../utils/ConfigUtils';
 import CoordinatesUtils from '../utils/CoordinatesUtils';
@@ -54,7 +54,6 @@ export function setThemeLayersList(theme) {
 }
 export function finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme) {
   var _theme$config;
-  var initialView = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : null;
   // Create layer
   var themeLayer = ThemeUtils.createThemeLayer(theme, themes);
   var layers = [themeLayer];
@@ -145,19 +144,6 @@ export function finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPo
     type: SET_CURRENT_THEME,
     theme: theme
   });
-  if (initialView === null) {
-    if (theme.startupView === "2d") {
-      dispatch(setView3dMode(View3DMode.DISABLED));
-    } else if (theme.startupView === "3d2d") {
-      dispatch(setView3dMode(View3DMode.SPLITSCREEN));
-    } else if (theme.startupView === "3d") {
-      dispatch(setView3dMode(View3DMode.FULLSCREEN));
-    }
-  } else {
-    UrlParams.updateParams({
-      v: initialView
-    });
-  }
   dispatch({
     type: SWITCHING_THEME,
     switching: false
@@ -176,7 +162,6 @@ export function setCurrentTheme(theme, themes) {
   var permalinkLayers = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : null;
   var themeLayerRestorer = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : null;
   var externalLayerRestorer = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : null;
-  var initialView = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : null;
   return function (dispatch, getState) {
     var _getState$layers;
     var curLayers = ((_getState$layers = getState().layers) === null || _getState$layers === void 0 ? void 0 : _getState$layers.flat) || [];
@@ -249,7 +234,7 @@ export function setCurrentTheme(theme, themes) {
     });
 
     // Preserve extent if desired and possible
-    if (getState().display.view3dMode !== View3DMode.FULLSCREEN) {
+    if (getState().display.viewMode !== ViewMode._3DFullscreen) {
       var curCrs = getState().map.projection;
       if (preserve && !initialExtent && curCrs === theme.mapCrs) {
         var curBounds = getState().map.bbox.bounds;
@@ -332,13 +317,13 @@ export function setCurrentTheme(theme, themes) {
             dispatch(showNotification("missinglayers", LocaleUtils.tr("app.missinglayers", diff.join(", ")), NotificationType.WARN, true));
           }
         }
-        finishThemeSetup(dispatch, newTheme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme, initialView);
+        finishThemeSetup(dispatch, newTheme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme);
       });
     } else {
       if (!isEmpty(missingThemeLayers)) {
         dispatch(showNotification("missinglayers", LocaleUtils.tr("app.missinglayers", Object.keys(missingThemeLayers).join(", ")), NotificationType.WARN, true));
       }
-      finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme, initialView);
+      finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme);
     }
   };
 }

package/components/AppMenu.js

@@ -308,7 +308,7 @@ var AppMenu = /*#__PURE__*/function (_React$Component) {
         tabIndex: -1
       }, /*#__PURE__*/React.createElement("div", {
         className: "appmenu-menu",
-        inert: visible ? undefined : "true",
+        inert: !visible,
         onMouseLeave: this.clearFocus,
         ref: function ref(el) {
           _this3.menuEl = el;

package/components/AttributeForm.js

@@ -711,15 +711,15 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
       var featureData = new FormData();
       featureData.set('feature', JSON.stringify(feature));
       Object.entries(featureUploads).forEach(function (_ref9) {
-        var _ref10 = _slicedToArray(_ref9, 2),
-          key = _ref10[0],
-          value = _ref10[1];
+        var _ref0 = _slicedToArray(_ref9, 2),
+          key = _ref0[0],
+          value = _ref0[1];
         return featureData.set('file:' + key, value);
       });
-      Object.entries(relationUploads).forEach(function (_ref11) {
-        var _ref12 = _slicedToArray(_ref11, 2),
-          key = _ref12[0],
-          value = _ref12[1];
+      Object.entries(relationUploads).forEach(function (_ref1) {
+        var _ref10 = _slicedToArray(_ref1, 2),
+          key = _ref10[0],
+          value = _ref10[1];
         return featureData.set('relfile:' + _this.props.editContext.mapPrefix + "." + key, value);
       });
       if (_this.state.captchaResponse) {

package/components/AttributeTableWidget.js

@@ -956,12 +956,12 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
             var _ref8, _ref9, _match$layer$translat, _match$layer$translat2, _match$sublayer;
             layerTitle = (_ref8 = (_ref9 = (_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 && _ref9 !== void 0 ? _ref9 : match === null || match === void 0 || (_match$sublayer = match.sublayer) === null || _match$sublayer === void 0 ? void 0 : _match$sublayer.title) !== null && _ref8 !== void 0 ? _ref8 : layerName;
           } else {
-            var _this2$props$layers$f, _ref10, _translations$layertr, _translations$layertr2;
+            var _this2$props$layers$f, _ref0, _translations$layertr, _translations$layertr2;
             // Note: geometry-less tables are filtered from the theme sublayers
             var translations = (_this2$props$layers$f = _this2.props.layers.find(function (layer) {
               return layer.wms_name === wmsName;
             })) === null || _this2$props$layers$f === void 0 ? void 0 : _this2$props$layers$f.translations;
-            layerTitle = (_ref10 = (_translations$layertr = translations === null || translations === void 0 || (_translations$layertr2 = translations.layertree) === null || _translations$layertr2 === void 0 ? void 0 : _translations$layertr2[layerName]) !== null && _translations$layertr !== void 0 ? _translations$layertr : editConfig.layerTitle) !== null && _ref10 !== void 0 ? _ref10 : layerName;
+            layerTitle = (_ref0 = (_translations$layertr = translations === null || translations === void 0 || (_translations$layertr2 = translations.layertree) === null || _translations$layertr2 === void 0 ? void 0 : _translations$layertr2[layerName]) !== null && _translations$layertr !== void 0 ? _translations$layertr : editConfig.layerTitle) !== null && _ref0 !== void 0 ? _ref0 : layerName;
           }
           var value = wmsName + "#" + layerName;
           return /*#__PURE__*/React.createElement("option", {

package/components/AutoEditForm.js

@@ -1,5 +1,8 @@
+var _excluded = ["multiline"];
 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 _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 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; }
@@ -22,7 +25,6 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  */
 
 import React from 'react';
-import omit from 'lodash.omit';
 import PropTypes from 'prop-types';
 import EditComboField from './EditComboField';
 import EditUploadField from './EditUploadField';
@@ -38,8 +40,9 @@ var AutoEditForm = /*#__PURE__*/function (_React$Component) {
     }
     _this = _callSuper(this, AutoEditForm, [].concat(args));
     _defineProperty(_this, "renderField", function (field) {
-      var multiline = (field.constraints || {}).multiline;
-      var constraints = omit(field.constraints || {}, ["multiline"]);
+      var _ref = field.constraints || {},
+        multiline = _ref.multiline,
+        constraints = _objectWithoutProperties(_ref, _excluded);
       var readOnly = _this.props.readOnly || constraints.readOnly;
       var value = (_this.props.values || {})[field.id];
       if (value === undefined || value === null) {

package/components/EditComboField.js

@@ -59,7 +59,7 @@ var EditComboField = /*#__PURE__*/function (_React$Component) {
       var items = new Set();
       try {
         items = new Set(JSON.parse('[' + _this.props.value.slice(1, -1) + ']'));
-      } catch (e) {
+      } catch (_unused) {
         // pass
       }
       var serializeValue = function serializeValue(value, enabled) {
@@ -135,7 +135,6 @@ var EditComboField = /*#__PURE__*/function (_React$Component) {
     value: function componentDidMount() {
       var _this2 = this;
       if (this.props.values) {
-        // eslint-disable-next-line
         this.setState({
           values: this.props.values,
           showPlaceholder: !this.hasEmptyValue(this.props.values)
@@ -143,7 +142,6 @@ var EditComboField = /*#__PURE__*/function (_React$Component) {
       } else if (this.props.keyvalrel) {
         var _this$props$filterExp;
         KeyValCache.get(this.props.editIface, this.props.keyvalrel, (_this$props$filterExp = this.props.filterExpr) !== null && _this$props$filterExp !== void 0 ? _this$props$filterExp : null).then(function (values) {
-          // eslint-disable-next-line
           _this2.setState({
             values: values,
             showPlaceholder: !_this2.hasEmptyValue(values)
@@ -158,7 +156,6 @@ var EditComboField = /*#__PURE__*/function (_React$Component) {
       if (this.props.keyvalrel && this.props.filterExpr !== prevProps.filterExpr) {
         var _this$props$filterExp2;
         KeyValCache.get(this.props.editIface, this.props.keyvalrel, (_this$props$filterExp2 = this.props.filterExpr) !== null && _this$props$filterExp2 !== void 0 ? _this$props$filterExp2 : null).then(function (values) {
-          // eslint-disable-next-line
           _this3.setState({
             values: values,
             showPlaceholder: !_this3.hasEmptyValue(values)

package/components/IdentifyViewer.js

@@ -25,6 +25,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+import htmlReactParser, { domToReact } from 'html-react-parser';
 /**
  * Copyright 2016-2024 Sourcepole AG
  * All rights reserved.
@@ -38,10 +39,8 @@ import axios from 'axios';
 import clone from 'clone';
 import DOMPurify from 'dompurify';
 import FileSaver from 'file-saver';
-import htmlReactParser, { domToReact } from 'html-react-parser';
 import JSZip from 'jszip';
 import isEmpty from 'lodash.isempty';
-import omit from 'lodash.omit';
 import PropTypes from 'prop-types';
 import { setActiveLayerInfo } from '../actions/layerinfo';
 import { LayerRole, addLayerFeatures, removeLayer, changeLayerProperty } from '../actions/layers';
@@ -80,8 +79,8 @@ var BuiltinExporters = [{
     var featureCollection = {
       type: "FeatureCollection",
       features: Object.values(json).flat().map(function (entry) {
-        var feature = omit(entry, EXCLUDE_PROPS);
-        feature.properties = omit(feature.properties, EXCLUDE_ATTRS);
+        var feature = MiscUtils.objectOmit(entry, EXCLUDE_PROPS);
+        feature.properties = MiscUtils.objectOmit(feature.properties, EXCLUDE_ATTRS);
         if (feature.geometry) {
           feature.crs = {
             type: "name",
@@ -221,7 +220,7 @@ var BuiltinExporters = [{
         var geojson = {
           type: "FeatureCollection",
           features: features.map(function (entry) {
-            return omit(entry, EXCLUDE_PROPS);
+            return MiscUtils.objectOmit(entry, EXCLUDE_PROPS);
           })
         };
         var layerOptions = _objectSpread(_objectSpread({}, options), {}, {
@@ -275,11 +274,11 @@ var BuiltinExporters = [{
   "export": function _export(json, callback) {
     import('xlsx').then(function (xlsx) {
       var document = xlsx.utils.book_new();
-      Object.entries(json).forEach(function (_ref10) {
+      Object.entries(json).forEach(function (_ref0) {
         var _features$0$propertie2, _features$3;
-        var _ref11 = _slicedToArray(_ref10, 2),
-          layerName = _ref11[0],
-          features = _ref11[1];
+        var _ref1 = _slicedToArray(_ref0, 2),
+          layerName = _ref1[0],
+          features = _ref1[1];
         var exportAttrs = Object.keys((_features$0$propertie2 = (_features$3 = features[0]) === null || _features$3 === void 0 ? void 0 : _features$3.properties) !== null && _features$0$propertie2 !== void 0 ? _features$0$propertie2 : {}).filter(function (attr) {
           return !EXCLUDE_ATTRS.includes(attr);
         });
@@ -460,12 +459,12 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       });
       if (exporter) {
         if (!_this.props.exportGeometry) {
-          json = Object.entries(json).reduce(function (res, _ref14) {
-            var _ref15 = _slicedToArray(_ref14, 2),
-              layerId = _ref15[0],
-              features = _ref15[1];
+          json = Object.entries(json).reduce(function (res, _ref12) {
+            var _ref13 = _slicedToArray(_ref12, 2),
+              layerId = _ref13[0],
+              features = _ref13[1];
             return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, layerId, features.map(function (feature) {
-              return omit(feature, ['geometry']);
+              return MiscUtils.objectOmit(feature, ['geometry']);
             })));
           }, {});
         }
@@ -491,10 +490,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
         style: {
           maxHeight: _this.state.currentResult ? '10em' : 'initial'
         }
-      }, Object.entries(_this.state.resultTree).map(function (_ref16) {
-        var _ref17 = _slicedToArray(_ref16, 2),
-          layerid = _ref17[0],
-          features = _ref17[1];
+      }, Object.entries(_this.state.resultTree).map(function (_ref14) {
+        var _ref15 = _slicedToArray(_ref14, 2),
+          layerid = _ref15[0],
+          features = _ref15[1];
         if (features.length === 0) {
           return null;
         }
@@ -925,10 +924,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React.createElement("option", {
         disabled: true,
         value: ""
-      }, LocaleUtils.tr("identify.selectreport")), Object.entries(_this.state.reports).map(function (_ref19) {
-        var _ref20 = _slicedToArray(_ref19, 2),
-          layername = _ref20[0],
-          reports = _ref20[1];
+      }, LocaleUtils.tr("identify.selectreport")), Object.entries(_this.state.reports).map(function (_ref17) {
+        var _ref18 = _slicedToArray(_ref17, 2),
+          layername = _ref18[0],
+          reports = _ref18[1];
         return reports.map(function (report, idx) {
           return /*#__PURE__*/React.createElement("option", {
             key: layername + "::" + idx,
@@ -1221,10 +1220,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       var _this2 = this;
       var body = null;
       var resultTree = this.state.selectedLayer !== '' ? _defineProperty({}, this.state.selectedLayer, this.state.resultTree[this.state.selectedLayer]) : this.state.resultTree;
-      var flatResults = Object.entries(resultTree).map(function (_ref23) {
-        var _ref24 = _slicedToArray(_ref23, 2),
-          layerid = _ref24[0],
-          features = _ref24[1];
+      var flatResults = Object.entries(resultTree).map(function (_ref21) {
+        var _ref22 = _slicedToArray(_ref21, 2),
+          layerid = _ref22[0],
+          features = _ref22[1];
         return features.map(function (feature) {
           return [layerid, feature];
         });
@@ -1252,10 +1251,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       } else if (this.props.resultDisplayMode === 'flat') {
         body = /*#__PURE__*/React.createElement("div", {
           className: "identify-flat-results-list"
-        }, Object.entries(resultTree).map(function (_ref25) {
-          var _ref26 = _slicedToArray(_ref25, 2),
-            layerid = _ref26[0],
-            features = _ref26[1];
+        }, Object.entries(resultTree).map(function (_ref23) {
+          var _ref24 = _slicedToArray(_ref23, 2),
+            layerid = _ref24[0],
+            features = _ref24[1];
           return features.map(function (feature) {
             return _this2.renderResultAttributes(layerid, feature, 'identify-result-frame');
           });
@@ -1269,10 +1268,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
           body = /*#__PURE__*/React.createElement("div", {
             className: "identify-compare-results",
             style: _style
-          }, results.map(function (_ref27) {
-            var _ref28 = _slicedToArray(_ref27, 2),
-              layerid = _ref28[0],
-              feature = _ref28[1];
+          }, results.map(function (_ref25) {
+            var _ref26 = _slicedToArray(_ref25, 2),
+              layerid = _ref26[0],
+              feature = _ref26[1];
             return _this2.renderResultAttributes(layerid, feature, 'identify-result-frame');
           }));
         } else if (this.state.currentPage < flatResults.length) {