Merge branch 'master' of github.com:dvgis/dc-sdk

src/modules/parse/Parse.js

@@ -2,6 +2,8 @@
  * @Author : Caven Chen
  */
 import Position from '../position/Position'
+import { Cesium } from '../../namespace'
+import { Transform } from '../transform'
 
 class Parse {
   /**
@@ -26,6 +28,10 @@ class Parse {
       result = Position.fromObject(position)
     } else if (Object(position) instanceof Position) {
       result = position
+    } else if (Object(position) instanceof Cesium.Cartesian3) {
+      result = Transform.transformCartesianToWGS84(position)
+    } else if (Object(position) instanceof Cesium.Cartographic) {
+      result = Transform.transformCartographicToWGS84(position)
     }
     return result
   }

src/modules/transform/Transform.js

@@ -26,6 +26,22 @@ class Transform {
     return new Position(0, 0)
   }
 
+  /**
+   * Transforms Cartographic To WGS84
+   * @param cartographic
+   * @returns {Position}
+   */
+  static transformCartographicToWGS84(cartographic) {
+    if (cartographic) {
+      return new Position(
+        Cesium.Math.toDegrees(cartographic?.longitude || 0),
+        Cesium.Math.toDegrees(cartographic?.latitude || 0),
+        cartographic.height || 0
+      )
+    }
+    return new Position(0, 0)
+  }
+
   /**
    * Transforms WGS84 To Cartesian
    * @param position

src/modules/widget/type/Compass.js

@@ -38,9 +38,11 @@ class Compass extends Widget {
    * @private
    */
   _installHook() {
+    const self = this
     Object.defineProperty(this._viewer, 'compass', {
-      value: this,
-      writable: false,
+      get() {
+        return self
+      },
     })
     this._wrapper.onmousedown = (e) => {
       this._handleMouseDown(e)

src/modules/widget/type/ContextMenu.js

@@ -59,9 +59,11 @@ class ContextMenu extends Widget {
    * @private
    */
   _installHook() {
+    const self = this
     Object.defineProperty(this._viewer, 'contextMenu', {
-      value: this,
-      writable: false,
+      get() {
+        return self
+      },
     })
     this._handler = new Cesium.ScreenSpaceEventHandler(this._viewer.canvas)
   }

src/modules/widget/type/DistanceLegend.js

@@ -41,9 +41,11 @@ class DistanceLegend extends Widget {
    * @private
    */
   _installHook() {
+    const self = this
     Object.defineProperty(this._viewer, 'distanceLegend', {
-      value: this,
-      writable: false,
+      get() {
+        return self
+      },
     })
   }
 

src/modules/widget/type/HawkeyeMap.js

@@ -64,9 +64,11 @@ class HawkeyeMap extends Widget {
    * @private
    */
   _installHook() {
+    const self = this
     Object.defineProperty(this._viewer, 'hawkeyeMap', {
-      value: this,
-      writable: false,
+      get() {
+        return self
+      },
     })
     this._viewer.camera.percentageChanged = 0.01
   }

src/modules/widget/type/LoadingMask.js

@@ -22,9 +22,11 @@ class LoadingMask extends Widget {
    * @private
    */
   _installHook() {
+    const self = this
     Object.defineProperty(this._viewer, 'loadingMask', {
-      value: this,
-      writable: false,
+      get() {
+        return self
+      },
     })
   }
 

src/modules/widget/type/LocationBar.js

@@ -34,9 +34,11 @@ class LocationBar extends Widget {
    * @private
    */
   _installHook() {
+    const self = this
     Object.defineProperty(this._viewer, 'locationBar', {
-      value: this,
-      writable: false,
+      get() {
+        return self
+      },
     })
   }
 

src/modules/widget/type/MapSplit.js

@@ -26,9 +26,11 @@ class MapSplit extends Widget {
    * @private
    */
   _installHook() {
+    const self = this
     Object.defineProperty(this._viewer, 'mapSplit', {
-      value: this,
-      writable: false,
+      get() {
+        return self
+      },
     })
   }
 

src/modules/widget/type/MapSwitch.js

@@ -34,12 +34,14 @@ class MapSwitch extends Widget {
    * @private
    */
   _installHook() {
+    const self = this
     Object.defineProperty(this._viewer, 'mapSwitch', {
-      value: this,
-      writable: false,
+      get() {
+        return self
+      },
     })
     this.enable = true
-    let self = this
+    // let self = this
     this._wrapper.onmouseover = () => {
       let width = 80
       let rightMargin = 5

src/modules/widget/type/Popup.js

@@ -65,9 +65,11 @@ class Popup extends Widget {
   _installHook() {
     this.enable = true
     this._bindEvent()
+    const self = this
     Object.defineProperty(this._viewer, 'popup', {
-      value: this,
-      writable: false,
+      get() {
+        return self
+      },
     })
   }
 

src/modules/widget/type/SceneSplit.js

@@ -27,9 +27,11 @@ class SceneSplit extends Widget {
    * @private
    */
   _installHook() {
+    const self = this
     Object.defineProperty(this._viewer, 'sceneSplit', {
-      value: this,
-      writable: false,
+      get() {
+        return self
+      },
     })
   }
 

src/modules/widget/type/TilesetSplit.js

@@ -26,9 +26,11 @@ class TilesetSplit extends Widget {
    * @private
    */
   _installHook() {
+    const self = this
     Object.defineProperty(this._viewer, 'tilesetSplit', {
-      value: this,
-      writable: false,
+      get() {
+        return self
+      },
     })
   }
 

src/modules/widget/type/Tooltip.js

@@ -23,9 +23,11 @@ class Tooltip extends Widget {
    * @private
    */
   _installHook() {
+    const self = this
     Object.defineProperty(this._viewer, 'tooltip', {
-      value: this,
-      writable: false,
+      get() {
+        return self
+      },
     })
   }
 

src/modules/widget/type/ZoomController.js

@@ -154,9 +154,11 @@ class ZoomController extends Widget {
    * @private
    */
   _installHook() {
+    const self = this
     Object.defineProperty(this._viewer, 'zoomController', {
-      value: this,
-      writable: false,
+      get() {
+        return self
+      },
     })
   }