qwc2 2025.12.18 → 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';
@@ -293,7 +293,7 @@ var RedliningSupport = /*#__PURE__*/function (_React$Component) {
         ev.feature.set('shape', _this.props.redlining.geomType);
         _this.updateFeatureStyle(ev.feature);
         _this.toggleFeatureMeasurements(ev.feature);
-        _this.selectFeatures([ev.feature]);
+        _this.selectFeatures([ev.feature], false);
       }, _this);
       drawInteraction.on('drawend', function (ev) {
         _this.commitFeatures([ev.feature], _this.props.redlining, true);
@@ -428,7 +428,7 @@ var RedliningSupport = /*#__PURE__*/function (_React$Component) {
         evt.feature.set('shape', _this.props.redlining.geomType);
         _this.updateFeatureStyle(evt.feature);
         _this.toggleFeatureMeasurements(evt.feature);
-        _this.selectFeatures([evt.feature]);
+        _this.selectFeatures([evt.feature], false);
       }, _this);
       drawInteraction.on('drawend', function () {
         // Draw end

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