qwc2 2025.12.19 → 2025.12.24

package/plugins/map3d/Measure3D.js

@@ -35,8 +35,8 @@ import ol from 'openlayers';
 import pointInPolygon from 'point-in-polygon';
 import PropTypes from 'prop-types';
 import { CurvePath, LineCurve, Vector2, Vector3 } from 'three';
-import TaskBar from '../../components/TaskBar';
 import HeightProfile3D from '../../components/map3d/HeightProfile3D';
+import TaskBar from '../../components/TaskBar';
 import ButtonBar from '../../components/widgets/ButtonBar';
 import CopyButton from '../../components/widgets/CopyButton';
 import ConfigUtils from '../../utils/ConfigUtils';

package/plugins/map3d/TopBar3D.js

@@ -27,13 +27,13 @@ import { connect } from 'react-redux';
 import classNames from 'classnames';
 import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
-import { toggleFullscreen, View3DMode } from '../../actions/display';
+import { toggleFullscreen, ViewMode } from '../../actions/display';
 import { openExternalUrl, setTopbarHeight } from '../../actions/windows';
 import AppMenu from '../../components/AppMenu';
 import FullscreenSwitcher from '../../components/FullscreenSwitcher';
+import SearchField3D from '../../components/map3d/SearchField3D';
 import { Swipeable } from '../../components/Swipeable';
 import Toolbar from '../../components/Toolbar';
-import SearchField3D from '../../components/map3d/SearchField3D';
 import ConfigUtils from '../../utils/ConfigUtils';
 import LocaleUtils from '../../utils/LocaleUtils';
 import ThemeUtils from '../../utils/ThemeUtils';
@@ -55,7 +55,7 @@ var TopBar3D = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_this, "filter2DItems", function (item) {
       var pluginConf = ConfigUtils.getPluginConfig(item.key);
-      return isEmpty(pluginConf) || _this.props.view3dMode === View3DMode.FULLSCREEN && pluginConf.availableIn3D;
+      return isEmpty(pluginConf) || _this.props.viewMode === ViewMode._3DFullscreen && pluginConf.availableIn3D;
     });
     _defineProperty(_this, "storeHeight", function (el) {
       if (el) {
@@ -100,7 +100,7 @@ var TopBar3D = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      if (this.props.currentTheme !== prevProps.currentTheme || this.props.view3dMode !== prevProps.view3dMode) {
+      if (this.props.currentTheme !== prevProps.currentTheme || this.props.viewMode !== prevProps.viewMode) {
         this.setState({
           allowedToolbarItems: ThemeUtils.allowedItems(this.props.toolbarItems, this.props.currentTheme, this.filter2DItems),
           allowedMenuItems: ThemeUtils.allowedItems(this.props.menuItems, this.props.currentTheme, this.filter2DItems)
@@ -167,7 +167,7 @@ var TopBar3D = /*#__PURE__*/function (_React$Component) {
         menuItems: this.state.allowedMenuItems,
         openExternalUrl: this.openUrl,
         showFilterField: config.appMenuFilterField
-      }), this.props.view3dMode === View3DMode.FULLSCREEN ? /*#__PURE__*/React.createElement(FullscreenSwitcher, null) : null));
+      }), this.props.viewMode === ViewMode._3DFullscreen ? /*#__PURE__*/React.createElement(FullscreenSwitcher, null) : null));
     }
   }]);
 }(React.Component);
