|
@@ -2,6 +2,8 @@ import mitt from 'mitt'
|
|
|
|
|
|
import axios from 'axios' //{ axios } from '@/api'
|
|
import axios from 'axios' //{ axios } from '@/api'
|
|
|
|
|
|
|
|
+
|
|
|
|
+const Id_noIntersect = -100 //path绘制在地图上的点,modelId传这个值,勿更改
|
|
let requestLoadCount = 0
|
|
let requestLoadCount = 0
|
|
let maxLoadingCount = 2; //正在加载模型的最大数目
|
|
let maxLoadingCount = 2; //正在加载模型的最大数目
|
|
//0看看,1看见,2深时,3用户上传三维模型,4深时mesh,5深光点云,6深光mesh
|
|
//0看看,1看见,2深时,3用户上传三维模型,4深时mesh,5深光点云,6深光mesh
|
|
@@ -14,16 +16,14 @@ const ModelTypes = {
|
|
5 : {name:'深光点云' },
|
|
5 : {name:'深光点云' },
|
|
6 : {name:'深光mesh',panos4dkk:true, rot90:true},//3dtiles
|
|
6 : {name:'深光mesh',panos4dkk:true, rot90:true},//3dtiles
|
|
}
|
|
}
|
|
-let cesAspect
|
|
|
|
-
|
|
|
|
|
|
+let cesAspect
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-//江门本地版本
|
|
|
|
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+//江门本地版本
|
|
|
|
|
|
|
|
|
|
export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOSSRoot, panoOSSRoot,ossRoot }) => {
|
|
export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOSSRoot, panoOSSRoot,ossRoot }) => {
|
|
@@ -340,7 +340,11 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
|
|
//未被删除
|
|
//未被删除
|
|
console.warn('changePoints', measure.dataset_points.length )
|
|
console.warn('changePoints', measure.dataset_points.length )
|
|
if(measure.type == 'Path'){
|
|
if(measure.type == 'Path'){
|
|
- bus.emit('changePoints', measure.dataset_points.map((p,i)=>{return {position: (p || measure.points[i]).clone(), modelId:measure.points_datasets[i], name:measure.markerLabels[i].originText}}))
|
|
|
|
|
|
+ bus.emit('changePoints', measure.dataset_points.map((p,i)=>{return {
|
|
|
|
+ position: (p || measure.points[i]).clone(),
|
|
|
|
+ modelId: measure.points_datasets[i] == void 0 ? Id_noIntersect : measure.points_datasets[i],
|
|
|
|
+ name: measure.markerLabels[i].originText
|
|
|
|
+ }}))
|
|
}else{
|
|
}else{
|
|
bus.emit('update', [
|
|
bus.emit('update', [
|
|
measure.dataset_points.map(p => p.clone()),
|
|
measure.dataset_points.map(p => p.clone()),
|
|
@@ -1321,7 +1325,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 }) //要等进入编辑才能继续编辑
|
|
}else{
|
|
}else{
|
|
- info.points_datasets = props.points.map(e=>e.modelId)
|
|
|
|
|
|
+ info.points_datasets = props.points.map(e=> e.modelId == Id_noIntersect ? null : e.modelId)
|
|
info.dataset_points = props.points.map(e=>e.position)
|
|
info.dataset_points = props.points.map(e=>e.position)
|
|
path = viewer.measuringTool.createMeasureFromData(info);
|
|
path = viewer.measuringTool.createMeasureFromData(info);
|
|
|
|
|