qwc2 2025.12.19 → 2025.12.24

package/plugins/View3D.js

@@ -27,7 +27,7 @@ import { connect, Provider } from 'react-redux';
 import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
 import * as displayExports from '../actions/display';
-import { setView3dMode, View3DMode } from '../actions/display';
+import { setViewMode, ViewMode } from '../actions/display';
 import * as layersExports from '../actions/layers';
 import { LayerRole, addLayerFeatures, removeLayer } from '../actions/layers';
 import { panTo, zoomToPoint } from '../actions/map';
@@ -36,7 +36,6 @@ import * as themeExports from '../actions/theme';
 import PluginsContainer from '../components/PluginsContainer';
 import ResizeableWindow from '../components/ResizeableWindow';
 import StandardApp from '../components/StandardApp';
-import View3DSwitcher from '../components/map3d/View3DSwitcher';
 import Spinner from '../components/widgets/Spinner';
 import ReducerIndex from '../reducers/index';
 import personIcon from '../resources/person.png';
@@ -57,83 +56,24 @@ var View3D = /*#__PURE__*/function (_React$Component) {
     var _this;
     _classCallCheck(this, View3D);
     _this = _callSuper(this, View3D, [props]);
+    _defineProperty(_this, "EnabledState", {
+      DISABLED: 0,
+      ENABLED: 1,
+      DISABLING: 2
+    });
     _defineProperty(_this, "state", {
       componentLoaded: false,
       windowDetached: false,
       viewsLocked: false,
-      storedState: null
-    });
-    _defineProperty(_this, "render3DWindow", function () {
-      if (_this.props.view3dMode > View3DMode.DISABLED) {
-        var extraControls = [{
-          icon: "sync",
-          callback: _this.sync2DExtent,
-          title: LocaleUtils.tr("common.sync2dview")
-        }, {
-          icon: "lock",
-          callback: _this.setLockViews,
-          title: LocaleUtils.tr("common.lock2dview"),
-          active: _this.state.viewsLocked
-        }];
-        if (!_this.state.windowDetached) {
-          extraControls.push({
-            icon: "maximize",
-            callback: function callback() {
-              return _this.props.setView3dMode(View3DMode.FULLSCREEN);
-            },
-            title: LocaleUtils.tr("window.maximize")
-          });
-        }
-        var Map3D = _this.map3dComponent;
-        var device = ConfigUtils.isMobile() ? 'mobile' : 'desktop';
-        var pluginsConfig = _this.props.view3dMode === View3DMode.FULLSCREEN ? _this.props.localConfig.plugins[device].filter(function (entry) {
-          return entry.availableIn3D;
-        }) : [];
-        return /*#__PURE__*/React.createElement(ResizeableWindow, {
-          extraControls: extraControls,
-          fullscreen: _this.props.view3dMode === View3DMode.FULLSCREEN,
-          icon: "map3d",
-          initialHeight: _this.props.geometry.initialHeight,
-          initialWidth: _this.props.geometry.initialWidth,
-          initialX: _this.props.geometry.initialX,
-          initialY: _this.props.geometry.initialY,
-          initiallyDocked: _this.props.geometry.initiallyDocked,
-          key: "View3DWindow",
-          maximizeable: false,
-          onClose: _this.onClose,
-          onExternalWindowResized: _this.redrawScene,
-          onFocusChanged: _this.windowFocusChanged,
-          onGeometryChanged: _this.onGeometryChanged,
-          splitScreenWhenDocked: true,
-          splitTopAndBottomBar: true,
-          title: LocaleUtils.tr("map3d.title")
-        }, _this.state.componentLoaded ? /*#__PURE__*/React.createElement(Provider, {
-          store: _this.store
-        }, /*#__PURE__*/React.createElement(PluginsContainer, {
-          pluginsConfig: pluginsConfig
-        }, /*#__PURE__*/React.createElement(Map3D, {
-          controlsPosition: _this.props.controlsPosition,
-          defaultSceneQuality: _this.props.defaultSceneQuality,
-          innerRef: _this.setRef,
-          mouseButtons: _this.props.mouseButtons,
-          onCameraChanged: _this.onCameraChanged,
-          onMapInitialized: _this.setupMap,
-          pluginOptions: _this.props.pluginOptions,
-          plugins3d: _this.props.plugins3d,
-          searchProviders: _this.props.searchProviders,
-          theme: _this.props.theme
-        }), _this.props.view3dMode === View3DMode.DISABLING ? /*#__PURE__*/React.createElement("div", {
-          className: "view3d-busy-overlay"
-        }, /*#__PURE__*/React.createElement(Spinner, null), /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("view3d.storingstate"))) : null)) : null);
-      }
-      return null;
+      storedState: null,
+      enabledState: _this.EnabledState.DISABLED
     });
     _defineProperty(_this, "onClose", function () {
-      _this.props.setView3dMode(View3DMode.DISABLING);
+      _this.props.setViewMode(ViewMode._2D);
     });
     _defineProperty(_this, "onGeometryChanged", function (geometry) {
-      if (geometry.maximized && _this.props.view3dMode !== View3DMode.FULLSCREEN) {
-        _this.props.setView3dMode(View3DMode.FULLSCREEN);
+      if (geometry.maximized && _this.props.viewMode !== ViewMode._3DFullscreen) {
+        _this.props.setViewMode(ViewMode._3DFullscreen);
       }
       _this.setState({
         windowDetached: geometry.detached
@@ -230,7 +170,8 @@ var View3D = /*#__PURE__*/function (_React$Component) {
     _this.map3dComponent = null;
     _this.map3dComponentRef = null;
     _this.focusedMap = null;
-    _this.firstPersonMarker = true;
+    _this.firstPersonMarker = false;
+    _this.pendingViewState = null;
     // Subset of 2d reducers
     var _ReducerIndex$reducer = ReducerIndex.reducers,
       processNotifications = _ReducerIndex$reducer.processNotifications,
@@ -303,9 +244,9 @@ var View3D = /*#__PURE__*/function (_React$Component) {
     key: "componentDidMount",
     value: function componentDidMount() {
       if (this.props.startupParams.v === "3d") {
-        this.props.setView3dMode(View3DMode.FULLSCREEN);
+        this.props.setViewMode(ViewMode._3DFullscreen);
       } else if (this.props.startupParams.v === "3d2d") {
-        this.props.setView3dMode(View3DMode.SPLITSCREEN);
+        this.props.setViewMode(ViewMode._3DSplitscreen);
       }
       window.addEventListener('focus', this.trackFocus, true);
       this.syncParentStore({});
@@ -318,9 +259,33 @@ var View3D = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps, prevState) {
-      var _this2 = this,
-        _this$props$theme$cur;
-      if (this.props.view3dMode !== View3DMode.DISABLED && prevProps.view3dMode === View3DMode.DISABLED) {
+      var _this$props$theme$cur,
+        _this2 = this,
+        _this$props$theme$cur2;
+      var is3DViewMode = function is3DViewMode(viewMode) {
+        return [ViewMode._3DFullscreen, ViewMode._3DSplitscreen].includes(viewMode);
+      };
+
+      // Honour theme startupView on theme change unless first loaded theme and startupParams.v is set
+      if (this.props.theme.current !== prevProps.theme.current && (_this$props$theme$cur = this.props.theme.current) !== null && _this$props$theme$cur !== void 0 && _this$props$theme$cur.startupView && (prevProps.theme.current !== null || !this.props.startupParams.v)) {
+        if (this.props.theme.current.startupView === "3d2d") {
+          this.props.setViewMode(ViewMode._3DSplitscreen);
+        } else if (this.props.theme.current.startupView === "3d") {
+          this.props.setViewMode(ViewMode._3DFullscreen);
+        }
+      }
+      if (this.state.enabledState === this.EnabledState.DISABLING && this.props.viewMode !== prevProps.viewMode) {
+        this.pendingViewState = [ViewMode._3DFullscreen, ViewMode._3DSplitscreen].includes(this.props.viewMode) ? this.EnabledState.ENABLED : this.EnabledState.DISABLED;
+      } else if (is3DViewMode(this.props.viewMode) && !is3DViewMode(prevProps.viewMode)) {
+        this.setState({
+          enabledState: this.EnabledState.ENABLED
+        });
+      } else if (!is3DViewMode(this.props.viewMode) && is3DViewMode(prevProps.viewMode)) {
+        this.setState({
+          enabledState: this.EnabledState.DISABLING
+        });
+      }
+      if (this.state.enabledState !== this.EnabledState.DISABLED && prevState.enabledState === this.EnabledState.DISABLED) {
         import('../components/map3d/Map3D').then(function (component) {
           _this2.map3dComponent = component["default"];
           _this2.map3dComponentRef = null;
@@ -329,26 +294,30 @@ var View3D = /*#__PURE__*/function (_React$Component) {
           });
         });
         this.syncParentStore(this.props, true);
-      } else if (this.props.view3dMode === View3DMode.DISABLING && prevProps.view3dMode !== View3DMode.DISABLING) {
+      } else if (this.state.enabledState === this.EnabledState.DISABLING && prevState.enabledState !== this.EnabledState.DISABLING) {
         if (this.map3dComponentRef) {
           this.map3dComponentRef.store3dState().then(function (storedState) {
             _this2.setState({
-              storedState: storedState
+              storedState: storedState,
+              enabledState: _this2.EnabledState.DISABLED
+            }, function () {
+              if (_this2.pendingViewState !== null) {
+                _this2.setState({
+                  enabledState: _this2.pendingViewState
+                });
+              }
             });
-            UrlParams.updateParams({
-              v3d: undefined,
-              bl3d: undefined
-            });
-            _this2.props.setView3dMode(View3DMode.DISABLED);
           });
         } else {
-          UrlParams.updateParams({
-            v3d: undefined,
-            bl3d: undefined
+          this.setState({
+            enabledState: this.EnabledState.DISABLED
           });
-          this.props.setView3dMode(View3DMode.DISABLED);
         }
-      } else if (this.props.view3dMode === View3DMode.DISABLED && prevProps.view3dMode !== View3DMode.DISABLED) {
+      } else if (this.state.enabledState === this.EnabledState.DISABLED && prevState.enabledState !== this.EnabledState.DISABLED) {
+        UrlParams.updateParams({
+          v3d: undefined,
+          bl3d: undefined
+        });
         this.map3dComponent = null;
         this.map3dComponentRef = null;
         this.setState({
@@ -361,28 +330,16 @@ var View3D = /*#__PURE__*/function (_React$Component) {
       }
       // Sync parts of parent store
       this.syncParentStore(prevProps);
-      // Handle view mode change
-      if (this.props.view3dMode !== prevProps.view3dMode) {
-        if (this.props.view3dMode === View3DMode.FULLSCREEN) {
-          UrlParams.updateParams({
-            v: "3d"
-          });
-          this.setState({
-            viewsLocked: false
-          });
-        } else if (this.props.view3dMode === View3DMode.SPLITSCREEN) {
-          UrlParams.updateParams({
-            v: "3d2d"
-          });
-        } else {
-          UrlParams.updateParams({
-            v: "2d"
-          });
-        }
+
+      // Unlock views when switching to fullscreen 3D mode
+      if (this.props.viewMode !== prevProps.viewMode && this.props.viewMode === ViewMode._3DFullscreen) {
+        this.setState({
+          viewsLocked: false
+        });
       }
       // Switch to 2D mode if new theme has no 3D configuration
-      if (this.props.theme.current !== prevProps.theme.current && !((_this$props$theme$cur = this.props.theme.current) !== null && _this$props$theme$cur !== void 0 && _this$props$theme$cur.map3d) && this.props.view3dMode !== View3DMode.DISABLED) {
-        this.props.setView3dMode(View3D.DISABLED);
+      if (this.props.theme.current !== prevProps.theme.current && !((_this$props$theme$cur2 = this.props.theme.current) !== null && _this$props$theme$cur2 !== void 0 && _this$props$theme$cur2.map3d) && this.props.viewMode !== ViewMode._2D) {
+        this.props.setViewMode(ViewMode._2D);
       }
       // Lock views
       if (this.state.viewsLocked && this.props.map.bbox !== prevProps.map.bbox && this.focusedMap === "map") {
@@ -399,7 +356,7 @@ var View3D = /*#__PURE__*/function (_React$Component) {
     key: "syncParentStore",
     value: function syncParentStore(prevProps) {
       var force = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-      if (this.props.view3dMode === View3DMode.DISABLED) {
+      if (this.state.enabledState !== this.EnabledState.ENABLED) {
         return;
       }
       if (this.props.display !== prevProps.display || force) {
@@ -436,19 +393,75 @@ var View3D = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props$theme$cur2;
-      var button = (_this$props$theme$cur2 = this.props.theme.current) !== null && _this$props$theme$cur2 !== void 0 && _this$props$theme$cur2.map3d ? /*#__PURE__*/React.createElement(View3DSwitcher, {
-        key: "View3DButton",
-        position: this.props.buttonPosition
-      }) : null;
-      return [button, this.render3DWindow()];
+      var _this3 = this;
+      if (this.state.enabledState > this.EnabledState.DISABLED) {
+        var extraControls = [{
+          icon: "sync",
+          callback: this.sync2DExtent,
+          title: LocaleUtils.tr("common.sync2dview")
+        }, {
+          icon: "lock",
+          callback: this.setLockViews,
+          title: LocaleUtils.tr("common.lock2dview"),
+          active: this.state.viewsLocked
+        }];
+        if (!this.state.windowDetached) {
+          extraControls.push({
+            icon: "maximize",
+            callback: function callback() {
+              return _this3.props.setViewMode(ViewMode._3DFullscreen);
+            },
+            title: LocaleUtils.tr("window.maximize")
+          });
+        }
+        var Map3D = this.map3dComponent;
+        var device = ConfigUtils.isMobile() ? 'mobile' : 'desktop';
+        var pluginsConfig = this.props.viewMode === ViewMode._3DFullscreen ? this.props.localConfig.plugins[device].filter(function (entry) {
+          return entry.availableIn3D;
+        }) : [];
+        return /*#__PURE__*/React.createElement(ResizeableWindow, {
+          extraControls: extraControls,
+          fullscreen: this.props.viewMode === ViewMode._3DFullscreen,
+          icon: "map3d",
+          initialHeight: this.props.geometry.initialHeight,
+          initialWidth: this.props.geometry.initialWidth,
+          initialX: this.props.geometry.initialX,
+          initialY: this.props.geometry.initialY,
+          initiallyDocked: this.props.geometry.initiallyDocked,
+          key: "View3DWindow",
+          maximizeable: false,
+          onClose: this.onClose,
+          onExternalWindowResized: this.redrawScene,
+          onFocusChanged: this.windowFocusChanged,
+          onGeometryChanged: this.onGeometryChanged,
+          splitScreenWhenDocked: true,
+          splitTopAndBottomBar: true,
+          title: LocaleUtils.tr("map3d.title")
+        }, this.state.componentLoaded ? /*#__PURE__*/React.createElement(Provider, {
+          store: this.store
+        }, /*#__PURE__*/React.createElement(PluginsContainer, {
+          pluginsConfig: pluginsConfig
+        }, /*#__PURE__*/React.createElement(Map3D, {
+          controlsPosition: this.props.controlsPosition,
+          defaultSceneQuality: this.props.defaultSceneQuality,
+          innerRef: this.setRef,
+          mouseButtons: this.props.mouseButtons,
+          onCameraChanged: this.onCameraChanged,
+          onMapInitialized: this.setupMap,
+          pluginOptions: this.props.pluginOptions,
+          plugins3d: this.props.plugins3d,
+          searchProviders: this.props.searchProviders,
+          theme: this.props.theme
+        }), this.state.enabledState === this.EnabledState.DISABLING ? /*#__PURE__*/React.createElement("div", {
+          className: "view3d-busy-overlay"
+        }, /*#__PURE__*/React.createElement(Spinner, null), /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("view3d.storingstate"))) : null)) : null);
+      }
+      return null;
     }
   }]);
 }(React.Component);
 _defineProperty(View3D, "propTypes", {
   addLayerFeatures: PropTypes.func,
-  /** The position slot index of the 3d switch map button, from the bottom (0: bottom slot). */
-  buttonPosition: PropTypes.number,
   /** The position of the navigation controls. Either `top` or `bottom`. */
   controlsPosition: PropTypes.string,
   /** The default scene quality factor (`20`: min, `100`: max). */
@@ -478,15 +491,14 @@ _defineProperty(View3D, "propTypes", {
   plugins3d: PropTypes.object,
   removeLayer: PropTypes.func,
   searchProviders: PropTypes.object,
-  setView3dMode: PropTypes.func,
+  setViewMode: PropTypes.func,
   startupParams: PropTypes.object,
   startupState: PropTypes.object,
   theme: PropTypes.object,
-  view3dMode: PropTypes.number,
+  viewMode: PropTypes.number,
   zoomToPoint: PropTypes.func
 });
 _defineProperty(View3D, "defaultProps", {
-  buttonPosition: 6,
   controlsPosition: 'top',
   defaultSceneQuality: 100,
   geometry: {
@@ -512,7 +524,7 @@ export default (function (plugins3d) {
       layers: state.layers,
       theme: state.theme,
       localConfig: state.localConfig,
-      view3dMode: state.display.view3dMode,
+      viewMode: state.display.viewMode,
       startupParams: state.localConfig.startupParams,
       startupState: state.localConfig.startupState
     };
@@ -521,6 +533,6 @@ export default (function (plugins3d) {
     removeLayer: removeLayer,
     panTo: panTo,
     zoomToPoint: zoomToPoint,
-    setView3dMode: setView3dMode
+    setViewMode: setViewMode
   })(View3D);
 });

package/plugins/map/RedliningSupport.js

@@ -40,8 +40,8 @@ import { LayerRole, addLayerFeatures, removeLayerFeatures } from '../../actions/
 import { changeRedliningState } from '../../actions/redlining';
 import FeatureAttributesWindow from '../../components/FeatureAttributesWindow';
 import LocationRecorder from '../../components/LocationRecorder';
-import NumericInputWindow from '../../components/NumericInputWindow';
 import { OlLayerAdded, OlLayerUpdated } from '../../components/map/OlLayer';
+import NumericInputWindow from '../../components/NumericInputWindow';
 import FeatureStyles from '../../utils/FeatureStyles';
 import MapUtils from '../../utils/MapUtils';
 import MeasureUtils from '../../utils/MeasureUtils';

package/plugins/map3d/Draw3D.js

@@ -31,9 +31,9 @@ import PropTypes from 'prop-types';
 import { Group } from 'three';
 import { v4 as uuidv4 } from 'uuid';
 import Icon from '../../components/Icon';
-import TaskBar from '../../components/TaskBar';
 import CreateTool3D from '../../components/map3d/drawtool/CreateTool3D';
 import EditTool3D from '../../components/map3d/drawtool/EditTool3D';
+import TaskBar from '../../components/TaskBar';
 import ButtonBar from '../../components/widgets/ButtonBar';
 import LocaleUtils from '../../utils/LocaleUtils';
 
@@ -208,9 +208,9 @@ var Draw3D = /*#__PURE__*/function (_React$Component) {
         },
         value: _this.state.drawGroupId
       }, drawGroups.map(function (_ref9) {
-        var _ref10 = _slicedToArray(_ref9, 2),
-          objectId = _ref10[0],
-          options = _ref10[1];
+        var _ref0 = _slicedToArray(_ref9, 2),
+          objectId = _ref0[0],
+          options = _ref0[1];
         return /*#__PURE__*/React.createElement("option", {
           key: objectId,
           value: objectId

package/plugins/map3d/ExportObjects3D.js

@@ -43,8 +43,8 @@ import PropTypes from 'prop-types';
 import { Box3, BufferGeometry, Float32BufferAttribute, Group, Matrix4, Mesh, MeshStandardMaterial, Quaternion, Scene, Vector3 } from 'three';
 import { GLTFExporter } from 'three/addons/exporters/GLTFExporter.js';
 import { setCurrentTask } from '../../actions/task';
-import SideBar from '../../components/SideBar';
 import { TileMeshHelper } from '../../components/map3d/utils/MiscUtils3D';
+import SideBar from '../../components/SideBar';
 import Spinner from '../../components/widgets/Spinner';
 import LocaleUtils from '../../utils/LocaleUtils';
 import VectorLayerUtils from '../../utils/VectorLayerUtils';

package/plugins/map3d/HideObjects3D.js

@@ -36,8 +36,8 @@ import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
 import { BufferAttribute, BufferGeometry, Float32BufferAttribute, Mesh, MeshStandardMaterial, Raycaster, Vector2 } from 'three';
 import Icon from '../../components/Icon';
-import SideBar from '../../components/SideBar';
 import { TileMeshHelper } from '../../components/map3d/utils/MiscUtils3D';
+import SideBar from '../../components/SideBar';
 import LocaleUtils from '../../utils/LocaleUtils';
 import './style/HideObjects3D.css';
 
@@ -61,7 +61,7 @@ var HideObjects3D = /*#__PURE__*/function (_React$Component) {
       }, isEmpty(_this.state.hiddenObjects) ? /*#__PURE__*/React.createElement("i", null, LocaleUtils.tr("hideobjects3d.clickonmap")) : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
         className: "hideobjects3d-list"
       }, _this.state.hiddenObjects.map(function (entry) {
-        var _ref;
+        var _entry$featureId;
         return /*#__PURE__*/React.createElement("div", {
           key: entry.object.uuid + entry.featureId,
           onMouseEnter: function onMouseEnter() {
@@ -70,7 +70,7 @@ var HideObjects3D = /*#__PURE__*/function (_React$Component) {
           onMouseLeave: function onMouseLeave() {
             return _this.hideHighlight(entry);
           }
-        }, /*#__PURE__*/React.createElement("span", null, (_ref = LocaleUtils.tr("hideobjects3d.object") + " " + entry.featureId) !== null && _ref !== void 0 ? _ref : ""), /*#__PURE__*/React.createElement(Icon, {
+        }, /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("hideobjects3d.object") + " " + ((_entry$featureId = entry.featureId) !== null && _entry$featureId !== void 0 ? _entry$featureId : "")), /*#__PURE__*/React.createElement(Icon, {
           icon: "eye",
           onClick: function onClick() {
             return _this.restoreObject(entry);
@@ -118,11 +118,11 @@ var HideObjects3D = /*#__PURE__*/function (_React$Component) {
       var y = -((ev.clientY - rect.top) / rect.height) * 2 + 1;
       raycaster.setFromCamera(new Vector2(x, y), camera);
       var picks = [];
-      Object.entries(_this.props.sceneContext.sceneObjects).forEach(function (_ref2) {
+      Object.entries(_this.props.sceneContext.sceneObjects).forEach(function (_ref) {
         var _object$tiles;
-        var _ref3 = _slicedToArray(_ref2, 2),
-          objId = _ref3[0],
-          options = _ref3[1];
+        var _ref2 = _slicedToArray(_ref, 2),
+          objId = _ref2[0],
+          options = _ref2[1];
         if (!options.layertree || !options.visibility) {
           return;
         }

package/plugins/map3d/Identify3D.js

@@ -36,8 +36,8 @@ import axios from 'axios';
 import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
 import { BufferGeometry, Float32BufferAttribute, Mesh, MeshStandardMaterial, Raycaster, Vector2 } from 'three';
-import ResizeableWindow from '../../components/ResizeableWindow';
 import { TileMeshHelper } from '../../components/map3d/utils/MiscUtils3D';
+import ResizeableWindow from '../../components/ResizeableWindow';
 import LocaleUtils from '../../utils/LocaleUtils';
 import '../../components/style/IdentifyViewer.css';
 

package/plugins/map3d/LayerTree3D.js

@@ -37,8 +37,8 @@ import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
 import { setCurrentTask } from '../../actions/task';
 import Icon from '../../components/Icon';
-import SideBar from '../../components/SideBar';
 import ImportObjects3D from '../../components/map3d/ImportObjects3D';
+import SideBar from '../../components/SideBar';
 import NumberInput from '../../components/widgets/NumberInput';
 import LocaleUtils from '../../utils/LocaleUtils';
 import './style/LayerTree3D.css';

package/plugins/map3d/MapExport3D.js

@@ -1,5 +1,6 @@
 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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 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); }
@@ -487,10 +488,10 @@ var MapExport3D = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "exportToPdf",
     value: function () {
-      var _exportToPdf = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(form, imgBuffer) {
+      var _exportToPdf = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(form, imgBuffer) {
         var formData, data, config, response, _yield$import, PDFDocument, doc, page, pngImage, x, y, width, height, pdfData, blob;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+        return _regenerator().w(function (_context) {
+          while (1) switch (_context.n) {
             case 0:
               formData = _objectSpread(_objectSpread({}, formDataEntries(new FormData(form))), Object.fromEntries((this.props.theme.extraPrintParameters || "").split("&").filter(Boolean).map(function (entry) {
                 return entry.split("=");
@@ -506,28 +507,28 @@ var MapExport3D = /*#__PURE__*/function (_React$Component) {
                 },
                 responseType: "arraybuffer"
               };
-              _context.next = 5;
+              _context.n = 1;
               return axios.post(this.props.theme.printUrl, data, config);
-            case 5:
-              response = _context.sent;
+            case 1:
+              response = _context.v;
               if (!response) {
-                _context.next = 31;
+                _context.n = 6;
                 break;
               }
-              _context.next = 9;
+              _context.n = 2;
               return import('pdf-lib');
-            case 9:
-              _yield$import = _context.sent;
+            case 2:
+              _yield$import = _context.v;
               PDFDocument = _yield$import.PDFDocument;
-              _context.next = 13;
+              _context.n = 3;
               return PDFDocument.load(response.data);
-            case 13:
-              doc = _context.sent;
+            case 3:
+              doc = _context.v;
               page = doc.getPages()[0];
-              _context.next = 17;
+              _context.n = 4;
               return doc.embedPng(imgBuffer);
-            case 17:
-              pngImage = _context.sent;
+            case 4:
+              pngImage = _context.v;
               x = this.state.layout.map.x * 2.8346;
               y = this.state.layout.map.y * 2.8346;
               width = this.state.layout.map.width * 2.8346;
@@ -538,10 +539,10 @@ var MapExport3D = /*#__PURE__*/function (_React$Component) {
                 width: width,
                 height: height
               });
-              _context.next = 25;
+              _context.n = 5;
               return doc.save();
-            case 25:
-              pdfData = _context.sent;
+            case 5:
+              pdfData = _context.v;
               blob = new Blob([pdfData], {
                 type: 'application/pdf'
               });
@@ -549,17 +550,16 @@ var MapExport3D = /*#__PURE__*/function (_React$Component) {
               this.setState({
                 exporting: false
               });
-              _context.next = 33;
+              _context.n = 7;
               break;
-            case 31:
+            case 6:
               /* eslint-disable-next-line */
               alert('Print failed');
               this.setState({
                 exporting: false
               });
-            case 33:
-            case "end":
-              return _context.stop();
+            case 7:
+              return _context.a(2);
           }
         }, _callee, this);
       }));