1

src/custom/start.js

@@ -839,15 +839,16 @@ export function panoEditStart(dom, number, EditCloudsArgs){
 
   
 
-export function mergeEditStart(dom, mapDom){
+export function mergeEditStart(dom, mapDom, {queryCloudLonLatUrl}={}){
     Potree.settings.editType = 'merge' 
     Potree.settings.intersectOnObjs = true
     Potree.settings.boundAddObjs = true
     Potree.settings.unableNavigate = true
-   
-    if(Potree.settings.queryCloudLonLatUrl){ //点云使用其经纬度作为默认位置
+    
+    if(queryCloudLonLatUrl){ //点云使用其经纬度作为默认位置
+        Potree.settings.queryCloudLonLatUrl = queryCloudLonLatUrl
         Potree.loadControlPoint = /* async  */function(callback,sceneCode,onError,prefix){//点云绑定地图 
-            return Potree.loadFile(Potree.settings.queryCloudLonLatUrl.replace('{sceneCode}', sceneCode),  {
+            return Potree.loadFile(queryCloudLonLatUrl.replace('{sceneCode}', sceneCode),  {
                 fetchMethod: 'post'
             }, callback,onError) 
         }   
@@ -1025,7 +1026,9 @@ export function mergeEditStart(dom, mapDom){
     
     let modelType,  modelEditing, MergeEditor = viewer.modules.MergeEditor
     Potree.addModel = function(prop, done, onProgress, onError){ //加载模型
-        const fromNew = prop.raw?.convertType && model.fileType == '3dtiles' && (prop.raw?.wgs84 || prop.raw?.gcj02)
+    
+        const fromNew = prop.raw?.convertType && prop.type == '3dtiles' && (prop.raw?.wgs84 || prop.raw?.gcj02)
+        
         let loadDone = (model)=>{ 
             model.dataset_id = prop.id //唯一标识