@@ -193,7 +193,7 @@ _defineProperty(TopBar3D, "propTypes", {
    * You can also include entries for 2D plugins which are compatible with the 3D view (i.e. `ThemeSwitcher`, `Share`, etc.),
    * these will be displayed only in fullsceen 3D mode. */
   toolbarItems: PropTypes.array,
-  view3dMode: PropTypes.number
+  viewMode: PropTypes.number
 });
 _defineProperty(TopBar3D, "defaultProps", {
   searchOptions: {
@@ -204,7 +204,7 @@ export default connect(function (state) {
   return {
     currentTheme: state.theme.current,
     fullscreen: state.display.fullscreen,
-    view3dMode: state.display.view3dMode
+    viewMode: state.display.viewMode
   };
 }, {
   setTopbarHeight: setTopbarHeight,

package/plugins/style/ObliqueView.css

@@ -31,18 +31,25 @@ div.obliqueview-nav-rotate {
     align-items: center;
     justify-content: center;
     flex-wrap: wrap;
-    width: 4em;
-    height: 4em;
-    border-radius: 3em;
-    color: var(--map-button-text-color);
-    background-color: var(--map-button-bg-color);
-    box-shadow: 0px 5px 10px rgba(136, 136, 136, 0.5);
+    width: 6em;
+    height: 6em;
     margin-bottom: 0.5em;
     transition: transform 0.5s;
 }
 
 div.obliqueview-nav-rotate > span {
-    flex: 0 0 1.25em;
+    flex: 0 0 2em;
+}
+
+div.obliqueview-nav-circle {
+    position: absolute;
+    left: .75em;
+    top: .75em;
+    right: .75em;
+    bottom: .75em;
+    border: 4px solid var(--map-button-bg-color);
+    z-index: -1;
+    border-radius: 4.5em;
 }
 
 span.obliqueview-nav-dir {
@@ -52,12 +59,17 @@ span.obliqueview-nav-dir {
     font-weight: bold;
     cursor: pointer;
     transition: transform 0.5s;
+    border-radius: 6px;
+    color: var(--map-button-text-color);
+    background-color: var(--map-button-bg-color);
+    box-shadow: 0px 5px 10px rgba(136, 136, 136, 0.5);
+    line-height: 2em;
 }
 
 div.obliqueview-nav-zoom {
     position: absolute;
-    right: 0.5em;
-    top: 6em;
+    right: 1.5em;
+    top: 8em;
     width: 2em;
     display: flex;
     align-items: center;

package/reducers/display.js

@@ -15,7 +15,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { TOGGLE_FULLSCREEN, SET_VIEW_3D_MODE } from '../actions/display';
 var defaultState = {
   fullscreen: false,
-  view3dMode: 0
+  viewMode: 0
 };
 export default function toggleFullscreen() {
   var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultState;
@@ -30,7 +30,7 @@ export default function toggleFullscreen() {
     case SET_VIEW_3D_MODE:
       {
         return _objectSpread(_objectSpread({}, state), {}, {
-          view3dMode: action.mode
+          viewMode: action.mode
         });
       }
     default:

package/reducers/layers.js

@@ -390,7 +390,7 @@ export default function layers() {
       }
     case REORDER_LAYER:
       {
-        var _newLayers10 = LayerUtils.reorderLayer(state.flat, action.layer, action.sublayerpath, action.direction, action.preventSplittingGroups).map(function (layer) {
+        var _newLayers0 = LayerUtils.reorderLayer(state.flat, action.layer, action.sublayerpath, action.direction, action.preventSplittingGroups).map(function (layer) {
           if (layer.type === "wms") {
             return _objectSpread(_objectSpread({}, layer), LayerUtils.buildWMSLayerParams(layer, state.filter));
           } else {
@@ -398,24 +398,24 @@ export default function layers() {
           }
         });
         UrlParams.updateParams({
-          l: LayerUtils.buildWMSLayerUrlParam(_newLayers10)
+          l: LayerUtils.buildWMSLayerUrlParam(_newLayers0)
         });
         return _objectSpread(_objectSpread({}, state), {}, {
-          flat: _newLayers10
+          flat: _newLayers0
         });
       }
     case REPLACE_PLACEHOLDER_LAYER:
       {
-        var _newLayers11 = LayerUtils.replacePlaceholderLayer(state.flat, action.id, action.layer, state.filter);
+        var _newLayers1 = LayerUtils.replacePlaceholderLayer(state.flat, action.id, action.layer, state.filter);
         UrlParams.updateParams({
-          l: LayerUtils.buildWMSLayerUrlParam(_newLayers11)
+          l: LayerUtils.buildWMSLayerUrlParam(_newLayers1)
         });
         var _newEditConfigs3 = state.editConfigs;
         if (action.layer.editConfig && action.layer.wms_name) {
           _newEditConfigs3 = _objectSpread(_objectSpread({}, _newEditConfigs3), {}, _defineProperty({}, action.layer.wms_name, _objectSpread(_objectSpread({}, _newEditConfigs3[action.layer.wms_name]), action.layer.editConfig)));
         }
         return _objectSpread(_objectSpread({}, state), {}, {
-          flat: _newLayers11,
+          flat: _newLayers1,
           editConfigs: _newEditConfigs3
         });
       }
@@ -432,20 +432,20 @@ export default function layers() {
           filterGeom: action.filterGeom,
           timeRange: action.timeRange
         };
-        var _newLayers12 = state.flat.map(function (layer) {
+        var _newLayers10 = state.flat.map(function (layer) {
           if (layer.type === "wms") {
             return _objectSpread(_objectSpread({}, layer), LayerUtils.buildWMSLayerParams(layer, filter));
           }
           return layer;
         });
         return _objectSpread(_objectSpread({}, state), {}, {
-          flat: _newLayers12,
+          flat: _newLayers10,
           filter: filter
         });
       }
     case SET_THEME_LAYERS_VISIBILITY_PRESET:
       {
-        var _newLayers13 = state.flat.map(function (layer) {
+        var _newLayers11 = state.flat.map(function (layer) {
           if (layer.role === LayerRole.THEME) {
             var _newLayer2 = LayerUtils.applyVisibilityPreset(layer, action.preset);
             return _objectSpread(_objectSpread({}, _newLayer2), LayerUtils.buildWMSLayerParams(_newLayer2, state.filter));
@@ -454,10 +454,10 @@ export default function layers() {
           }
         });
         UrlParams.updateParams({
-          l: LayerUtils.buildWMSLayerUrlParam(_newLayers13)
+          l: LayerUtils.buildWMSLayerUrlParam(_newLayers11)
         });
         return _objectSpread(_objectSpread({}, state), {}, {
-          flat: _newLayers13
+          flat: _newLayers11
         });
       }
     default:

package/scripts/gen-plugin-docs.js

@@ -13,16 +13,19 @@ 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; }
+var reactDocs = require("react-docgen");
 var fs = require("fs");
 var path = require("path");
-var reactDocs = require("react-docgen");
+var findAllDefinitionsResolver = new reactDocs.builtinResolvers.FindAllDefinitionsResolver();
 var qwcPluginDir = __dirname + '/../plugins';
 var pluginData = [];
 fs.readdirSync(qwcPluginDir).forEach(function (entry) {
   if (entry.endsWith(".jsx")) {
     var file = path.resolve(qwcPluginDir, entry);
     var contents = fs.readFileSync(file);
-    pluginData.push(reactDocs.parse(contents, reactDocs.resolver.findAllComponentDefinitions));
+    pluginData.push(reactDocs.parse(contents, {
+      resolver: findAllDefinitionsResolver
+    }));
   }
 });
 pluginData = pluginData.flat();
@@ -31,7 +34,9 @@ fs.readdirSync(qwcPluginDir + "/map").forEach(function (entry) {
   if (entry.endsWith(".jsx")) {
     var file = path.resolve(qwcPluginDir, "map", entry);
     var contents = fs.readFileSync(file);
-    mapToolPluginData.push(reactDocs.parse(contents, reactDocs.resolver.findAllComponentDefinitions));
+    mapToolPluginData.push(reactDocs.parse(contents, {
+      resolver: findAllDefinitionsResolver
+    }));
   }
 });
 mapToolPluginData = mapToolPluginData.flat();
@@ -40,7 +45,9 @@ fs.readdirSync(qwcPluginDir + "/map3d").forEach(function (entry) {
   if (entry.endsWith(".jsx")) {
     var file = path.resolve(qwcPluginDir, "map3d", entry);
     var contents = fs.readFileSync(file);
-    plugin3dData.push(reactDocs.parse(contents, reactDocs.resolver.findAllComponentDefinitions));
+    plugin3dData.push(reactDocs.parse(contents, {
+      resolver: findAllDefinitionsResolver
+    }));
   }
 });
 plugin3dData = plugin3dData.flat();

package/scripts/makeIconkit.js

@@ -4,14 +4,14 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 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; }
 var webfontsGenerator = require('@furkot/webfonts-generator');
+var fs = require('fs');
 var glob = require('glob');
 var mkdirp = require('mkdirp');
-var fs = require('fs');
 var path = require('path');
 var readJSON = function readJSON(filename) {
   try {
     return JSON.parse(fs.readFileSync(process.cwd() + filename, "utf8"));
-  } catch (e) {
+  } catch (_unused) {
     return {};
   }
 };

package/scripts/themesConfig.js

@@ -20,16 +20,16 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 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 _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); }
-var urlUtil = require('url');
 var axios = require('axios');
+var urlUtil = require('url');
 var XMLParser = require('fast-xml-parser').XMLParser;
 var fs = require('fs');
-var path = require('path');
-var objectPath = require('object-path');
 var isEmpty = require('lodash.isempty');
+var objectPath = require('object-path');
+var path = require('path');
 var uuidv4 = require('uuid').v1;
-var os = require('os');
 var dns = require('dns');
+var os = require('os');
 var _dns$promises = dns.promises,
   lookup = _dns$promises.lookup,
   lookupService = _dns$promises.lookupService;
@@ -456,7 +456,7 @@ function getTheme(config, configItem, result, resultItem, proxy) {
               }).PrimaryKey.PrimaryKeyAttribute;
               printTemplate.atlasCoverageLayer = atlasLayer;
               printTemplate.atlas_pk = pk;
-            } catch (e) {
+            } catch (_unused) {
               /* eslint-disable-next-line */
               console.warn("Failed to determine primary key for atlas layer " + atlasLayer);
             }

package/scripts/updateTranslations.js

@@ -16,13 +16,13 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 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 _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); }
-var fs = require('fs');
 var merge = require('deepmerge');
+var fs = require('fs');
 var objectPath = require('object-path');
 var readJSON = function readJSON(path) {
   try {
     return JSON.parse(fs.readFileSync(process.cwd() + path, "utf8"));
-  } catch (e) {
+  } catch (_unused) {
     return {};
   }
 };

package/utils/CoordinatesUtils.js

@@ -86,7 +86,7 @@ var CoordinatesUtils = {
       var transformed = null;
       try {
         transformed = ol.proj.transform(point, source, dest);
-      } catch (e) {
+      } catch (_unused) {
         transformed = [0, 0];
       }
       return transformed;

package/utils/EditingUtils.js

@@ -31,9 +31,9 @@ import toposort from 'toposort';
 import { v5 as uuidv5 } from 'uuid';
 import StandardApp from '../components/StandardApp';
 import ConfigUtils from './ConfigUtils';
+import grammar from './expr_grammar/grammar';
 import LocaleUtils from './LocaleUtils';
 import MiscUtils from './MiscUtils';
-import grammar from './expr_grammar/grammar';
 var UUID_NS = '5ae5531d-8e21-4456-b45d-77e9840a5bb7';
 export var FeatureCache = /*#__PURE__*/_createClass(function FeatureCache() {
   _classCallCheck(this, FeatureCache);
@@ -189,7 +189,7 @@ export function parseExpression(expr, feature, editConfig, editIface, mapPrefix,
   try {
     parser.feed(expr.replace(/\n/, ' '));
     result = parser.results[0];
-  } catch (e) {
+  } catch (_unused) {
     /* eslint-disable-next-line */
     console.warn("Failed to evaluate expression " + expr.replace(/\n/, ' '));
   }
@@ -242,7 +242,7 @@ export function parseExpressionsAsync(fieldExpressions, feature, editConfig, edi
         // NOTE: include intermediate results in next context feature
         newfeature.properties[field] = parser.results[0];
         return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, field, parser.results[0]));
-      } catch (e) {
+      } catch (_unused2) {
         /* eslint-disable-next-line */
         console.warn("Failed to evaluate expression " + expression.replace(/\n/, ' '));
         return res;
@@ -332,7 +332,7 @@ export function computeExpressionFields(editConfig, feature, editIface, mapCrs,
         return res;
       }
     }, []);
-  } catch (e) {
+  } catch (_unused3) {
     /* eslint-disable-next-line */
     console.warn("Failed to sort expressions, they probably contain cyclic dependencies");
     fieldExpressions = Object.entries(fieldExpressions).map(function (_ref4) {

package/utils/FeatureStyles.js

@@ -16,10 +16,10 @@ import ol from 'openlayers';
 import minus from '../icons/minus.svg';
 import plus from '../icons/plus.svg';
 import ConfigUtils from './ConfigUtils';
-import ResourceRegistry from './ResourceRegistry';
 import arrowhead from './img/arrowhead.svg';
 import markerIcon from './img/marker-icon.png';
 import measurehead from './img/measurehead.svg';
+import ResourceRegistry from './ResourceRegistry';
 ResourceRegistry.addResource('arrowhead', arrowhead);
 ResourceRegistry.addResource('measurehead', measurehead);
 ResourceRegistry.addResource('marker', markerIcon);