qwc2 2025.8.14 → 2025.8.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (91) hide show
  1. package/actions/localConfig.js +1 -1
  2. package/components/MessageBar.js +7 -0
  3. package/components/PluginsContainer.js +3 -2
  4. package/components/SideBar.js +3 -3
  5. package/components/StandardApp.js +2 -2
  6. package/components/TaskBar.js +2 -2
  7. package/components/map/OlMap.js +2 -2
  8. package/components/map3d/ImportObjects3D.js +1 -1
  9. package/components/map3d/Map3D.js +6 -6
  10. package/components/map3d/MapControls3D.js +2 -2
  11. package/components/map3d/SearchField3D.js +3 -3
  12. package/components/map3d/drawtool/NumericInput3D.js +3 -3
  13. package/components/map3d/layers/VectorLayer3D.js +1 -1
  14. package/components/map3d/style/MapControls3D.css +9 -16
  15. package/components/map3d/utils/MiscUtils3D.js +7 -2
  16. package/components/map3d/utils/OrbitControls3D.js +1 -4
  17. package/components/map3d/utils/Tiles3DStyle.js +4 -4
  18. package/components/style/AppMenu.css +2 -3
  19. package/components/style/IdentifyViewer.css +0 -6
  20. package/components/style/{TaskBar.css → MessageBar.css} +4 -4
  21. package/components/style/PluginsContainer.css +1 -1
  22. package/components/style/SearchBox.css +1 -2
  23. package/components/style/SideBar.css +11 -9
  24. package/components/style/WindowManager.css +0 -5
  25. package/icons/above_terr.svg +81 -0
  26. package/icons/above_zero.svg +80 -0
  27. package/package.json +1 -1
  28. package/plugins/API.js +1 -1
  29. package/plugins/AttributeTable.js +3 -3
  30. package/plugins/LayerTree.js +2 -2
  31. package/plugins/Map.js +4 -3
  32. package/plugins/MapCompare.js +1 -1
  33. package/plugins/MapCopyright.js +1 -1
  34. package/plugins/TourGuide.js +3 -1
  35. package/plugins/View3D.js +26 -20
  36. package/plugins/map/LocateSupport.js +3 -5
  37. package/plugins/map/style/LocateSupport.css +33 -0
  38. package/plugins/map3d/BackgroundSwitcher3D.js +1 -1
  39. package/plugins/map3d/BottomBar3D.js +3 -1
  40. package/plugins/map3d/Compare3D.js +4 -2
  41. package/plugins/map3d/Draw3D.js +4 -2
  42. package/plugins/map3d/ExportObjects3D.js +13 -12
  43. package/plugins/map3d/HideObjects3D.js +12 -8
  44. package/plugins/map3d/Identify3D.js +12 -7
  45. package/plugins/map3d/LayerTree3D.js +3 -1
  46. package/plugins/map3d/MapCopyright3D.js +11 -0
  47. package/plugins/map3d/MapExport3D.js +4 -2
  48. package/plugins/map3d/MapLight3D.js +11 -0
  49. package/plugins/map3d/Measure3D.js +4 -2
  50. package/plugins/map3d/OverviewMap3D.js +2 -2
  51. package/plugins/map3d/Settings3D.js +3 -1
  52. package/plugins/map3d/TopBar3D.js +9 -1
  53. package/plugins/style/Bookmark.css +1 -3
  54. package/plugins/style/Editing.css +1 -3
  55. package/plugins/style/FeatureSearch.css +1 -8
  56. package/plugins/style/LayerTree.css +3 -11
  57. package/plugins/style/MapCopyright.css +3 -3
  58. package/plugins/style/Portal.css +1 -1
  59. package/plugins/style/View3D.css +0 -4
  60. package/reducers/localConfig.js +1 -1
  61. package/scripts/gen-plugin-docs.js +2 -2
  62. package/selectors/searchproviders.js +3 -7
  63. package/static/translations/bg-BG.json +2 -0
  64. package/static/translations/ca-ES.json +2 -0
  65. package/static/translations/cs-CZ.json +2 -0
  66. package/static/translations/de-CH.json +3 -1
  67. package/static/translations/de-DE.json +3 -1
  68. package/static/translations/en-US.json +3 -1
  69. package/static/translations/es-ES.json +2 -0
  70. package/static/translations/fi-FI.json +2 -0
  71. package/static/translations/fr-FR.json +3 -1
  72. package/static/translations/hu-HU.json +2 -0
  73. package/static/translations/it-IT.json +3 -1
  74. package/static/translations/ja-JP.json +2 -0
  75. package/static/translations/nl-NL.json +2 -0
  76. package/static/translations/no-NO.json +2 -0
  77. package/static/translations/pl-PL.json +2 -0
  78. package/static/translations/pt-BR.json +2 -0
  79. package/static/translations/pt-PT.json +2 -0
  80. package/static/translations/ro-RO.json +2 -0
  81. package/static/translations/ru-RU.json +2 -0
  82. package/static/translations/sv-SE.json +2 -0
  83. package/static/translations/tr-TR.json +2 -0
  84. package/static/translations/tsconfig.json +2 -0
  85. package/static/translations/uk-UA.json +2 -0
  86. package/utils/SearchProviders.js +8 -3
  87. package/components/map/OlLocate.css +0 -56
  88. package/components/map/OlLocate.js +0 -17
  89. package/components/map3d/Map3DLight.js +0 -11
  90. package/plugins/style/AttributeTable.css +0 -6
  91. /package/{components/map3d/style/Map3DLight.css → plugins/map3d/style/MapLight3D.css} +0 -0
