提交

src/Global/MapX/index.js

@@ -166,5 +166,15 @@ function close(sdk) {
   }
   sdk.viewer.scene.preRender.removeEventListener(syncViewer, syncObject)
 }
+function destroy(sdk) {
+  if (mapx.viewer) {
+    if (mapx.viewer.entities) {
+      mapx.viewer.entities.removeAll()
+    }
+    mapx.viewer.destroy && mapx.viewer.destroy()
+  }
+  mapx = {}
+  sdk.viewer.scene.preRender.removeEventListener(syncViewer, syncObject)
+}
 
-export { open, close }
+export { open, close, destroy }

src/Obj/Base/GeoJson/index.js

@@ -83,11 +83,9 @@ class GeoJson extends Base {
 
   async on() {
     let url = ""
-    if (this.options.host.endsWith("yjearth4.0"))
-      url = this.options.host + '/data/service/getFile'
-    else
-      url = this.options.host + '/yjearth4.0/data/service/getFile'
-    url = url + '?path=' + encodeURIComponent(this.options.url)
+    this.options.host = this.options.host || getHost()
+    url = this.options.host + '/fileInfo/previewLocal'
+    url += '?fileAbsolutePath=' + this.options.url
     let rsp = await fetch(url, {
       method: 'get',
       headers: {

src/Obj/Base/Vector/index.js

@@ -349,7 +349,7 @@ class Vector extends Base {
       let url = ''
       that.options.host = that.options.host || getHost()
       url = that.options.host + '/fileInfo/previewLocal'
-      url += '?path=' + that.options.path
+      url += '?fileAbsolutePath=' + that.options.path
       fetch(url, {
         method: 'get',
         headers: {

src/YJEarth/index.js

@@ -27,6 +27,7 @@ import {
 import { syncSplitData, setActiveId } from '../Global/SplitScreen'
 import { apiQueryGoodsList } from '../Tools/getGoodsList'
 import YJColorPicker from "../Obj/Element/yj-color-picker";
+import { destroy as mapxDestroy } from "../Global/MapX";
 // window.check = check
 
 class YJEarth {
@@ -572,6 +573,7 @@ class YJEarth {
     }
 
     if (this.viewer) {
+      mapxDestroy(this)
       if (this.viewer.entities) {
         this.viewer.entities.removeAll()
       }