|
@@ -1,7 +1,8 @@
|
|
import mitt from 'mitt'
|
|
import mitt from 'mitt'
|
|
import libTransform from 'coordtransform';
|
|
import libTransform from 'coordtransform';
|
|
-import axios from 'axios' //{ axios } from '@/api'
|
|
|
|
-
|
|
|
|
|
|
+//import axios from 'axios' //{ axios } from '@/api'
|
|
|
|
+import axios from '@/api/instance' //带token
|
|
|
|
+//实时加载路径的版本
|
|
|
|
|
|
let requestLoadCount = 0
|
|
let requestLoadCount = 0
|
|
let maxLoadingCount = 2; //正在加载模型的最大数目
|
|
let maxLoadingCount = 2; //正在加载模型的最大数目
|
|
@@ -73,7 +74,56 @@ let curSelectPath
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
-//加路径
|
|
|
|
|
|
+let createAnimatePath = ()=>{//实时路径
|
|
|
|
+ let caseId = Potree.browser.urlHasValue('caseId',true)
|
|
|
|
+ let count = 0
|
|
|
|
+ let paths = []
|
|
|
|
+ let addPath
|
|
|
|
+ let interval = setInterval(async ()=>{
|
|
|
|
+ const list = await axios.get("/fusion/caseDevice/list", {
|
|
|
|
+ params: {
|
|
|
|
+ caseId
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ let less = list.length - paths.length //add or remove
|
|
|
|
+ if(less>0){
|
|
|
|
+ for(let i=0;i<less;i++){
|
|
|
|
+ let path = new Potree.Path({})
|
|
|
|
+ path.setEditEnable(false)
|
|
|
|
+ viewer.scene.addMeasurement(path);
|
|
|
|
+ viewer.scene.overlayScene.add(path);
|
|
|
|
+ paths.push(path)
|
|
|
|
+ }
|
|
|
|
+ }else if(less<0){
|
|
|
|
+ for(let i=0;i<-less;i++){
|
|
|
|
+ let path = paths.pop()
|
|
|
|
+ path.dispose()
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ list.forEach((data,i)=>{
|
|
|
|
+
|
|
|
|
+ let path = paths[i]
|
|
|
|
+ path.points = data.locationList.map(e=>{
|
|
|
|
+ let p = viewer.transform.lonlatToLocal.forward([parseFloat(e.lng), parseFloat(e.lat), parseFloat(e.height)])
|
|
|
|
+ return new THREE.Vector3().fromArray(p)
|
|
|
|
+ })
|
|
|
|
+ //path.addMarker({index, point:points[index]})
|
|
|
|
+ try{
|
|
|
|
+ path.update()
|
|
|
|
+ }catch(e){console.error(e)}
|
|
|
|
+
|
|
|
|
+ })
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ console.log('positions',list )
|
|
|
|
+ if(count++ > 1){clearInterval(interval)}
|
|
|
|
+ },1000)
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+}
|
|
|
|
|
|
let addedPath, floorCountEmited
|
|
let addedPath, floorCountEmited
|
|
let addPath = ()=>{//加个他们拍的路径
|
|
let addPath = ()=>{//加个他们拍的路径
|
|
@@ -277,7 +327,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
} */
|
|
} */
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
+ createAnimatePath()
|
|
|
|
|
|
|
|
|
|
//因为getPose里用的是target,俯视的yaw不准,所以限制一下不要完全俯视
|
|
//因为getPose里用的是target,俯视的yaw不准,所以限制一下不要完全俯视
|
|
@@ -2058,7 +2108,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
viewer.dispatchEvent({ type: 'cancel_insertions', dontRemove: true, measure:path })
|
|
viewer.dispatchEvent({ type: 'cancel_insertions', dontRemove: true, measure:path })
|
|
}
|
|
}
|
|
path.setEditEnable(state)
|
|
path.setEditEnable(state)
|
|
- $('.ui-editor-head .control').css('pointer-events',state?'none':'')
|
|
|
|
|
|
+ //$('.ui-editor-head .control').css('pointer-events',state?'none':'')
|
|
},
|
|
},
|
|
|
|
|
|
changeCanEdit(state){//是否点击pen图标以加点和删点
|
|
changeCanEdit(state){//是否点击pen图标以加点和删点
|