@@ -4,6 +4,6 @@ function _typeof(o){"@babel/helpers - typeof";return _typeof="function"==typeof
4
4
  *
5
5
  * This source code is licensed under the BSD-style license found in the
6
6
  * LICENSE file in the root directory of this source tree.
7
- */import React from"react";import ReactDOM from"react-dom";import PropTypes from"prop-types";import{Box3}from"three";import CoordinatesUtils from"../../../utils/CoordinatesUtils";import LocaleUtils from"../../../utils/LocaleUtils";import ResizeableWindow from"../../ResizeableWindow";import ButtonBar from"../../widgets/ButtonBar";import NumberInput from"../../widgets/NumberInput";import"./style/NumericInput3D.css";var NumericInput3D=/*#__PURE__*/function(_React$Component){function NumericInput3D(props){var _this;_classCallCheck(this,NumericInput3D);_this=_callSuper(this,NumericInput3D,[props]);_defineProperty(_this,"state",{pos:[0,0,0],rot:[0,0,0],scale:[1,1,1],size:null,anchors:["center","center","begin"]});_defineProperty(_this,"updateStateFromObject",function(){if(_this.props.selectedObject){// Temporarily remove rotation and compute bbox
8
- var originalRotation=_this.props.selectedObject.rotation.clone();_this.props.selectedObject.rotation.set(0,0,0);_this.props.selectedObject.updateMatrixWorld(true);var bbox=new Box3().setFromObject(_this.props.selectedObject);var size=[bbox.max.x-bbox.min.x,bbox.max.y-bbox.min.y,bbox.max.z-bbox.min.z];_this.props.selectedObject.rotation.copy(originalRotation);_this.props.selectedObject.updateMatrixWorld(true);_this.setState({pos:_this.props.selectedObject.position.toArray(),rot:_this.props.selectedObject.rotation.toArray().slice(0,3).map(function(x){return x/Math.PI*180}),scale:_this.props.selectedObject.scale.toArray(),size:size})}else{_this.setState({pos:[0,0,0],rot:[0,0,0],scale:[1,1,1],size:null})}});_defineProperty(_this,"updatePosition",function(idx,value){var _this$props$selectedO;var newPos=_toConsumableArray(_this.state.pos);newPos[idx]=value;(_this$props$selectedO=_this.props.selectedObject.position).set.apply(_this$props$selectedO,_toConsumableArray(newPos));_this.update()});_defineProperty(_this,"updateRotation",function(idx,value){var _this$props$selectedO2;var newRot=_toConsumableArray(_this.state.rot);newRot[idx]=value;(_this$props$selectedO2=_this.props.selectedObject.rotation).set.apply(_this$props$selectedO2,_toConsumableArray(newRot.map(function(x){return x/180*Math.PI})).concat([_this.props.selectedObject.rotation.order]));_this.update()});_defineProperty(_this,"updateScale",function(idx,value){var _this$props$selectedO3;var newScale=_toConsumableArray(_this.state.scale);newScale[idx]=value;(_this$props$selectedO3=_this.props.selectedObject.scale).set.apply(_this$props$selectedO3,_toConsumableArray(newScale));_this.update()});_defineProperty(_this,"updateSize",function(idx,value){var _this$props$selectedO4,_this$props$selectedO5;var scaleDiff=value/_this.state.size[idx];var newScale=_toConsumableArray(_this.state.scale);newScale[idx]=newScale[idx]*scaleDiff;// Offset for anchor
9
- var newPos=_toConsumableArray(_this.state.pos);if(_this.state.anchors[idx]==="begin"){newPos[idx]+=0.5*(value-_this.state.size[idx])}else if(_this.state.anchors[idx]==="end"){newPos[idx]-=0.5*(value-_this.state.size[idx])}(_this$props$selectedO4=_this.props.selectedObject.scale).set.apply(_this$props$selectedO4,_toConsumableArray(newScale));(_this$props$selectedO5=_this.props.selectedObject.position).set.apply(_this$props$selectedO5,_toConsumableArray(newPos));_this.update()});_defineProperty(_this,"setAnchor",function(idx,value){_this.setState(function(state){return{anchors:[].concat(_toConsumableArray(state.anchors.slice(0,idx)),[value],_toConsumableArray(state.anchors.slice(idx+1)))}})});_defineProperty(_this,"update",function(){_this.props.selectedObject.updateMatrixWorld();_this.props.transformControls.getHelper().updateMatrixWorld();_this.updateStateFromObject();_this.props.sceneContext.scene.notifyChange()});_this.el=document.createElement("div");_this.props.sceneContext.scene.viewport.parentElement.appendChild(_this.el);return _this}_inherits(NumericInput3D,_React$Component);return _createClass(NumericInput3D,[{key:"componentDidMount",value:function componentDidMount(){this.props.transformControls.addEventListener("objectChange",this.updateStateFromObject);this.updateStateFromObject()}},{key:"componentDidUpdate",value:function componentDidUpdate(prevProps){if(this.props.selectedObject!==prevProps.selectedObject){this.updateStateFromObject()}}},{key:"componentWillUnmount",value:function componentWillUnmount(){this.props.sceneContext.scene.viewport.parentElement.removeChild(this.el);this.props.transformControls.removeEventListener("objectChange",this.updateStateFromObject)}},{key:"render",value:function render(){var _this2=this;var pos=this.state.pos;var rot=this.state.rot;var scale=this.state.scale;var size=this.state.size;var disabled=!this.props.selectedObject;var unit=CoordinatesUtils.getUnits(this.props.sceneContext.mapCrs);var hanchors=[{key:"begin",icon:"after"},{key:"center",icon:"middle_h"},{key:"end",icon:"before"}];var vanchors=[{key:"begin",icon:"above"},{key:"center",icon:"middle_v"},{key:"end",icon:"below"}];var contents=/*#__PURE__*/React.createElement(ResizeableWindow,{fitHeight:true,icon:"numericinput",initialWidth:350,initialX:-1,onClose:this.props.toggleNumericInput,scrollable:true,title:LocaleUtils.tr("draw3d.numericinput")},/*#__PURE__*/React.createElement("div",{className:"draw3d-numeric-input-body",role:"body"},/*#__PURE__*/React.createElement("table",null,/*#__PURE__*/React.createElement("tbody",null,/*#__PURE__*/React.createElement("tr",null,/*#__PURE__*/React.createElement("td",null,LocaleUtils.tr("draw3d.position")),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:0,disabled:disabled,onChange:function onChange(x){return _this2.updatePosition(0,x)},value:pos[0]})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:0,disabled:disabled,onChange:function onChange(y){return _this2.updatePosition(1,y)},value:pos[1]})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:0,disabled:disabled,onChange:function onChange(z){return _this2.updatePosition(2,z)},value:pos[2]}))),/*#__PURE__*/React.createElement("tr",null,/*#__PURE__*/React.createElement("td",null,LocaleUtils.tr("draw3d.rotation")),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:1,disabled:disabled,onChange:function onChange(x){return _this2.updateRotation(0,x)},suffix:"\xB0",value:rot[0]})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:1,disabled:disabled,onChange:function onChange(y){return _this2.updateRotation(1,y)},suffix:"\xB0",value:rot[1]})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:1,disabled:disabled,onChange:function onChange(z){return _this2.updateRotation(2,z)},suffix:"\xB0",value:rot[2]}))),/*#__PURE__*/React.createElement("tr",null,/*#__PURE__*/React.createElement("td",null,LocaleUtils.tr("draw3d.thescale")),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:1,disabled:disabled,min:0.1,onChange:function onChange(x){return _this2.updateScale(0,x)},value:scale[0]})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:1,disabled:disabled,min:0.1,onChange:function onChange(y){return _this2.updateScale(1,y)},value:scale[1]})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:1,disabled:disabled,min:0.1,onChange:function onChange(z){return _this2.updateScale(2,z)},value:scale[2]}))),size?/*#__PURE__*/React.createElement("tr",null,/*#__PURE__*/React.createElement("td",null,LocaleUtils.tr("draw3d.thesize")," [",unit,"]"),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:1,disabled:disabled,min:0.1,onChange:function onChange(x){return _this2.updateSize(0,x)},value:size[0]})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:1,disabled:disabled,min:0.1,onChange:function onChange(y){return _this2.updateSize(1,y)},value:size[1]})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:1,disabled:disabled,min:0.1,onChange:function onChange(z){return _this2.updateSize(2,z)},value:size[2]}))):null,size?/*#__PURE__*/React.createElement("tr",null,/*#__PURE__*/React.createElement("td",null),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(ButtonBar,{active:this.state.anchors[0],buttons:hanchors,onClick:function onClick(x){return _this2.setAnchor(0,x)}})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(ButtonBar,{active:this.state.anchors[1],buttons:hanchors,onClick:function onClick(y){return _this2.setAnchor(0,y)}})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(ButtonBar,{active:this.state.anchors[2],buttons:vanchors,onClick:function onClick(z){return _this2.setAnchor(0,z)}}))):null))));return/*#__PURE__*/ReactDOM.createPortal(contents,this.el)}}])}(React.Component);_defineProperty(NumericInput3D,"propTypes",{sceneContext:PropTypes.object,selectedObject:PropTypes.object,toggleNumericInput:PropTypes.func,transformControls:PropTypes.object});export{NumericInput3D as default};
7
+ */import React from"react";import ReactDOM from"react-dom";import Coordinates from"@giro3d/giro3d/core/geographic/Coordinates";import PropTypes from"prop-types";import{Box3}from"three";import CoordinatesUtils from"../../../utils/CoordinatesUtils";import LocaleUtils from"../../../utils/LocaleUtils";import ResizeableWindow from"../../ResizeableWindow";import ButtonBar from"../../widgets/ButtonBar";import NumberInput from"../../widgets/NumberInput";import"./style/NumericInput3D.css";var NumericInput3D=/*#__PURE__*/function(_React$Component){function NumericInput3D(props){var _this;_classCallCheck(this,NumericInput3D);_this=_callSuper(this,NumericInput3D,[props]);_defineProperty(_this,"state",{pos:[0,0,0],rot:[0,0,0],scale:[1,1,1],size:null,anchors:["center","center","begin"],zMode:"absolute",currentTerrainHeight:0});_defineProperty(_this,"updateStateFromObject",function(){if(_this.props.selectedObject){var _this$props$sceneCont;// Temporarily remove rotation and compute bbox
8
+ var originalRotation=_this.props.selectedObject.rotation.clone();_this.props.selectedObject.rotation.set(0,0,0);_this.props.selectedObject.updateMatrixWorld(true);var bbox=new Box3().setFromObject(_this.props.selectedObject);var size=[bbox.max.x-bbox.min.x,bbox.max.y-bbox.min.y,bbox.max.z-bbox.min.z];_this.props.selectedObject.rotation.copy(originalRotation);_this.props.selectedObject.updateMatrixWorld(true);var pos=_this.props.selectedObject.position.toArray();var terrainHeight=(_this$props$sceneCont=_this.props.sceneContext.getTerrainHeightFromMap([pos[0],pos[1]]))!==null&&_this$props$sceneCont!==void 0?_this$props$sceneCont:0;_this.setState({pos:pos,rot:_this.props.selectedObject.rotation.toArray().slice(0,3).map(function(x){return x/Math.PI*180}),scale:_this.props.selectedObject.scale.toArray(),size:size,currentTerrainHeight:terrainHeight})}else{_this.setState({pos:[0,0,0],rot:[0,0,0],scale:[1,1,1],size:null,currentTerrainHeight:0})}});_defineProperty(_this,"updatePosition",function(idx,value){var _this$props$selectedO;var newPos=_toConsumableArray(_this.state.pos);newPos[idx]=value;(_this$props$selectedO=_this.props.selectedObject.position).set.apply(_this$props$selectedO,_toConsumableArray(newPos));_this.update()});_defineProperty(_this,"updateRotation",function(idx,value){var _this$props$selectedO2;var newRot=_toConsumableArray(_this.state.rot);newRot[idx]=value;(_this$props$selectedO2=_this.props.selectedObject.rotation).set.apply(_this$props$selectedO2,_toConsumableArray(newRot.map(function(x){return x/180*Math.PI})).concat([_this.props.selectedObject.rotation.order]));_this.update()});_defineProperty(_this,"updateScale",function(idx,value){var _this$props$selectedO3;var newScale=_toConsumableArray(_this.state.scale);newScale[idx]=value;(_this$props$selectedO3=_this.props.selectedObject.scale).set.apply(_this$props$selectedO3,_toConsumableArray(newScale));_this.update()});_defineProperty(_this,"updateSize",function(idx,value){var _this$props$selectedO4,_this$props$selectedO5;var scaleDiff=value/_this.state.size[idx];var newScale=_toConsumableArray(_this.state.scale);newScale[idx]=newScale[idx]*scaleDiff;// Offset for anchor
9
+ var newPos=_toConsumableArray(_this.state.pos);if(_this.state.anchors[idx]==="begin"){newPos[idx]+=0.5*(value-_this.state.size[idx])}else if(_this.state.anchors[idx]==="end"){newPos[idx]-=0.5*(value-_this.state.size[idx])}(_this$props$selectedO4=_this.props.selectedObject.scale).set.apply(_this$props$selectedO4,_toConsumableArray(newScale));(_this$props$selectedO5=_this.props.selectedObject.position).set.apply(_this$props$selectedO5,_toConsumableArray(newPos));_this.update()});_defineProperty(_this,"setAnchor",function(idx,value){_this.setState(function(state){return{anchors:[].concat(_toConsumableArray(state.anchors.slice(0,idx)),[value],_toConsumableArray(state.anchors.slice(idx+1)))}})});_defineProperty(_this,"update",function(){_this.props.selectedObject.updateMatrixWorld();_this.props.transformControls.getHelper().updateMatrixWorld();_this.updateStateFromObject();_this.props.sceneContext.scene.notifyChange()});_defineProperty(_this,"elevationChanged",function(_ref){var extent=_ref.extent;var crs=_this.props.sceneContext.mapCrs;var coo=new Coordinates(crs,_this.state.pos[0],_this.state.pos[1]);if(extent.isPointInside(coo)){var _this$props$sceneCont2;var terrainHeight=(_this$props$sceneCont2=_this.props.sceneContext.getTerrainHeightFromMap([_this.state.pos[0],_this.state.pos[1]]))!==null&&_this$props$sceneCont2!==void 0?_this$props$sceneCont2:0;_this.setState(function(state){return{currentTerrainHeight:terrainHeight}})}});_this.el=document.createElement("div");_this.props.sceneContext.scene.viewport.parentElement.appendChild(_this.el);return _this}_inherits(NumericInput3D,_React$Component);return _createClass(NumericInput3D,[{key:"componentDidMount",value:function componentDidMount(){this.props.transformControls.addEventListener("objectChange",this.updateStateFromObject);this.updateStateFromObject();this.props.sceneContext.map.addEventListener("elevation-changed",this.elevationChanged)}},{key:"componentDidUpdate",value:function componentDidUpdate(prevProps){if(this.props.selectedObject!==prevProps.selectedObject){this.updateStateFromObject()}}},{key:"componentWillUnmount",value:function componentWillUnmount(){this.props.sceneContext.scene.viewport.parentElement.removeChild(this.el);this.props.transformControls.removeEventListener("objectChange",this.updateStateFromObject);this.props.sceneContext.map.removeEventListener("elevation-changed",this.elevationChanged)}},{key:"render",value:function render(){var _this2=this;var pos=this.state.pos;var rot=this.state.rot;var scale=this.state.scale;var size=this.state.size;var disabled=!this.props.selectedObject;var unit=CoordinatesUtils.getUnits(this.props.sceneContext.mapCrs);var hanchors=[{key:"begin",icon:"after"},{key:"center",icon:"middle_h"},{key:"end",icon:"before"}];var zmodes=[{key:"absolute",icon:"above_zero"},{key:"terrain",icon:"above_terr"}];var voffset=(this.state.zMode==="terrain"?this.state.currentTerrainHeight:0)+(size?0.5*size[2]:0);var contents=/*#__PURE__*/React.createElement(ResizeableWindow,{fitHeight:true,icon:"numericinput",initialWidth:350,initialX:-1,onClose:this.props.toggleNumericInput,scrollable:true,title:LocaleUtils.tr("draw3d.numericinput")},/*#__PURE__*/React.createElement("div",{className:"draw3d-numeric-input-body",role:"body"},/*#__PURE__*/React.createElement("table",null,/*#__PURE__*/React.createElement("tbody",null,/*#__PURE__*/React.createElement("tr",null,/*#__PURE__*/React.createElement("td",null,LocaleUtils.tr("draw3d.position")),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:0,disabled:disabled,onChange:function onChange(x){return _this2.updatePosition(0,x)},value:pos[0]})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:0,disabled:disabled,onChange:function onChange(y){return _this2.updatePosition(1,y)},value:pos[1]})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:0,disabled:disabled,onChange:function onChange(z){return _this2.updatePosition(2,z+voffset)},value:pos[2]-voffset}))),/*#__PURE__*/React.createElement("tr",null,/*#__PURE__*/React.createElement("td",null,LocaleUtils.tr("draw3d.rotation")),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:1,disabled:disabled,onChange:function onChange(x){return _this2.updateRotation(0,x)},suffix:"\xB0",value:rot[0]})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:1,disabled:disabled,onChange:function onChange(y){return _this2.updateRotation(1,y)},suffix:"\xB0",value:rot[1]})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:1,disabled:disabled,onChange:function onChange(z){return _this2.updateRotation(2,z)},suffix:"\xB0",value:rot[2]}))),/*#__PURE__*/React.createElement("tr",null,/*#__PURE__*/React.createElement("td",null,LocaleUtils.tr("draw3d.thescale")),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:1,disabled:disabled,min:0.1,onChange:function onChange(x){return _this2.updateScale(0,x)},value:scale[0]})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:1,disabled:disabled,min:0.1,onChange:function onChange(y){return _this2.updateScale(1,y)},value:scale[1]})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:1,disabled:disabled,min:0.1,onChange:function onChange(z){return _this2.updateScale(2,z)},value:scale[2]}))),size?/*#__PURE__*/React.createElement("tr",null,/*#__PURE__*/React.createElement("td",null,LocaleUtils.tr("draw3d.thesize")," [",unit,"]"),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:1,disabled:disabled,min:0.1,onChange:function onChange(x){return _this2.updateSize(0,x)},value:size[0]})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:1,disabled:disabled,min:0.1,onChange:function onChange(y){return _this2.updateSize(1,y)},value:size[1]})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{decimals:1,disabled:disabled,min:0.1,onChange:function onChange(z){return _this2.updateSize(2,z)},value:size[2]}))):null,size?/*#__PURE__*/React.createElement("tr",null,/*#__PURE__*/React.createElement("td",null),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(ButtonBar,{active:this.state.anchors[0],buttons:hanchors,onClick:function onClick(key){return _this2.setAnchor(0,key)}})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(ButtonBar,{active:this.state.anchors[1],buttons:hanchors,onClick:function onClick(key){return _this2.setAnchor(1,key)}})),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(ButtonBar,{active:this.state.zMode,buttons:zmodes,onClick:function onClick(key){return _this2.setState({zMode:key})}}))):null))));return/*#__PURE__*/ReactDOM.createPortal(contents,this.el)}}])}(React.Component);_defineProperty(NumericInput3D,"propTypes",{sceneContext:PropTypes.object,selectedObject:PropTypes.object,toggleNumericInput:PropTypes.func,transformControls:PropTypes.object});export{NumericInput3D as default};
@@ -4,4 +4,4 @@ function _toConsumableArray(r){return _arrayWithoutHoles(r)||_iterableToArray(r)
4
4
  *
5
5
  * This source code is licensed under the BSD-style license found in the
6
6
  * LICENSE file in the root directory of this source tree.
7
- */import ColorLayer from"@giro3d/giro3d/core/layer/ColorLayer";import VectorSource from"@giro3d/giro3d/sources/VectorSource.js";import ol from"openlayers";import FeatureStyles from"../../../utils/FeatureStyles";import{createFeatures,featureStyleFunction,updateFeatures}from"../../map/layers/VectorLayer";export default{create3d:function create3d(options,projection){return new ColorLayer({name:options.name,source:new VectorSource({data:createFeatures(options,projection),format:new ol.format.GeoJSON,style:options.styleFunction||function(feature){var styleName=options.styleName||"default";var styleOptions=options.styleOptions||{};return FeatureStyles[styleName](feature,styleOptions)}})})},update3d:function update3d(layer,newOptions,oldOptions,projection){if(newOptions.styleName!==oldOptions.styleName||newOptions.styleOptions!==oldOptions.styleOptions){layer.source.setStyle(featureStyleFunction(newOptions))}else if(newOptions.styleFunction!==oldOptions.styleFunction){layer.source.setStyle(newOptions.styleFunction)}if(newOptions.features!==oldOptions.features){updateFeatures(layer.source,newOptions,oldOptions,projection)}else if((oldOptions.rev||0)!==(newOptions.rev||0)){layer.source.update()}},getFields:function getFields(options){return new Promise(function(resolve){var fields=new Set;options.features.forEach(function(feature){Object.keys(feature.properties).forEach(function(key){return fields.add(key)})});resolve(_toConsumableArray(fields.values()))})}};
7
+ */import ColorLayer from"@giro3d/giro3d/core/layer/ColorLayer";import VectorSource from"@giro3d/giro3d/sources/VectorSource.js";import ol from"openlayers";import FeatureStyles from"../../../utils/FeatureStyles";import{createFeatures,featureStyleFunction,updateFeatures}from"../../map/layers/VectorLayer";export default{create3d:function create3d(options,projection){return new ColorLayer({name:options.name,source:new VectorSource({data:createFeatures(options,projection),format:new ol.format.GeoJSON,style:options.styleFunction||function(feature){var styleName=options.styleName||"default";var styleOptions=options.styleOptions||{};return FeatureStyles[styleName](feature,styleOptions)}})})},update3d:function update3d(layer,newOptions,oldOptions,projection){if(newOptions.styleName!==oldOptions.styleName||newOptions.styleOptions!==oldOptions.styleOptions){layer.source.setStyle(featureStyleFunction(newOptions))}else if(newOptions.styleFunction!==oldOptions.styleFunction){layer.source.setStyle(newOptions.styleFunction)}if(newOptions.features!==oldOptions.features){updateFeatures(layer.source,newOptions,oldOptions,projection)}else if((oldOptions.rev||0)!==(newOptions.rev||0)){layer.source.update()}},getFields:function getFields(options){return new Promise(function(resolve){var fields=new Set;(options.features||[]).forEach(function(feature){Object.keys(feature.properties).forEach(function(key){return fields.add(key)})});resolve(_toConsumableArray(fields.values()))})}};
@@ -1,18 +1,3 @@
1
- div.map3d-nav {
2
- position: absolute;
3
- right: 1em;
4
- top: 5.5em;
5
- z-index: 1;
6
- pointer-events: none;
7
- display: flex;
8
- flex-direction: column;
9
- align-items: center;
10
- }
11
-
12
- div.map3d-nav > div:not(:last-child) {
13
- margin-bottom: 0.5em;
14
- }
15
-
16
1
  div.map3d-nav-pan,
17
2
  div.map3d-nav-rotate {
18
3
  pointer-events: initial;
@@ -26,6 +11,7 @@ div.map3d-nav-rotate {
26
11
  color: var(--map-button-text-color);
27
12
  background-color: var(--map-button-bg-color);
28
13
  box-shadow: 0px 5px 10px rgba(136, 136, 136, 0.5);
14
+ margin-bottom: 0.5em;
29
15
  }
30
16
 
31
17
  div.map3d-nav-pan > span,
@@ -50,6 +36,7 @@ div.map3d-nav-zoom {
50
36
  cursor: pointer;
51
37
  transition: background-color 0.5s, color 0.5s;
52
38
  flex-direction: column;
39
+ margin: 0 1em 0.5em 1em;
53
40
  }
54
41
 
55
42
  div.map3d-nav-zoom > div {
@@ -65,7 +52,6 @@ div.map3d-nav-zoom > div:first-child {
65
52
  }
66
53
 
67
54
 
68
-
69
55
  div.map3d-firstperson-button {
70
56
  pointer-events: initial;
71
57
  width: 2em;
@@ -80,9 +66,16 @@ div.map3d-firstperson-button {
80
66
  border-radius: 4px;
81
67
  cursor: pointer;
82
68
  transition: background-color 0.5s, color 0.5s;
69
+ margin: 0 1em 0.5em 1em;
83
70
  }
84
71
 
85
72
  div.map3d-firstperson-button-active {
86
73
  background-color: var(--map-button-text-color);
87
74
  color: var(--map-button-bg-color);
75
+ }
76
+
77
+ div.map3d-nav-spacer {
78
+ display: inline-block;
79
+ width: 1em;
80
+ flex: 1 1 auto;
88
81
  }
@@ -1,4 +1,4 @@
1
- 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 ownKeys(e,r){var t=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);r&&(o=o.filter(function(r){return Object.getOwnPropertyDescriptor(e,r).enumerable})),t.push.apply(t,o)}return t}function _objectSpread(e){for(var r=1;r<arguments.length;r++){var t=null!=arguments[r]?arguments[r]:{};r%2?ownKeys(Object(t),!0).forEach(function(r){_defineProperty(e,r,t[r])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):ownKeys(Object(t)).forEach(function(r){Object.defineProperty(e,r,Object.getOwnPropertyDescriptor(t,r))})}return e}function _defineProperty(e,r,t){return(r=_toPropertyKey(r))in e?Object.defineProperty(e,r,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[r]=t,e}function _toPropertyKey(t){var i=_toPrimitive(t,"string");return"symbol"==_typeof(i)?i:i+""}function _toPrimitive(t,r){if("object"!=_typeof(t)||!t)return t;var e=t[Symbol.toPrimitive];if(void 0!==e){var i=e.call(t,r||"default");if("object"!=_typeof(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===r?String:Number)(t)}/**
1
+ 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 _classCallCheck(a,n){if(!(a instanceof n))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,r){for(var t=0;t<r.length;t++){var o=r[t];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,_toPropertyKey(o.key),o)}}function _createClass(e,r,t){return r&&_defineProperties(e.prototype,r),t&&_defineProperties(e,t),Object.defineProperty(e,"prototype",{writable:!1}),e}function ownKeys(e,r){var t=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);r&&(o=o.filter(function(r){return Object.getOwnPropertyDescriptor(e,r).enumerable})),t.push.apply(t,o)}return t}function _objectSpread(e){for(var r=1;r<arguments.length;r++){var t=null!=arguments[r]?arguments[r]:{};r%2?ownKeys(Object(t),!0).forEach(function(r){_defineProperty(e,r,t[r])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):ownKeys(Object(t)).forEach(function(r){Object.defineProperty(e,r,Object.getOwnPropertyDescriptor(t,r))})}return e}function _defineProperty(e,r,t){return(r=_toPropertyKey(r))in e?Object.defineProperty(e,r,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[r]=t,e}function _toPropertyKey(t){var i=_toPrimitive(t,"string");return"symbol"==_typeof(i)?i:i+""}function _toPrimitive(t,r){if("object"!=_typeof(t)||!t)return t;var e=t[Symbol.toPrimitive];if(void 0!==e){var i=e.call(t,r||"default");if("object"!=_typeof(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===r?String:Number)(t)}/**
2
2
  * Copyright 2025 Sourcepole AG
3
3
  * All rights reserved.
4
4
  *
@@ -9,4 +9,9 @@ var linegeom=new MeshLine;linegeom.setGeometry(new BufferGeometry().setFromPoint
9
9
  (_labelObject$element$=labelObject.element.parentNode)===null||_labelObject$element$===void 0||(_labelObject$element$2=_labelObject$element$.removeChild)===null||_labelObject$element$2===void 0||_labelObject$element$2.call(_labelObject$element$,labelObject.element)};sceneObject.addEventListener("removed",labelObject.userData.removeCallback)}else{labelObject.element.textContent=sceneObject.userData.label}}else if(labelObject){sceneObject.removeEventListener("removed",labelObject.userData.removeCallback);sceneContext.scene.view.removeEventListener("view-resized",labelObject.userData.sceneResizeCallback);// Remove leaderline first, as the remove trigger of the CSS2DObject assumes children are CSS2DObjects as well
10
10
  labelObject.children[0].removeFromParent();labelObject.removeFromParent()}}export function importGltf(dataOrUrl,name,sceneContext){var options=arguments.length>3&&arguments[3]!==undefined?arguments[3]:{};var loader=new GLTFLoader;var processor=function processor(gltf){// GLTF is Y-UP, we need Z-UP
11
11
  gltf.scene.rotation.x=Math.PI/2;gltf.scene.updateMatrixWorld(true);var objectId=uuidv4();options=_objectSpread({layertree:true,title:name},options);gltf.scene.traverse(function(c){if(c.geometry){c.castShadow=true;c.receiveShadow=true}updateObjectLabel(c,sceneContext)});// Center group on object
12
- var bbox=new Box3().setFromObject(gltf.scene);var center=bbox.getCenter(new Vector3);var offset=new Vector3().subVectors(center,gltf.scene.position).applyQuaternion(gltf.scene.quaternion.clone().invert());gltf.scene.children.forEach(function(child){child.position.sub(offset)});gltf.scene.position.copy(center);gltf.scene.updateMatrixWorld(true);sceneContext.addSceneObject(objectId,gltf.scene,options)};if(typeof dataOrUrl==="string"){loader.load(dataOrUrl,processor,function(){},function(err){/* eslint-disable-next-line */console.warn(err)})}else{loader.parse(dataOrUrl,ConfigUtils.getAssetsPath(),processor,function(err){/* eslint-disable-next-line */console.warn(err)})}}
12
+ var bbox=new Box3().setFromObject(gltf.scene);var center=bbox.getCenter(new Vector3);var offset=new Vector3().subVectors(center,gltf.scene.position).applyQuaternion(gltf.scene.quaternion.clone().invert());gltf.scene.children.forEach(function(child){child.position.sub(offset)});gltf.scene.position.copy(center);gltf.scene.updateMatrixWorld(true);sceneContext.addSceneObject(objectId,gltf.scene,options)};if(typeof dataOrUrl==="string"){loader.load(dataOrUrl,processor,function(){},function(err){/* eslint-disable-next-line */console.warn(err)})}else{loader.parse(dataOrUrl,ConfigUtils.getAssetsPath(),processor,function(err){/* eslint-disable-next-line */console.warn(err)})}}export var TileMeshHelper=/*#__PURE__*/function(){function TileMeshHelper(object){_classCallCheck(this,TileMeshHelper);this.object=object;var _object$userData=object.userData,meshFeatures=_object$userData.meshFeatures,structuralMetadata=_object$userData.structuralMetadata;if(meshFeatures&&structuralMetadata){// Get featureId via featureId attribute
13
+ var featureSetIndex=0;// usually 0 unless multiple feature sets
14
+ this.featureSet=meshFeatures.featureIds[featureSetIndex];this.featureIdAttr=object.geometry.getAttribute("_feature_id_".concat(this.featureSet.attribute))}else if("_batchid"in object.geometry.attributes){// Get featureId via batchId attribute
15
+ this.featureSet=null;this.featureIdAttr=object.geometry.getAttribute("_batchid")}else{/* eslint-disable-next-line */console.warn("Cannot determine tile mesh feature index attribute");this.featureIdAttr=null}this.tileObject=object;while(this.tileObject.parent&&!this.tileObject.parent.isTilesGroup){this.tileObject=this.tileObject.parent}this.propertiesCache={}}return _createClass(TileMeshHelper,[{key:"isValid",value:function isValid(){return this.featureIdAttr!==null}},{key:"getFeatureId",value:function getFeatureId(face){return this.featureIdAttr?this.featureIdAttr.getX(face.a):null}},{key:"getFeatureIdAttr",value:function getFeatureIdAttr(){return this.featureIdAttr}},{key:"getFeatureIds",value:function getFeatureIds(){var featureIds=new Set;for(var i=0;i<this.featureIdAttr.count;i++){featureIds.add(this.featureIdAttr.getX(i))}return featureIds}},{key:"getFeatureProperties",value:function getFeatureProperties(featureId){if(featureId in this.propertiesCache){return this.propertiesCache[featureId]}else if(this.object.userData.structuralMetadata){this.propertiesCache[featureId]=this.object.userData.structuralMetadata.getPropertyTableData([this.featureSet.propertyTable],[featureId])[0]}else if(this.tileObject.batchTable){this.propertiesCache[featureId]=this.tileObject.batchTable.getDataFromId(featureId)}else{this.propertiesCache[featureId]={}}return this.propertiesCache[featureId]}},{key:"getTileUserData",value:function getTileUserData(){return this.tileObject.userData}},{key:"forEachFeatureTriangle",value:function forEachFeatureTriangle(featureId,callback){if(!this.featureIdAttr){return}else if(this.object.geometry.index){// For indexed geometries, index attribute contains a sequence of triangle index triplets
16
+ var indices=this.object.geometry.index.array;for(var tri=0;tri<indices.length;tri+=3){var i0=indices[tri];if(this.featureIdAttr.getX(i0)===featureId){var i1=indices[tri+1];var i2=indices[tri+2];callback(i0,i1,i2)}}}else{// For non-index geometries, the id attribute contains a sequence of triangle vertex indices
17
+ for(var _tri=0;_tri<this.featureIdAttr.count;_tri+=3){if(this.featureIdAttr.getX(_tri)===featureId){callback(_tri,_tri+1,_tri+2)}}}}}])}();
@@ -7,7 +7,4 @@ function _typeof(o){"@babel/helpers - typeof";return _typeof="function"==typeof
7
7
  */import{Vector3}from"three";import{MapControls}from"three/addons/controls/MapControls";import{v4 as uuidv4}from"uuid";var OrbitControls3D=/*#__PURE__*/function(_MapControls){function OrbitControls3D(object){var _this;_classCallCheck(this,OrbitControls3D);_this=_callSuper(this,OrbitControls3D,[object]);_defineProperty(_this,"updateControlsTarget",function(){var _this$sceneContext$ge;if(_this.animationId){// Do nothing if animating
8
8
  return}var camerapos=_this.object.position;var x=_this.target.x;var y=_this.target.y;var height=(_this$sceneContext$ge=_this.sceneContext.getTerrainHeightFromMap([x,y]))!==null&&_this$sceneContext$ge!==void 0?_this$sceneContext$ge:0;// If camera height is at terrain height, target height should be at terrain height
9
9
  // If camera height is at twice the terrain height or further, target height should be zero
10
- _this._targetTerrainHeight=Math.max(0,1-(camerapos.z-height)/height)*height;_this.target.z=_this._targetTerrainHeight+_this._heightOffset});_defineProperty(_this,"updateTargetTerrainAndOffsetHeight",function(camerapos,target){var _this$sceneContext$ge2;// Compute targetHeight and heightOffset offset
11
- var height=(_this$sceneContext$ge2=_this.sceneContext.getTerrainHeightFromMap([target.x,target.y]))!==null&&_this$sceneContext$ge2!==void 0?_this$sceneContext$ge2:0;// If camera height is at terrain height, target height should be at terrain height
12
- // If camera height is at twice the terrain height or further, target height should be zero
13
- _this._targetTerrainHeight=Math.max(0,1-(camerapos.z-height)/height)*height;_this._heightOffset=target.z-_this._targetTerrainHeight});_defineProperty(_this,"stopAnimations",function(){_this.animationId=null});_defineProperty(_this,"_handleKeyboardNav",function(){var pg=-_this._keyState.PageDown+_this._keyState.PageUp;if(pg){var newHeightOffset=Math.max(0,_this._heightOffset+_this._heightOffset*pg*0.05);var deltaHeight=newHeightOffset-_this._heightOffset;_this._heightOffset=newHeightOffset;_this.target.z=_this._targetTerrainHeight+_this._heightOffset;_this.object.position.z+=deltaHeight;_this.update()}});_defineProperty(_this,"_onKeyDown",function(event){if(event.key in _this._keyState){_this._keyState[event.key]=true;if(!_this._keyboardNavInterval){_this._keyboardNavInterval=setInterval(_this._handleKeyboardNav,50)}}});_defineProperty(_this,"_onKeyUp",function(event){if(event.key in _this._keyState){_this._keyState[event.key]=false;if(Object.values(_this._keyState).every(function(x){return!x})){clearInterval(_this._keyboardNavInterval);_this._keyboardNavInterval=null}}});_defineProperty(_this,"_onBlur",function(){_this._keyState={PageUp:false,PageDown:false};clearInterval(_this._keyboardNavInterval);_this._keyboardNavInterval=null});_this.animationId=null;_this.sceneContext=null;_this.enabled=false;_this.zoomToCursor=true;_this.enableDamping=true;_this.dampingFactor=0.2;_this.keyPanSpeed=10;_this.maxPolarAngle=Math.PI*0.5;_this._targetHeight=0;_this._heightOffset=0;_this._keyState={PageUp:false,PageDown:false};_this._keyboardNavInterval=null;return _this}_inherits(OrbitControls3D,_MapControls);return _createClass(OrbitControls3D,[{key:"connect",value:function connect(sceneContext){this.domElement=sceneContext.scene.domElement;this.sceneContext=sceneContext;this.enabled=true;_superPropGet(OrbitControls3D,"connect",this,3)([]);this.listenToKeyEvents(this.domElement);this.domElement.addEventListener("pointerdown",this.stopAnimations);this.domElement.addEventListener("wheel",this.stopAnimations);this.domElement.addEventListener("keydown",this._onKeyDown);this.domElement.addEventListener("keyup",this._onKeyUp);this.domElement.addEventListener("blur",this._onBlur);this.addEventListener("change",this.updateControlsTarget);this.object.near=2;this.sceneContext.scene.view.setControls(this)}},{key:"disconnect",value:function disconnect(){this.animationId=null;_superPropGet(OrbitControls3D,"disconnect",this,3)([]);this.enabled=false;this.sceneContext.scene.view.setControls(null);this.domElement.removeEventListener("pointerdown",this.stopAnimations);this.domElement.removeEventListener("wheel",this.stopAnimations);this.domElement.removeEventListener("keydown",this._onKeyDown);this.domElement.removeEventListener("keyup",this._onKeyUp);this.domElement.removeEventListener("blur",this._onBlur);this.removeEventListener("change",this.updateControlsTarget);this._keyState={PageUp:false,PageDown:false}}},{key:"setView",value:function setView(camerapos,target){this.object.position.copy(camerapos);this.target.copy(target);this.updateTargetTerrainAndOffsetHeight(camerapos,target);this.update()}},{key:"panView",value:function panView(dx,dy){if(dx||dy){this._pan(-dx*10,dy*10);this.update()}}},{key:"tiltView",value:function tiltView(azimuth,polar){if(azimuth){this._rotateLeft(azimuth)}if(polar){this._rotateUp(polar)}if(azimuth||polar){this.update()}}},{key:"zoomView",value:function zoomView(delta){if(delta>0){this._dollyIn(this._getZoomScale(-delta));this.update()}else if(delta<0){this._dollyOut(this._getZoomScale(-delta));this.update()}}},{key:"animateTo",value:function animateTo(camerapos,target,azimuth){var _this2=this;var callback=arguments.length>3&&arguments[3]!==undefined?arguments[3]:null;var oldPosition=this.object.position.clone();var oldTarget=this.target.clone();var oldYaw=this.getAzimuthalAngle();var newPosition=camerapos;var newTarget=target;var rotateAngle=-oldYaw+azimuth;while(rotateAngle>Math.PI)rotateAngle-=2*Math.PI;while(rotateAngle<-Math.PI)rotateAngle+=2*Math.PI;var startTime=new Date/1000;var animationId=uuidv4();this.animationId=animationId;this.enableDamping=false;var _animate=function animate(){if(_this2.animationId!==animationId){_this2.updateTargetTerrainAndOffsetHeight(_this2.object.position,_this2.target);return}var duration=2;var elapsed=new Date/1000-startTime;var x=elapsed/duration;var k=0.5*(1-Math.cos(x*Math.PI));var currentPosition=new Vector3().lerpVectors(oldPosition,newPosition,k);var currentTarget=new Vector3().lerpVectors(oldTarget,newTarget,k);currentPosition.x-=currentTarget.x;currentPosition.y-=currentTarget.y;currentPosition.applyAxisAngle(new Vector3(0,0,1),rotateAngle*k);currentPosition.x+=currentTarget.x;currentPosition.y+=currentTarget.y;_this2.object.position.copy(currentPosition);_this2.target.copy(currentTarget);_this2.update();if(elapsed<duration){requestAnimationFrame(_animate)}else{_this2.object.position.copy(newPosition);_this2.target.copy(newTarget);_this2.update();_this2._rotateLeft(_this2.getAzimuthalAngle()-azimuth);_this2.update();_this2.enableDamping=true;_this2.animationId=null;_this2.updateTargetTerrainAndOffsetHeight(_this2.object.position,_this2.target);callback===null||callback===void 0||callback()}};requestAnimationFrame(_animate)}}])}(MapControls);export{OrbitControls3D as default};
10
+ var newHeight=Math.max(0,1-(camerapos.z-height)/height)*height;_this.target.z=newHeight});_defineProperty(_this,"stopAnimations",function(){_this.animationId=null});_this.animationId=null;_this.sceneContext=null;_this.enabled=false;_this.zoomToCursor=true;_this.enableDamping=true;_this.dampingFactor=0.2;_this.keyPanSpeed=10;_this.maxPolarAngle=Math.PI*0.5;return _this}_inherits(OrbitControls3D,_MapControls);return _createClass(OrbitControls3D,[{key:"connect",value:function connect(sceneContext){this.domElement=sceneContext.scene.domElement;this.sceneContext=sceneContext;this.enabled=true;_superPropGet(OrbitControls3D,"connect",this,3)([]);this.listenToKeyEvents(this.domElement);this.domElement.addEventListener("pointerdown",this.stopAnimations);this.domElement.addEventListener("wheel",this.stopAnimations);this.addEventListener("change",this.updateControlsTarget);this.object.near=2;this.sceneContext.scene.view.setControls(this)}},{key:"disconnect",value:function disconnect(){this.animationId=null;_superPropGet(OrbitControls3D,"disconnect",this,3)([]);this.enabled=false;this.sceneContext.scene.view.setControls(null);this.domElement.removeEventListener("pointerdown",this.stopAnimations);this.domElement.removeEventListener("wheel",this.stopAnimations);this.removeEventListener("change",this.updateControlsTarget)}},{key:"setView",value:function setView(camerapos,target){this.object.position.copy(camerapos);this.target.copy(target);this.update()}},{key:"panView",value:function panView(dx,dy){if(dx||dy){this._pan(-dx*10,dy*10);this.update()}}},{key:"tiltView",value:function tiltView(azimuth,polar){if(azimuth){this._rotateLeft(azimuth)}if(polar){this._rotateUp(polar)}if(azimuth||polar){this.update()}}},{key:"zoomView",value:function zoomView(delta){if(delta>0){this._dollyIn(this._getZoomScale(-delta));this.update()}else if(delta<0){this._dollyOut(this._getZoomScale(-delta));this.update()}}},{key:"animateTo",value:function animateTo(camerapos,target,azimuth){var _this2=this;var callback=arguments.length>3&&arguments[3]!==undefined?arguments[3]:null;var oldPosition=this.object.position.clone();var oldTarget=this.target.clone();var oldYaw=this.getAzimuthalAngle();var newPosition=camerapos;var newTarget=target;var rotateAngle=-oldYaw+azimuth;while(rotateAngle>Math.PI)rotateAngle-=2*Math.PI;while(rotateAngle<-Math.PI)rotateAngle+=2*Math.PI;var startTime=new Date/1000;var animationId=uuidv4();this.animationId=animationId;this.enableDamping=false;var _animate=function animate(){if(_this2.animationId!==animationId){return}var duration=2;var elapsed=new Date/1000-startTime;var x=elapsed/duration;var k=0.5*(1-Math.cos(x*Math.PI));var currentPosition=new Vector3().lerpVectors(oldPosition,newPosition,k);var currentTarget=new Vector3().lerpVectors(oldTarget,newTarget,k);currentPosition.x-=currentTarget.x;currentPosition.y-=currentTarget.y;currentPosition.applyAxisAngle(new Vector3(0,0,1),rotateAngle*k);currentPosition.x+=currentTarget.x;currentPosition.y+=currentTarget.y;_this2.object.position.copy(currentPosition);_this2.target.copy(currentTarget);_this2.update();if(elapsed<duration){requestAnimationFrame(_animate)}else{_this2.object.position.copy(newPosition);_this2.target.copy(newTarget);_this2.update();_this2._rotateLeft(_this2.getAzimuthalAngle()-azimuth);_this2.update();_this2.enableDamping=true;_this2.animationId=null;callback===null||callback===void 0||callback()}};requestAnimationFrame(_animate)}}])}(MapControls);export{OrbitControls3D as default};
@@ -4,11 +4,11 @@ function _slicedToArray(r,e){return _arrayWithHoles(r)||_iterableToArrayLimit(r,
4
4
  *
5
5
  * This source code is licensed under the BSD-style license found in the
6
6
  * LICENSE file in the root directory of this source tree.
7
- */import{Parser as ExprParser}from"expr-eval";import isEmpty from"lodash.isempty";import parseCssColor from"parse-css-color";import{Float32BufferAttribute,Group,Vector3}from"three";import MiscUtils from"../../../utils/MiscUtils";import{createLabelObject}from"./MiscUtils3D";var styleExpressionParser=new ExprParser;styleExpressionParser.functions.color=function(name){var alpha=arguments.length>1&&arguments[1]!==undefined?arguments[1]:1;var color=parseCssColor(name);return[].concat(_toConsumableArray(color.values.map(function(c){return c/255})),[alpha])};styleExpressionParser.functions.rgb=function(r,g,b){return[r/255,g/255,g/255,1]};styleExpressionParser.functions.rgba=function(r,g,b,a){return[r/255,g/255,g/255,a]};styleExpressionParser.functions.hsl=function(h,s,l){return[].concat(_toConsumableArray(MiscUtils.hslToRgb(h,s,l)),[1])};styleExpressionParser.functions.hsla=function(h,s,l,a){return[].concat(_toConsumableArray(MiscUtils.hslToRgb(h,s,l)),[a])};function batchColor(batchId,batchAttr,context){var _context$batchStyles$,_context$batchStyles;if(((_context$batchStyles$=(_context$batchStyles=context.batchStyles)===null||_context$batchStyles===void 0||(_context$batchStyles=_context$batchStyles[batchId])===null||_context$batchStyles===void 0?void 0:_context$batchStyles.color)!==null&&_context$batchStyles$!==void 0?_context$batchStyles$:null)!==null){var color=parseCssColor(context.batchStyles[batchId].color);return[].concat(_toConsumableArray(color.values.map(function(c){return c/255})),[color.alpha])}else if(context.colorExpressions.length){try{for(var i=0;i<context.colorExpressions.length;++i){var condition=context.colorExpressions[i][0].evaluate(batchAttr);if(condition){return context.colorExpressions[i][1].evaluate(batchAttr)}}}catch(e){/* eslint-disable-next-line */console.warn("Failed to parse color expression: "+String(e))}return null}else if(batchAttr[context.colorAttr]){var _batchAttr$context$al;var _color=batchAttr[context.colorAttr];var alpha=context.alphaAttr?(_batchAttr$context$al=batchAttr[context.alphaAttr])!==null&&_batchAttr$context$al!==void 0?_batchAttr$context$al:255:255;var r=(_color>>16&255)/255;var g=(_color>>8&255)/255;var b=(_color&255)/255;return[r,g,b,alpha/255]}else{return null}}function batchLabel(batchId,batchAttr,context){var _context$batchStyles$2,_context$batchStyles2;if(((_context$batchStyles$2=(_context$batchStyles2=context.batchStyles)===null||_context$batchStyles2===void 0||(_context$batchStyles2=_context$batchStyles2[batchId])===null||_context$batchStyles2===void 0?void 0:_context$batchStyles2.label)!==null&&_context$batchStyles$2!==void 0?_context$batchStyles$2:null)!==null){var _context$batchStyles$3;return{text:context.batchStyles[batchId].label,offset:(_context$batchStyles$3=context.batchStyles[batchId].labelOffset)!==null&&_context$batchStyles$3!==void 0?_context$batchStyles$3:80}}else if(context.labelAttr){return batchAttr[context.labelAttr]}else{return null}}var Tiles3DStyle={applyTileStyle:function applyTileStyle(group,config,sceneContext){var _config$idAttr,_config$tilesetStyle,_config$tilesetStyle2;var batchColorCache={};var batchLabelCache={};var labels={};var idAttr=(_config$idAttr=config.idAttr)!==null&&_config$idAttr!==void 0?_config$idAttr:"id";var context={colorExpressions:[],batchStyles:(_config$tilesetStyle=config.tilesetStyle)===null||_config$tilesetStyle===void 0?void 0:_config$tilesetStyle.batchstyles,colorAttr:config.colorAttr,alphaAttr:config.alphaAttr,labelAttr:config.labelAttr};var baseColor=[1,1,1,1];var customBaseColor=false;if(config.baseColor){var color=parseCssColor(config.baseColor);baseColor=[].concat(_toConsumableArray(color.values.map(function(x){return x/255})),[color.alpha]);customBaseColor=true}var colorRules=(_config$tilesetStyle2=config.tilesetStyle)===null||_config$tilesetStyle2===void 0?void 0:_config$tilesetStyle2.color;var parseExpr=function parseExpr(expr){var cleanExpr=expr.replace(/\$\{(\w+)\}/g,"$1").replaceAll("===","==").replaceAll("!==","==");return styleExpressionParser.parse(cleanExpr)};if(colorRules!==null&&colorRules!==void 0&&colorRules.conditions){colorRules===null||colorRules===void 0||colorRules.conditions.map(function(cond){context.colorExpressions.push([parseExpr(cond[0]),parseExpr(cond[1])])})}else if(typeof colorRules==="string"){context.colorExpressions.push([parseExpr("true"),parseExpr(colorRules)])}group.traverse(function(c){if(c.geometry){var batchidxAttr=c.geometry.getAttribute("_batchid");if(!batchidxAttr){return}var batchPosAttr=c.geometry.getAttribute("position");var rgbaColors=[];var rgbColors=[];var haveColor=customBaseColor;var haveAlpha=baseColor[3]<1;batchidxAttr.array.forEach(function(batchIdx,idx){var batchAttr=group.batchTable.getDataFromId(batchIdx);var batchId=String(batchAttr[idAttr]);// Handle color
8
- var color=batchColorCache[batchIdx];if(color===undefined){color=batchColorCache[batchIdx]=batchColor(batchId,batchAttr,context)}if(color){haveColor=true;haveAlpha|=color[3]<1;rgbaColors.push.apply(rgbaColors,_toConsumableArray(color));rgbColors.push.apply(rgbColors,_toConsumableArray(color.slice(0,3)))}else{rgbaColors.push.apply(rgbaColors,_toConsumableArray(baseColor));rgbColors.push.apply(rgbColors,_toConsumableArray(baseColor.slice(0,3)))}// Handle label
9
- var label=batchLabelCache[batchIdx];if(label===undefined){label=batchLabelCache[batchIdx]=batchLabel(batchId,batchAttr,context)}if(label){var pos=batchPosAttr.array.slice(3*idx,3*idx+3);var entry=labels[batchIdx];if(!entry){entry=labels[batchIdx]={label:label.text,labelOffset:label.offset,pos:pos,ymax:pos[1],count:1,matrix:c.matrixWorld}}else{entry.pos[0]+=pos[0];entry.pos[1]+=pos[1];entry.pos[2]+=pos[2];entry.ymax=Math.max(entry.ymax,pos[1]);++entry.count}}});// NOTE: Also update color buffers if they were previously colored
7
+ */import{Parser as ExprParser}from"expr-eval";import isEmpty from"lodash.isempty";import parseCssColor from"parse-css-color";import{Float32BufferAttribute,Group,Vector3}from"three";import MiscUtils from"../../../utils/MiscUtils";import{createLabelObject,TileMeshHelper}from"./MiscUtils3D";var styleExpressionParser=new ExprParser;styleExpressionParser.functions.color=function(name){var alpha=arguments.length>1&&arguments[1]!==undefined?arguments[1]:1;var color=parseCssColor(name);return[].concat(_toConsumableArray(color.values.map(function(c){return c/255})),[alpha])};styleExpressionParser.functions.rgb=function(r,g,b){return[r/255,g/255,g/255,1]};styleExpressionParser.functions.rgba=function(r,g,b,a){return[r/255,g/255,g/255,a]};styleExpressionParser.functions.hsl=function(h,s,l){return[].concat(_toConsumableArray(MiscUtils.hslToRgb(h,s,l)),[1])};styleExpressionParser.functions.hsla=function(h,s,l,a){return[].concat(_toConsumableArray(MiscUtils.hslToRgb(h,s,l)),[a])};function featureColor(objectId,featureProperties,context){var _context$featureStyle,_context$featureStyle2;if(((_context$featureStyle=(_context$featureStyle2=context.featureStyles)===null||_context$featureStyle2===void 0||(_context$featureStyle2=_context$featureStyle2[objectId])===null||_context$featureStyle2===void 0?void 0:_context$featureStyle2.color)!==null&&_context$featureStyle!==void 0?_context$featureStyle:null)!==null){var color=parseCssColor(context.featureStyles[objectId].color);return[].concat(_toConsumableArray(color.values.map(function(c){return c/255})),[color.alpha])}else if(context.colorExpressions.length){try{for(var i=0;i<context.colorExpressions.length;++i){var condition=context.colorExpressions[i][0].evaluate(featureProperties);if(condition){return context.colorExpressions[i][1].evaluate(featureProperties)}}}catch(e){/* eslint-disable-next-line */console.warn("Failed to parse color expression: "+String(e))}return null}else if(featureProperties[context.colorAttr]){var _featureProperties$co;var _color=featureProperties[context.colorAttr];var alpha=context.alphaAttr?(_featureProperties$co=featureProperties[context.alphaAttr])!==null&&_featureProperties$co!==void 0?_featureProperties$co:255:255;var r=(_color>>16&255)/255;var g=(_color>>8&255)/255;var b=(_color&255)/255;return[r,g,b,alpha/255]}else{return null}}function featureLabel(objectId,featureProperties,context){var _context$featureStyle3,_context$featureStyle4;if(((_context$featureStyle3=(_context$featureStyle4=context.featureStyles)===null||_context$featureStyle4===void 0||(_context$featureStyle4=_context$featureStyle4[objectId])===null||_context$featureStyle4===void 0?void 0:_context$featureStyle4.label)!==null&&_context$featureStyle3!==void 0?_context$featureStyle3:null)!==null){var _context$featureStyle5;return{text:context.featureStyles[objectId].label,offset:(_context$featureStyle5=context.featureStyles[objectId].labelOffset)!==null&&_context$featureStyle5!==void 0?_context$featureStyle5:80}}else if(context.labelAttr){return featureProperties[context.labelAttr]}else{return null}}var Tiles3DStyle={applyTileStyle:function applyTileStyle(group,config,sceneContext){var _config$idAttr,_config$tilesetStyle,_config$tilesetStyle2;var featureColorCache={};var featureLabelCache={};var labels={};var idAttr=(_config$idAttr=config.idAttr)!==null&&_config$idAttr!==void 0?_config$idAttr:"id";var context={colorExpressions:[],featureStyles:(_config$tilesetStyle=config.tilesetStyle)===null||_config$tilesetStyle===void 0?void 0:_config$tilesetStyle.featureStyles,colorAttr:config.colorAttr,alphaAttr:config.alphaAttr,labelAttr:config.labelAttr};var baseColor=[1,1,1,1];var customBaseColor=false;if(config.baseColor){var color=parseCssColor(config.baseColor);baseColor=[].concat(_toConsumableArray(color.values.map(function(x){return x/255})),[color.alpha]);customBaseColor=true}var colorRules=(_config$tilesetStyle2=config.tilesetStyle)===null||_config$tilesetStyle2===void 0?void 0:_config$tilesetStyle2.color;var parseExpr=function parseExpr(expr){var cleanExpr=expr.replace(/\$\{(\w+)\}/g,"$1").replaceAll("===","==").replaceAll("!==","==").replaceAll("||","or").replaceAll("&&","and");return styleExpressionParser.parse(cleanExpr)};if(colorRules!==null&&colorRules!==void 0&&colorRules.conditions){colorRules===null||colorRules===void 0||colorRules.conditions.forEach(function(cond){context.colorExpressions.push([parseExpr(cond[0]),parseExpr(cond[1])])})}else if(typeof colorRules==="string"){context.colorExpressions.push([parseExpr("true"),parseExpr(colorRules)])}group.traverse(function(c){if(c.geometry){var helper=new TileMeshHelper(c);var featureIdAttr=helper.getFeatureIdAttr();if(!featureIdAttr){return}var posAttr=c.geometry.getAttribute("position");var rgbaColors=[];var rgbColors=[];var haveColor=customBaseColor;var haveAlpha=baseColor[3]<1;for(var idx=0;idx<featureIdAttr.count;++idx){var featureId=featureIdAttr.getX(idx);var featureProperties=helper.getFeatureProperties(featureId);var objectId=String(featureProperties[idAttr]);// Handle color
8
+ var _color2=featureColorCache[featureId];if(_color2===undefined){_color2=featureColorCache[featureId]=featureColor(objectId,featureProperties,context)}if(_color2){haveColor=true;haveAlpha|=_color2[3]<1;rgbaColors.push.apply(rgbaColors,_toConsumableArray(_color2));rgbColors.push.apply(rgbColors,_toConsumableArray(_color2.slice(0,3)))}else{rgbaColors.push.apply(rgbaColors,_toConsumableArray(baseColor));rgbColors.push.apply(rgbColors,_toConsumableArray(baseColor.slice(0,3)))}// Handle label
9
+ var label=featureLabelCache[featureId];if(label===undefined){label=featureLabelCache[featureId]=featureLabel(objectId,featureProperties,context)}if(label){var pos=posAttr.array.slice(3*idx,3*idx+3);var entry=labels[featureId];if(!entry){entry=labels[featureId]={label:label.text,labelOffset:label.offset,pos:pos,ymax:pos[1],count:1,matrix:c.matrixWorld}}else{entry.pos[0]+=pos[0];entry.pos[1]+=pos[1];entry.pos[2]+=pos[2];entry.ymax=Math.max(entry.ymax,pos[1]);++entry.count}}}// NOTE: Also update color buffers if they were previously colored
10
10
  if(haveColor||group.userData.haveColor){if(haveAlpha){c.geometry.setAttribute("color",new Float32BufferAttribute(rgbaColors,4))}else{// Discard alpha
11
11
  var count=rgbaColors.length/4;var bufAttr=new Float32BufferAttribute(count*3,3);for(var i=0,j=0;i<count;++i){bufAttr.array[j++]=rgbaColors[4*i];bufAttr.array[j++]=rgbaColors[4*i+1];bufAttr.array[j++]=rgbaColors[4*i+2]}c.geometry.setAttribute("color",bufAttr)}c.material.vertexColors=true;c.material.transparent=haveAlpha;group.userData.haveColor=haveColor}}});// Clear previous labels
12
12
  if(group.userData.labelGroup){group.remove(group.children.find(function(child){return child.uuid===group.userData.labelGroup}));// Explicitly remove label DOM elements
13
13
  Object.values(group.userData.tileLabels).forEach(function(entry){entry.labelObject.element.parentNode.removeChild(entry.labelObject.element)});delete group.userData.tileLabels;delete group.userData.labelGroup}// Add new labels
14
- if(!isEmpty(labels)){var tileLabels={};var labelObjects=new Group;Object.entries(labels).forEach(function(_ref){var _ref2=_slicedToArray(_ref,2),batchId=_ref2[0],entry=_ref2[1];var pos=new Vector3(entry.pos[0]/entry.count,entry.pos[1]/entry.count,entry.pos[2]/entry.count).applyMatrix4(entry.matrix);var maxpos=new Vector3(entry.pos[0]/entry.count,entry.ymax,entry.pos[2]/entry.count).applyMatrix4(entry.matrix);tileLabels[batchId]={pos:pos,label:entry.label,labelOffset:entry.labelOffset};tileLabels[batchId].labelObject=createLabelObject(entry.label,pos,sceneContext,0,entry.labelOffset+(maxpos.y-pos.y));labelObjects.add(tileLabels[batchId].labelObject)});group.userData.tileLabels=tileLabels;group.userData.labelGroup=labelObjects.uuid;group.add(labelObjects)}}};export default Tiles3DStyle;
14
+ if(!isEmpty(labels)){var tileLabels={};var labelObjects=new Group;Object.entries(labels).forEach(function(_ref){var _ref2=_slicedToArray(_ref,2),featureId=_ref2[0],entry=_ref2[1];var pos=new Vector3(entry.pos[0]/entry.count,entry.pos[1]/entry.count,entry.pos[2]/entry.count).applyMatrix4(entry.matrix);var maxpos=new Vector3(entry.pos[0]/entry.count,entry.ymax,entry.pos[2]/entry.count).applyMatrix4(entry.matrix);tileLabels[featureId]={pos:pos,label:entry.label,labelOffset:entry.labelOffset};tileLabels[featureId].labelObject=createLabelObject(entry.label,pos,sceneContext,0,entry.labelOffset+(maxpos.y-pos.y));labelObjects.add(tileLabels[featureId].labelObject)});group.userData.tileLabels=tileLabels;group.userData.labelGroup=labelObjects.uuid;group.add(labelObjects)}}};export default Tiles3DStyle;
@@ -67,14 +67,13 @@ div.AppMenu div.appmenu-menu-container {
67
67
  transform: scaleY(0);
68
68
  transition: transform 0.25s, opacity 0.25s;
69
69
  overflow-y: auto;
70
- max-height: calc(100vh - var(--topbar-height) - var(--bottombar-height));
71
- max-height: calc(var(--vh, 1vh) * 100 - var(--topbar-height) - var(--bottombar-height));
70
+ max-height: calc(var(--plugins-container-height) - var(--topbar-height) - var(--bottombar-height));
72
71
  }
73
72
 
74
73
  div.AppMenu.appmenu-compact div.appmenu-menu-container {
75
74
  right: -11.25em;
76
75
  width: 15em;
77
- height: calc(100vh - 5.5em);
76
+ height: calc(var(--plugins-container-height) - var(--topbar-height) - var(--bottombar-height));
78
77
  transition: transform 0.25s, opacity 0.25s, right 0.5s;
79
78
  background: var(--app-menu-bg-color);
80
79
  box-shadow: 0px 0px 4px rgba(136, 136, 136, 0.5);
@@ -5,12 +5,6 @@ div.identify-body {
5
5
  flex-direction: column;
6
6
  }
7
7
 
8
- div.dock-window > div.resizeable-window-body > div.identify-body {
9
- /* titlebar: 2.5em, padding: 0.5em */
10
- max-height: calc(100vh - 2.5em - 0.5em - var(--topbar-height) - var(--bottombar-height)); /* viewport - titlebar - window_padding - topbar - bottombar*/
11
- max-height: calc(var(--vh, 1vh) * 100 - 2.5em - 0.5em - var(--topbar-height) - var(--bottombar-height)); /* viewport - titlebar - window_padding - topbar - bottombar*/
12
- }
13
-
14
8
  span.identify-body-message {
15
9
  padding: 0.25em;
16
10
  }
@@ -1,4 +1,4 @@
1
- div.taskbar-container {
1
+ div.messagebar-container {
2
2
  position: absolute;
3
3
  left: 0;
4
4
  right: 0;
@@ -8,7 +8,7 @@ div.taskbar-container {
8
8
  z-index: 3;
9
9
  }
10
10
 
11
- div.taskbar {
11
+ div.messagebar {
12
12
  position: relative;
13
13
  flex: 0 0 auto;
14
14
  pointer-events: initial;
@@ -20,12 +20,12 @@ div.taskbar {
20
20
  border-top: 1px solid rgba(136, 136, 136, 0.5);
21
21
  }
22
22
 
23
- div.taskbar > div.body {
23
+ div.messagebar > div.body {
24
24
  padding: 0.25em 0.5em 0.25em 0.25em;
25
25
  display: inline-block;
26
26
  }
27
27
 
28
- div.taskbar > span.closewrapper {
28
+ div.messagebar > span.closewrapper {
29
29
  position: absolute;
30
30
  right: 0;
31
31
  top: 0;
@@ -21,7 +21,7 @@ div.map-buttons-container {
21
21
  flex-wrap: wrap-reverse;
22
22
  z-index: 2;
23
23
  overflow: hidden;
24
- padding: 1.5em 1em 2.5em 1em;
24
+ padding: 2em 1em 2.5em 1em;
25
25
  }
26
26
 
27
27
  div.map-buttons-spacer {
@@ -31,8 +31,7 @@ div.searchbox-results {
31
31
  left: 0;
32
32
  top: 100%;
33
33
  width: 100%;
34
- max-height: calc(100vh - var(--topbar-height) - var(--bottombar-height));
35
- max-height: calc(var(--vh, 1vh) * 100 - var(--topbar-height) - var(--bottombar-height));
34
+ max-height: calc(var(--plugins-container-height) * 100 - var(--topbar-height) - var(--bottombar-height));
36
35
  background-color: var(--list-bg-color);
37
36
  border-left: 1px solid var(--border-color);
38
37
  border-right: 1px solid var(--border-color);
@@ -1,14 +1,13 @@
1
1
  div.sidebar {
2
2
  position: absolute;
3
- top: var(--topbar-height);
4
- max-height: calc(100vh - var(--topbar-height) - var(--bottombar-height));
5
- max-height: calc(var(--vh, 1vh) * 100 - var(--topbar-height) - var(--bottombar-height));
3
+ top: 0;
4
+ max-height: 100%;
6
5
  background-color: var(--container-bg-color);
7
6
  transition: transform 0.25s;
8
7
  box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.75);
9
8
  display: flex;
10
9
  flex-direction: column;
11
- max-width: 100vw;
10
+ max-width: 100%;
12
11
  }
13
12
 
14
13
  div.sidebar-right {
@@ -22,11 +21,15 @@ div.sidebar-left {
22
21
  div.sidebar-right:not(.sidebar-open) {
23
22
  transform: translateX(100%) translateX(8px);
24
23
  pointer-events: none;
24
+ visibility: hidden;
25
+ transition: transform 0.25s, visibility 0s linear 0.25s;
25
26
  }
26
27
 
27
28
  div.sidebar-left:not(.sidebar-open) {
28
29
  transform: translateX(-100%) translateX(-8px);
29
30
  pointer-events: none;
31
+ visibility: hidden;
32
+ transition: transform 0.25s, visibility 0s linear 0.25s;
30
33
  }
31
34
 
32
35
  div.sidebar-resize-handle {
@@ -61,8 +64,7 @@ div.sidebar-resize-handle-bottom {
61
64
  div.sidebar div.sidebar-titlebar {
62
65
  color: var(--titlebar-text-color);
63
66
  background-color: var(--titlebar-bg-color);
64
- height: 2.5em;
65
- flex: 0 0 auto;
67
+ flex: 0 0 2.5em;
66
68
  display: flex;
67
69
  align-items: center;
68
70
  }
@@ -98,8 +100,8 @@ div.sidebar span.sidebar-titlebar-closeicon {
98
100
  div.sidebar div.sidebar-body {
99
101
  overflow-y: auto;
100
102
  overflow-x: hidden;
101
- /* titlebar: 2.5em */
102
- max-height: calc(100vh - 2.5em - var(--topbar-height) - var(--bottombar-height)); /* viewport - sidebar_titlebar - topbar - bottombar*/
103
- max-height: calc(var(--vh, 1vh) * 100 - 2.5em - var(--topbar-height) - var(--bottombar-height)); /* viewport - sidebar_titlebar - topbar - bottombar*/
104
103
  flex: 1 1 auto;
104
+ display: flex;
105
+ flex-direction: column;
106
+ min-height: 0;
105
107
  }
@@ -4,11 +4,6 @@ iframe.windows-iframe-dialog-body {
4
4
  border: 0;
5
5
  }
6
6
 
7
- div.dock-window iframe.windows-iframe-dialog-body {
8
- height: calc(100vh - var(--topbar-height) - var(--bottombar-height));
9
- height: calc(var(--vh, 1vh) * 100 - var(--topbar-height) - var(--bottombar-height));
10
- }
11
-
12
7
  div.windows-notification-container {
13
8
  position: absolute;
14
9
  top: var(--topbar-height);
@@ -0,0 +1,81 @@
1
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
2
+ <svg
3
+ version="1.1"
4
+ width="24"
5
+ height="24"
6
+ viewBox="0 0 24 24"
7
+ id="svg6"
8
+ sodipodi:docname="above_terr.svg"
9
+ inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
10
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
11
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
12
+ xmlns="http://www.w3.org/2000/svg"
13
+ xmlns:svg="http://www.w3.org/2000/svg"
14
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
15
+ xmlns:cc="http://creativecommons.org/ns#"
16
+ xmlns:dc="http://purl.org/dc/elements/1.1/">
17
+ <metadata
18
+ id="metadata12">
19
+ <rdf:RDF>
20
+ <cc:Work
21
+ rdf:about="">
22
+ <dc:format>image/svg+xml</dc:format>
23
+ <dc:type
24
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
25
+ <dc:title>uniE080</dc:title>
26
+ </cc:Work>
27
+ </rdf:RDF>
28
+ </metadata>
29
+ <defs
30
+ id="defs10" />
31
+ <sodipodi:namedview
32
+ pagecolor="#ffffff"
33
+ bordercolor="#666666"
34
+ borderopacity="1"
35
+ objecttolerance="10"
36
+ gridtolerance="10"
37
+ guidetolerance="10"
38
+ inkscape:pageopacity="0"
39
+ inkscape:pageshadow="2"
40
+ inkscape:window-width="1920"
41
+ inkscape:window-height="1172"
42
+ id="namedview8"
43
+ showgrid="true"
44
+ inkscape:zoom="20.85965"
45
+ inkscape:cx="5.0815809"
46
+ inkscape:cy="9.0845244"
47
+ inkscape:window-x="0"
48
+ inkscape:window-y="0"
49
+ inkscape:window-maximized="1"
50
+ inkscape:current-layer="g1132"
51
+ inkscape:document-rotation="0"
52
+ inkscape:pagecheckerboard="0"
53
+ inkscape:showpageshadow="2"
54
+ inkscape:deskcolor="#d1d1d1">
55
+ <inkscape:grid
56
+ type="xygrid"
57
+ id="grid908"
58
+ originx="0"
59
+ originy="0"
60
+ spacingy="1"
61
+ spacingx="1"
62
+ units="px" />
63
+ </sodipodi:namedview>
64
+ <title
65
+ id="title2">uniE080</title>
66
+ <g
67
+ id="g3356"
68
+ transform="translate(4.2175145,-1.0000001)">
69
+ <g
70
+ id="g1132">
71
+ <path
72
+ id="rect847"
73
+ style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stop-color:#000000"
74
+ d="m 11.782485,2.0000002 -5.9999995,6 H 9.782485 V 19 C 7.9468654,17.587985 4.7824855,16 2.7824855,16 c -2,0 -3.50228637,1.078682 -6,3 v 4 c 1.9467076,-1.753851 3.73681103,-3 6,-3 2.263189,0 5,3 7,3 2.0000005,0 2.0000005,0 4.0000005,0 2,0 2.997711,-0.498856 3.999999,-1 v -4 c -1.999999,1 -2.999999,1 -4,1 V 8.0000002 h 4 z"
75
+ sodipodi:nodetypes="cccczcczzscccccc" />
76
+ <g
77
+ id="g1126"
78
+ transform="rotate(45,7.2573571,13.510407)" />
79
+ </g>
80
+ </g>
81
+ </svg>
@@ -0,0 +1,80 @@
1
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
2
+ <svg
3
+ version="1.1"
4
+ width="24"
5
+ height="24"
6
+ viewBox="0 0 24 24"
7
+ id="svg6"
8
+ sodipodi:docname="above_zero.svg"
9
+ inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
10
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
11
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
12
+ xmlns="http://www.w3.org/2000/svg"
13
+ xmlns:svg="http://www.w3.org/2000/svg"
14
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
15
+ xmlns:cc="http://creativecommons.org/ns#"
16
+ xmlns:dc="http://purl.org/dc/elements/1.1/">
17
+ <metadata
18
+ id="metadata12">
19
+ <rdf:RDF>
20
+ <cc:Work
21
+ rdf:about="">
22
+ <dc:format>image/svg+xml</dc:format>
23
+ <dc:type
24
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
25
+ <dc:title>uniE080</dc:title>
26
+ </cc:Work>
27
+ </rdf:RDF>
28
+ </metadata>
29
+ <defs
30
+ id="defs10" />
31
+ <sodipodi:namedview
32
+ pagecolor="#ffffff"
33
+ bordercolor="#666666"
34
+ borderopacity="1"
35
+ objecttolerance="10"
36
+ gridtolerance="10"
37
+ guidetolerance="10"
38
+ inkscape:pageopacity="0"
39
+ inkscape:pageshadow="2"
40
+ inkscape:window-width="1920"
41
+ inkscape:window-height="1172"
42
+ id="namedview8"
43
+ showgrid="true"
44
+ inkscape:zoom="20.85965"
45
+ inkscape:cx="5.0815809"
46
+ inkscape:cy="9.0845244"
47
+ inkscape:window-x="0"
48
+ inkscape:window-y="0"
49
+ inkscape:window-maximized="1"
50
+ inkscape:current-layer="g1132"
51
+ inkscape:document-rotation="0"
52
+ inkscape:pagecheckerboard="0"
53
+ inkscape:showpageshadow="2"
54
+ inkscape:deskcolor="#d1d1d1">
55
+ <inkscape:grid
56
+ type="xygrid"
57
+ id="grid908"
58
+ originx="0"
59
+ originy="0"
60
+ spacingy="1"
61
+ spacingx="1"
62
+ units="px" />
63
+ </sodipodi:namedview>
64
+ <title
65
+ id="title2">uniE080</title>
66
+ <g
67
+ id="g3356"
68
+ transform="translate(4.2175145,-1.0000001)">
69
+ <g
70
+ id="g1132">
71
+ <path
72
+ id="rect847"
73
+ style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stop-color:#000000"
74
+ d="M 12.282485 2.5000001 L 6.2824855 8.5000001 L 10.282485 8.5000001 L 10.282485 19.5 L -2.7175145 19.5 L -2.7175145 23.5 L 18.282485 23.5 L 18.282485 19.5 L 14.282485 19.5 L 14.282485 8.5000001 L 18.282485 8.5000001 L 12.282485 2.5000001 z M 1.7824855 7.5468751 C -1.2041736 7.5468751 -2.4850926 10.359329 -2.4850926 12.972656 C -2.4850926 15.585983 -1.2175069 18.400391 1.7824855 18.400391 C 4.7824779 18.400391 6.0500636 15.585983 6.0500636 12.972656 C 6.0500636 10.359329 4.7691446 7.5468751 1.7824855 7.5468751 z M 1.7824855 9.8535157 C 3.1291488 9.8535157 3.4485011 11.987607 3.4485011 12.960938 C 3.4485011 13.934269 3.1291488 16.09375 1.7824855 16.09375 C 0.43582227 16.09375 0.11646987 13.934269 0.11646987 12.960938 C 0.11646987 11.987607 0.43582227 9.8535157 1.7824855 9.8535157 z " />
75
+ <g
76
+ id="g1126"
77
+ transform="rotate(45,7.2573571,13.510407)" />
78
+ </g>
79
+ </g>
80
+ </svg>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "qwc2",
3
- "version": "2025.08.14",
3
+ "version": "2025.08.21",
4
4
  "description": "QGIS Web Client",
5
5
  "author": "Sourcepole AG",
6
6
  "license": "BSD-2-Clause",
package/plugins/API.js CHANGED
@@ -85,7 +85,7 @@ function ownKeys(e,r){var t=Object.keys(e);if(Object.getOwnPropertySymbols){var
85
85
  * * `name`: An identifier
86
86
  * * `plugin`: The plugin component class
87
87
  * * `translations`: The plugin translation messages: `{"<lang>": {<messages>}, ...}`
88
- */_defineProperty(_this,"addPlugin",function(name,plugin){var _plugin$WrappedCompon,_component$availableI,_component$availableI2;var translations=arguments.length>2&&arguments[2]!==undefined?arguments[2]:{};var component=(_plugin$WrappedCompon=plugin.WrappedComponent)!==null&&_plugin$WrappedCompon!==void 0?_plugin$WrappedCompon:plugin;var availableIn2D=(_component$availableI=component.availableIn2D)!==null&&_component$availableI!==void 0?_component$availableI:true;var availableIn3D=(_component$availableI2=component.availableIn3D)!==null&&_component$availableI2!==void 0?_component$availableI2:false;PluginStore.addCustomPlugin(name,plugin);window.qwc2.addTranslations(translations);_this.props.registerCustomPlugin(name,availableIn2D,availableIn3D)});/**
88
+ */_defineProperty(_this,"addPlugin",function(name,plugin){var _plugin$WrappedCompon,_component$availableI;var translations=arguments.length>2&&arguments[2]!==undefined?arguments[2]:{};var component=(_plugin$WrappedCompon=plugin.WrappedComponent)!==null&&_plugin$WrappedCompon!==void 0?_plugin$WrappedCompon:plugin;var availableIn3D=(_component$availableI=component.availableIn3D)!==null&&_component$availableI!==void 0?_component$availableI:false;PluginStore.addCustomPlugin(name,plugin);window.qwc2.addTranslations(translations);_this.props.registerCustomPlugin(name,availableIn3D)});/**
89
89
  * Remove custom plugin
90
90
  *
91
91
  * * `name`: The identifier
@@ -4,8 +4,8 @@ function _typeof(o){"@babel/helpers - typeof";return _typeof="function"==typeof
4
4
  *
5
5
  * This source code is licensed under the BSD-style license found in the
6
6
  * LICENSE file in the root directory of this source tree.
7
- */import React from"react";import{connect}from"react-redux";import PropTypes from"prop-types";import{setCurrentTask}from"../actions/task";import AttributeTableWidget from"../components/AttributeTableWidget";import ResizeableWindow from"../components/ResizeableWindow";import EditingInterface from"../utils/EditingInterface";import LocaleUtils from"../utils/LocaleUtils";import"./style/AttributeTable.css";/**
8
- * Displaying the attribute table of layers in a dialog.
7
+ */import React from"react";import{connect}from"react-redux";import PropTypes from"prop-types";import{setCurrentTask}from"../actions/task";import AttributeTableWidget from"../components/AttributeTableWidget";import ResizeableWindow from"../components/ResizeableWindow";import EditingInterface from"../utils/EditingInterface";import LocaleUtils from"../utils/LocaleUtils";/**
8
+ * Display the attribute table of layers in a dialog.
9
9
  *
10
10
  * To make a layer available in the attribute table, create a a data resource and matching permissions for it in the `qwc-admin-gui`.
11
11
  *
@@ -13,4 +13,4 @@ function _typeof(o){"@babel/helpers - typeof";return _typeof="function"==typeof
13
13
  *
14
14
  * This plugin queries the dataset via the editing service specified by
15
15
  * `editServiceUrl` in `config.json` (by default the `qwc-data-service`).
16
- */var AttributeTable=/*#__PURE__*/function(_React$Component){function AttributeTable(){var _this;_classCallCheck(this,AttributeTable);for(var _len=arguments.length,args=new Array(_len),_key=0;_key<_len;_key++){args[_key]=arguments[_key]}_this=_callSuper(this,AttributeTable,[].concat(args));_defineProperty(_this,"onClose",function(){if(!_this.props.blocked){_this.props.setCurrentTask(null)}});return _this}_inherits(AttributeTable,_React$Component);return _createClass(AttributeTable,[{key:"render",value:function render(){var _this$props$taskData;if(!this.props.active){return null}return/*#__PURE__*/React.createElement(ResizeableWindow,{dockable:"bottom",icon:"editing",initialHeight:480,initialWidth:800,initiallyDocked:true,onClose:this.onClose,splitScreenWhenDocked:true,title:LocaleUtils.tr("attribtable.title")},/*#__PURE__*/React.createElement(AttributeTableWidget,{allowAddForGeometryLayers:this.props.allowAddForGeometryLayers,iface:this.props.iface,initialLayer:(_this$props$taskData=this.props.taskData)===null||_this$props$taskData===void 0?void 0:_this$props$taskData.layer,role:"body",showEditFormButton:this.props.showEditFormButton,showLimitToExtent:this.props.showLimitToExtent,zoomLevel:this.props.zoomLevel}))}}])}(React.Component);_defineProperty(AttributeTable,"propTypes",{active:PropTypes.bool,/** Whether to allow adding records for datasets which have a geometry column. */allowAddForGeometryLayers:PropTypes.bool,blocked:PropTypes.bool,iface:PropTypes.object,setCurrentTask:PropTypes.func,/** Whether to show a button to open the edit form for selected layer. Requires the Editing plugin to be enabled. */showEditFormButton:PropTypes.bool,/** Whether to show the "Limit to extent" checkbox */showLimitToExtent:PropTypes.bool,taskData:PropTypes.object,/** The zoom level for zooming to point features. */zoomLevel:PropTypes.number});_defineProperty(AttributeTable,"defaultProps",{zoomLevel:1000,showEditFormButton:true});export default(function(){var iface=arguments.length>0&&arguments[0]!==undefined?arguments[0]:EditingInterface;return connect(function(state){return{active:state.task.id==="AttributeTable",blocked:state.task.id==="AttributeTable"&&state.task.blocked,iface:iface,taskData:state.task.id==="AttributeTable"?state.task.data:null}},{setCurrentTask:setCurrentTask})(AttributeTable)});
16
+ */var AttributeTable=/*#__PURE__*/function(_React$Component){function AttributeTable(){var _this;_classCallCheck(this,AttributeTable);for(var _len=arguments.length,args=new Array(_len),_key=0;_key<_len;_key++){args[_key]=arguments[_key]}_this=_callSuper(this,AttributeTable,[].concat(args));_defineProperty(_this,"onClose",function(){if(!_this.props.blocked){_this.props.setCurrentTask(null)}});return _this}_inherits(AttributeTable,_React$Component);return _createClass(AttributeTable,[{key:"render",value:function render(){var _this$props$taskData;if(!this.props.active){return null}return/*#__PURE__*/React.createElement(ResizeableWindow,{dockable:"bottom",icon:"editing",initialHeight:480,initialWidth:800,initiallyDocked:true,onClose:this.onClose,splitScreenWhenDocked:true,title:LocaleUtils.tr("attribtable.title")},/*#__PURE__*/React.createElement(AttributeTableWidget,{allowAddForGeometryLayers:this.props.allowAddForGeometryLayers,iface:this.props.iface,initialLayer:(_this$props$taskData=this.props.taskData)===null||_this$props$taskData===void 0?void 0:_this$props$taskData.layer,role:"body",showEditFormButton:this.props.showEditFormButton,showLimitToExtent:this.props.showLimitToExtent,zoomLevel:this.props.zoomLevel}))}}])}(React.Component);_defineProperty(AttributeTable,"propTypes",{active:PropTypes.bool,/** Whether to allow adding records for datasets which have a geometry column. */allowAddForGeometryLayers:PropTypes.bool,blocked:PropTypes.bool,iface:PropTypes.object,setCurrentTask:PropTypes.func,/** Whether to show a button to open the edit form for selected layer. Requires the Editing plugin to be enabled. */showEditFormButton:PropTypes.bool,/** Whether to show the "Limit to extent" checkbox */showLimitToExtent:PropTypes.bool,taskData:PropTypes.object,/** The zoom level for zooming to point features. */zoomLevel:PropTypes.number});_defineProperty(AttributeTable,"defaultProps",{zoomLevel:1000,showEditFormButton:true,showLimitToExtent:true});export default(function(){var iface=arguments.length>0&&arguments[0]!==undefined?arguments[0]:EditingInterface;return connect(function(state){return{active:state.task.id==="AttributeTable",blocked:state.task.id==="AttributeTable"&&state.task.blocked,iface:iface,taskData:state.task.id==="AttributeTable"?state.task.data:null}},{setCurrentTask:setCurrentTask})(AttributeTable)});