diff --git a/src/Obj/Base/BaseSource/BaseLayer/index.js b/src/Obj/Base/BaseSource/BaseLayer/index.js index f4a0a79..083fd74 100644 --- a/src/Obj/Base/BaseSource/BaseLayer/index.js +++ b/src/Obj/Base/BaseSource/BaseLayer/index.js @@ -9,7 +9,7 @@ import Dialog from '../../../Element/Dialog'; import CoordTransform from "../../../../transform/CoordTransform"; import BaseSource from "../index"; -import { syncData } from '../../../../Global/MultiViewportMode' +import { syncData, get2DView } from '../../../../Global/MultiViewportMode' import { setSplitDirection, syncSplitData } from '../../../../Global/SplitScreen' import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../../Global/global' @@ -244,8 +244,19 @@ class BaseLayer extends BaseSource { this.originalOptions = this.deepCopyObj(this.options) this._DialogObject.close() this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(this.originalOptions) - syncData(this.sdk, this.options.id) + // syncData(this.sdk, this.options.id) syncSplitData(this.sdk, this.options.id) + let sdk2D = get2DView() + if (sdk2D && sdk2D != this.sdk) { + for(let i=0;i { this.reset() diff --git a/src/Obj/Base/index.js b/src/Obj/Base/index.js index 3f16db4..fedb92a 100644 --- a/src/Obj/Base/index.js +++ b/src/Obj/Base/index.js @@ -290,7 +290,7 @@ class Base extends Tools { let destination = Cesium.Cartesian3.fromDegrees(lng, lat, alt) let position = { lng: 0, lat: 0 } - if (this.options.position) { + if (this.options.position && Object.prototype.toString.call(this.options.position) === '[object Object]') { position = { ...this.options.position } } else if (this.options.positions) { @@ -436,7 +436,7 @@ class Base extends Tools { let position = { lng: 0, lat: 0 } let relativePosition = { ...cameraPosition84 } - if (this.options.position) { + if (this.options.position && Object.prototype.toString.call(this.options.position) === '[object Object]') { position = { ...this.options.position } } else if (this.options.positions) {