qwc2 2025.12.19 → 2025.12.24

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';
@@ -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';

package/plugins/ObliqueView.js

@@ -28,12 +28,13 @@ import axios from 'axios';
 import isEqual from 'lodash.isequal';
 import ol from 'openlayers';
 import PropTypes from 'prop-types';
+import { setViewMode, ViewMode } from '../actions/display';
 import { zoomToExtent } from '../actions/map';
 import { setCurrentTask } from '../actions/task';
 import Icon from '../components/Icon';
+import OlLayer from '../components/map/OlLayer';
 import OverviewMapButton from '../components/OverviewMapButton';
 import ResizeableWindow from '../components/ResizeableWindow';
-import OlLayer from '../components/map/OlLayer';
 import InputContainer from '../components/widgets/InputContainer';
 import ConfigUtils from '../utils/ConfigUtils';
 import CoordinatesUtils from '../utils/CoordinatesUtils';
@@ -72,6 +73,7 @@ var ObliqueView = /*#__PURE__*/function (_React$Component) {
     _classCallCheck(this, ObliqueView);
     _this = _callSuper(this, ObliqueView, [props]);
     _defineProperty(_this, "onClose", function () {
+      _this.props.setViewMode(ViewMode._2D);
       _this.setState(ObliqueView.defaultState);
     });
     _defineProperty(_this, "renderScaleChooser", function () {
@@ -264,6 +266,9 @@ var ObliqueView = /*#__PURE__*/function (_React$Component) {
     key: "componentDidMount",
     value: function componentDidMount() {
       window.addEventListener('focus', this.trackFocus, true);
+      if (this.props.startupParams.v === "oblique") {
+        this.props.setViewMode(ViewMode._Oblique);
+      }
     }
   }, {
     key: "componentWillUnmount",
@@ -274,12 +279,14 @@ var ObliqueView = /*#__PURE__*/function (_React$Component) {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps, prevState) {
       if (this.props.active && !prevProps.active) {
-        this.setState({
-          active: true
-        });
+        this.props.setViewMode(ViewMode._Oblique);
         this.props.setCurrentTask(null);
       }
-      if (this.state.active && this.props.theme && (this.props.theme !== prevProps.theme || !prevState.active)) {
+      // Honour theme startupView on theme change unless first loaded theme and startupParams.v is set
+      if (this.props.theme !== prevProps.theme && this.props.theme.startupView === "oblique" && (prevProps.theme !== null || !this.props.startupParams.v)) {
+        this.props.setViewMode(ViewMode._Oblique);
+      }
+      if (this.props.viewMode === ViewMode._Oblique && this.props.theme && (this.props.theme !== prevProps.theme || prevProps.viewMode !== ViewMode._Oblique)) {
         var _datasets$find$name, _datasets$find, _datasets$;
         var datasets = this.props.theme.obliqueDatasets || [];
         var defaultDataset = (_datasets$find$name = (_datasets$find = datasets.find(function (entry) {
@@ -318,9 +325,14 @@ var ObliqueView = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _this2 = this,
+        _this$props$theme,
+        _this$props$theme$fin,
+        _this$props$themes,
+        _this$props$themes$fi,
         _obliqueConfig$backgr,
-        _this$state$selectedD;
-      if (!this.state.active) {
+        _this$state$selectedD,
+        _this$props$theme2;
+      if (this.props.viewMode !== ViewMode._Oblique || !this.props.themes) {
         return null;
       }
       var rot = this.getRotation();
@@ -340,10 +352,10 @@ var ObliqueView = /*#__PURE__*/function (_React$Component) {
         title: LocaleUtils.tr("common.lock2dview"),
         active: this.state.viewsLocked
       }];
-      var obliqueConfig = this.props.theme.obliqueDatasets.find(function (entry) {
+      var obliqueConfig = (_this$props$theme = this.props.theme) === null || _this$props$theme === void 0 || (_this$props$theme = _this$props$theme.obliqueDatasets) === null || _this$props$theme === void 0 || (_this$props$theme$fin = _this$props$theme.find) === null || _this$props$theme$fin === void 0 ? void 0 : _this$props$theme$fin.call(_this$props$theme, function (entry) {
         return entry.name === _this2.state.selectedDataset;
       });
-      var basemap = this.props.themes.backgroundLayers.find(function (entry) {
+      var basemap = (_this$props$themes = this.props.themes) === null || _this$props$themes === void 0 || (_this$props$themes = _this$props$themes.backgroundLayers) === null || _this$props$themes === void 0 || (_this$props$themes$fi = _this$props$themes.find) === null || _this$props$themes$fi === void 0 ? void 0 : _this$props$themes$fi.call(_this$props$themes, function (entry) {
         return entry.name === (obliqueConfig === null || obliqueConfig === void 0 ? void 0 : obliqueConfig.backgroundLayer);
       });
       return /*#__PURE__*/React.createElement(ResizeableWindow, {
@@ -422,7 +434,9 @@ var ObliqueView = /*#__PURE__*/function (_React$Component) {
           transform: "rotate(".concat(-rot, "deg)")
         },
         tabIndex: 0
-      }, "S"), /*#__PURE__*/React.createElement("span", null)), /*#__PURE__*/React.createElement("div", {
+      }, "S"), /*#__PURE__*/React.createElement("span", null), /*#__PURE__*/React.createElement("div", {
+        className: "obliqueview-nav-circle"
+      })), /*#__PURE__*/React.createElement("div", {
         className: "obliqueview-nav-zoom"
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "plus",
@@ -450,7 +464,7 @@ var ObliqueView = /*#__PURE__*/function (_React$Component) {
           });
         },
         value: (_this$state$selectedD = this.state.selectedDataset) !== null && _this$state$selectedD !== void 0 ? _this$state$selectedD : ""
-      }, (this.props.theme.obliqueDatasets || []).map(function (entry) {
+      }, (((_this$props$theme2 = this.props.theme) === null || _this$props$theme2 === void 0 ? void 0 : _this$props$theme2.obliqueDatasets) || []).map(function (entry) {
         var _entry$title;
         return /*#__PURE__*/React.createElement("option", {
           key: entry.name,
@@ -488,8 +502,11 @@ _defineProperty(ObliqueView, "propTypes", {
   /** A list of allowed map scales, in decreasing order. */
   scales: PropTypes.arrayOf(PropTypes.number),
   setCurrentTask: PropTypes.func,
+  setViewMode: PropTypes.func,
+  startupParams: PropTypes.object,
   theme: PropTypes.object,
   themes: PropTypes.object,
+  viewMode: PropTypes.number,
   zoomToExtent: PropTypes.func
 });
 _defineProperty(ObliqueView, "defaultProps", {
@@ -505,7 +522,6 @@ _defineProperty(ObliqueView, "defaultProps", {
   scales: [20000, 10000, 5000, 2500, 1000, 500, 250]
 });
 _defineProperty(ObliqueView, "defaultState", {
-  active: false,
   selectedDataset: null,
   datasetConfig: null,
   currentDirection: null,
@@ -517,10 +533,13 @@ export default connect(function (state) {
   return {
     active: state.task.id === "ObliqueView",
     map: state.map,
+    startupParams: state.localConfig.startupParams,
+    viewMode: state.display.viewMode,
     theme: state.theme.current,
     themes: state.theme.themes
   };
 }, {
   setCurrentTask: setCurrentTask,
+  setViewMode: setViewMode,
   zoomToExtent: zoomToExtent
 })(ObliqueView);