1

src/custom/objects/tool/AxisViewer.js

@@ -18,6 +18,7 @@ export default class AxisViewer extends ViewerBase{
         $(parentArea).append(domElement)
         
         
+         
         let posInfo = Object.assign({
             //default:
             right: 0, top:0, width:'100px', height:'100px'
@@ -198,7 +199,8 @@ export default class AxisViewer extends ViewerBase{
                 child.geometry.dispose()
             }
         })
-        super.dispose()
+        super.dispose() 
+        this.renderArea.parentElement.removeChild(this.renderArea)
         delete this.listenViewport.axis
     }
 }

src/custom/settings.js

@@ -478,7 +478,7 @@ let settings = {//设置   可修改
     UserDensityPercent:null,//点云密度百分比 
     ifShowMarker:true,//显示漫游点
     floorplanType:{},//平面图类型 'default' | 'diy'  不同数据集不同{datasetId:...}
-    floorplanEnable:false,
+    floorplanEnable:true,
     floorplanEnables:{},
     floorplanRequests:{},//开始加载了的
     
@@ -492,7 +492,7 @@ let settings = {//设置   可修改
     sizeFitToLevel: false,//当type为衰减模式时自动根据level调节大小。每长一级，大小就除以2
     zoom:{
         enabled : true,
-        min:1,
+        min: browser.urlHasValue('zoomMin',true) || 1,
         max: config.highQualityMaxZoom 
                                  
     },

src/custom/utils/SplitScreen4Views.js

@@ -61,6 +61,26 @@ var SplitScreen4Views = new SplitScreen({noRotSide:true})
 
  
 SplitScreen4Views.split = function(o={}){
+     
+    this.statesBefore = { 
+        pointDensity : Potree.settings.pointDensity,
+        displayMode : Potree.settings.displayMode,
+        
+        position: viewer.images360.position,
+        target: viewer.scene.view.getPivot(),
+        currentPano: viewer.images360.currentPano,
+        oldMapView: viewer.mapViewer.view.clone(),
+        mapZoom: viewer.mapViewer.camera.zoom
+        //---
+        //ifShowMarker : Potree.settings.ifShowMarker, 
+    }
+    
+    
+    
+    
+    
+    
+    
     var defaultCamera = viewer.scene.getActiveCamera()
    
     let {boundSize, center} = viewer.bound
@@ -89,18 +109,7 @@ SplitScreen4Views.split = function(o={}){
         pano.dispatchEvent({type:'changeMarkerTex',name:'ring'})
     }) */ 
         
-    //材质 
-    this.statesBefore = { 
-        pointDensity : Potree.settings.pointDensity,
-        displayMode : Potree.settings.displayMode,
-        
-        position: viewer.images360.position,
-        target: viewer.scene.view.getPivot(),
-        currentPano: viewer.images360.currentPano,
-        
-        //---
-        //ifShowMarker : Potree.settings.ifShowMarker, 
-    }
+    
     
     viewer.setPointStandardMat(true,null,true) //切换到标准模式（主要为了mainViewport）  点云使用标准大小 
     
@@ -202,6 +211,8 @@ SplitScreen4Views.recover = function(){
     /* const {width, height} = viewer.renderer.getSize(new THREE.Vector2());
     viewer.renderer.setViewport(0,0,width,height)
     viewer.renderer.setScissorTest( false ); */
+    viewer.mapViewer.view.copy(this.statesBefore.oldMapView) 
+    viewer.mapViewer.camera.zoom = this.statesBefore.mapZoom 
     
     viewer.setView({
         position: this.statesBefore.position,