dd @dc-modules/history-track

modules/history-track/Track.js

@@ -13,17 +13,14 @@ import { heading, distance } from '@dc-modules/math'
 import TrackViewMode from './TrackViewMode'
 
 const DEF_OPTS = {
+  showPath: false,
+  pathWidth: 1,
+  pathMaterial: Cesium.Color.ORANGE.withAlpha(0.8),
+  pathLeadTime: 1,
   clampToGround: false,
   clampToTileset: false
 }
 
-const DEF_PATH_STYLE = {
-  width: 2,
-  material: Cesium.Color.ORANGE,
-  clampToGround: true,
-  depthFailMaterial: Cesium.Color.ORANGE.withAlpha(0.8)
-}
-
 class Track {
   constructor(positions, duration, callback, options) {
     this._id = Util.uuid()
@@ -38,16 +35,6 @@ class Track {
     this._controller = undefined
     this._viewed = false
     this._delegate = new Cesium.Entity()
-    this._pathPositions = []
-    this._path = new Cesium.Entity({
-      show: false,
-      polyline: {
-        positions: new Cesium.CallbackProperty(() => {
-          return this._pathPositions
-        })
-      }
-    })
-
     this._positionIndex = 0
     this._timeLine = []
     this._startTime = undefined
@@ -74,7 +61,7 @@ class Track {
 
   set positions(postions) {
     this._positions = Parse.parsePositions(postions)
-    this._resetTimeLine({})
+    this._resetTimeLine()
     return this
   }
 
@@ -84,7 +71,7 @@ class Track {
 
   set duration(duration) {
     this._duration = duration
-    this._resetTimeLine({})
+    this._resetTimeLine()
     return this
   }
 
@@ -98,7 +85,7 @@ class Track {
     } else {
       this._startTime = startTime
     }
-    this._resetTimeLine({})
+    this._resetTimeLine()
     return this
   }
 
@@ -134,7 +121,6 @@ class Track {
     }
     this._controller = controller
     this._controller.delegate.add(this._delegate)
-    this._controller.delegate.add(this._path)
     !this._startTime && (this._startTime = Cesium.JulianDate.now())
     this._state = State.ADDED
   }
@@ -144,13 +130,10 @@ class Track {
    * @private
    */
   _onRemove() {
-    if (!this._controller) {
-      return false
+    if (this._controller) {
+      this._controller.delegate.remove(this._delegate)
     }
-    this._controller.delegate.remove(this._delegate)
-    this._controller.delegate.remove(this._path)
     this._viewed = false
-    this._startTime = undefined
     this._state = State.REMOVED
   }
 
@@ -166,14 +149,13 @@ class Track {
     }
     let now = Cesium.JulianDate.now()
     if (Cesium.JulianDate.lessThan(now, this._endTime)) {
-      let p = this._sampledPosition.getValue(now)
-      this._pathPositions.push(p)
       if (this._options.clampToTileset) {
-        this._delegate.position = viewer.scene.clampToHeight(p, [
-          this._delegate
-        ])
+        this._delegate.position = viewer.scene.clampToHeight(
+          this._sampledPosition.getValue(now),
+          [this._delegate]
+        )
       } else {
-        this._delegate.position = p
+        this._delegate.position = this._sampledPosition.getValue(now)
       }
       let time = this._timeLine[this._positionIndex]
       if (time) {
@@ -184,7 +166,10 @@ class Track {
             let mat = Cesium.Matrix3.fromQuaternion(
               this._delegate.orientation.getValue(now)
             )
-            let mat4 = Cesium.Matrix4.fromRotationTranslation(mat, p)
+            let mat4 = Cesium.Matrix4.fromRotationTranslation(
+              mat,
+              this._sampledPosition.getValue(now)
+            )
             let hpr = Cesium.Transforms.fixedFrameToHeadingPitchRoll(mat4)
             position.heading = Cesium.Math.toDegrees(hpr.heading)
             position.pitch = Cesium.Math.toDegrees(hpr.pitch)
@@ -302,7 +287,6 @@ class Track {
       this._sampledPosition
     )
     this._endTime = this._timeLine[this._timeLine.length - 1]
-    this._pathPositions = []
   }
 
   /**
@@ -369,17 +353,7 @@ class Track {
     return this
   }
 
-  /**
-   *
-   * @param visible
-   * @param style
-   * @returns {Track}
-   */
-  setPath(visible, style = {}) {
-    this._path.show = !!visible
-    Util.merge(this._path.polyline, DEF_PATH_STYLE, style)
-    return this
-  }
+  setPath() {}
 }
 
 export default Track