huweili-cesium 1.2.64 → 1.2.66

package/js/movePoint.js

@@ -21,7 +21,6 @@ import { groundLinkConfig } from './groundLink'
 
 const MIN_DRONE_MOVE_DISTANCE = 0.1
 const MIN_DRONE_MOVE_DISTANCE_SQUARED = MIN_DRONE_MOVE_DISTANCE * MIN_DRONE_MOVE_DISTANCE
-const DEFAULT_FAR_FUTURE_SECONDS = 3600
 
 export function movePointConfig(baseUrl) {
   // 获取地图store实例
@@ -295,23 +294,16 @@ export function movePointConfig(baseUrl) {
     }
 
     modelEntity.isFlying = false
-    // 每次移动都重建采样属性，只保留“当前位置 -> 最新目标点”的快速追踪段。
-    modelEntity.positionProperty = new Cesium.SampledPositionProperty()
-    modelEntity.positionProperty.forwardExtrapolationType = Cesium.ExtrapolationType.HOLD
-    modelEntity.positionProperty.backwardExtrapolationType = Cesium.ExtrapolationType.HOLD
-    modelEntity.positionProperty.forwardExtrapolationDuration = Number.POSITIVE_INFINITY
-    modelEntity.positionProperty.backwardExtrapolationDuration = Number.POSITIVE_INFINITY
-    modelEntity.positionProperty.addSample(currentTime, currentRealPosition)
-    modelEntity.entity.position = modelEntity.positionProperty
 
     // ========== 计算新的飞行路径 ==========
     const targetPosition = Cesium.Cartesian3.fromDegrees(lng, lat, height)
-    const distanceSquared = Cesium.Cartesian3.distanceSquared(currentRealPosition, targetPosition)
-    const distance = Math.sqrt(distanceSquared)
+    const startPosition = Cesium.Cartesian3.clone(currentRealPosition, modelEntity.startPosition || new Cesium.Cartesian3())
+    modelEntity.startPosition = startPosition
+    const distanceSquared = Cesium.Cartesian3.distanceSquared(startPosition, targetPosition)
     const cruiseSpeed = Math.max(speed, 0)
     const moveDirection = distanceSquared >= MIN_DRONE_MOVE_DISTANCE_SQUARED
       ? Cesium.Cartesian3.normalize(
-          Cesium.Cartesian3.subtract(targetPosition, currentRealPosition, modelEntity.scratchTargetPosition),
+          Cesium.Cartesian3.subtract(targetPosition, startPosition, modelEntity.scratchTargetPosition),
           new Cesium.Cartesian3()
         )
       : modelEntity.lastMoveDirection
@@ -322,27 +314,41 @@ export function movePointConfig(baseUrl) {
     modelEntity.lastSpeed = cruiseSpeed
 
     // 新坐标进来时不再按业务速度慢慢飞过去，而是用极短追踪时间快速贴到最新经纬度。
+    // 关键：无人机实体位置和拖尾必须使用同一个 tickPosition 驱动，不能实体用 SampledPositionProperty、拖尾用预测位置各跑各的。
     const fastArriveDuration = distanceSquared < MIN_DRONE_MOVE_DISTANCE_SQUARED ? 0 : 0.05
+    const flightStartTime = Cesium.JulianDate.clone(currentTime, modelEntity.flightStartTime || new Cesium.JulianDate())
     const flightEndTime = Cesium.JulianDate.addSeconds(currentTime, fastArriveDuration, modelEntity.scratchFlightEndTime)
+    modelEntity.flightStartTime = flightStartTime
 
     if (!map.clock.shouldAnimate) {
       map.clock.shouldAnimate = true
     }
 
-    modelEntity.positionProperty.addSample(flightEndTime, targetPosition)
     modelEntity.isFlying = true
-    modelEntity.currentPosition = Cesium.Cartesian3.clone(targetPosition, modelEntity.currentPosition)
+
+    const applyDronePosition = (position) => {
+      modelEntity.currentPosition = Cesium.Cartesian3.clone(position, modelEntity.currentPosition || new Cesium.Cartesian3())
+      // 直接用每帧真实位置驱动无人机显示，确保无人机和拖尾完全同源，拖尾不会领先于无人机。
+      modelEntity.entity.position = modelEntity.currentPosition
+      moveDroneTrail({
+        pointId,
+        newPosition: modelEntity.currentPosition,
+        mapId
+      })
+    }
 
     const flightTickListener = (clock) => {
       if (!modelEntity.isFlying) return
 
-      const isArriving = Cesium.JulianDate.compare(clock.currentTime, flightEndTime) < 0
-      let tickPosition = isArriving
-        ? modelEntity.positionProperty.getValue(clock.currentTime, modelEntity.scratchPosition)
-        : targetPosition
+      let tickPosition = targetPosition
+      const isArriving = fastArriveDuration > 0 && Cesium.JulianDate.compare(clock.currentTime, flightEndTime) < 0
 
-      if (!isArriving && modelEntity.lastMoveDirection && modelEntity.lastSpeed > 0) {
-        // 下一秒坐标迟迟不来时，按上一次航向和速度继续向前慢速插值飞行。
+      if (isArriving) {
+        const elapsedSeconds = Math.max(0, Cesium.JulianDate.secondsDifference(clock.currentTime, flightStartTime))
+        const progress = Math.min(1, elapsedSeconds / fastArriveDuration)
+        tickPosition = Cesium.Cartesian3.lerp(startPosition, targetPosition, progress, modelEntity.scratchPosition)
+      } else if (modelEntity.lastMoveDirection && modelEntity.lastSpeed > 0) {
+        // 下一秒坐标迟迟不来时，无人机实体和拖尾一起按上一次航向、速度继续向前插值。
         const extraSeconds = Math.max(0, Cesium.JulianDate.secondsDifference(clock.currentTime, flightEndTime))
         const extraDistance = modelEntity.lastSpeed * extraSeconds
         tickPosition = Cesium.Cartesian3.add(
@@ -354,13 +360,7 @@ export function movePointConfig(baseUrl) {
 
       if (!tickPosition) return
 
-      // 每帧缓存真实位置，并同步追加轨迹点。
-      modelEntity.currentPosition = Cesium.Cartesian3.clone(tickPosition, modelEntity.currentPosition)
-      moveDroneTrail({
-        pointId,
-        newPosition: modelEntity.currentPosition,
-        mapId
-      })
+      applyDronePosition(tickPosition)
     }
 
     modelEntity.flightEndListener = flightTickListener

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "huweili-cesium",
-  "version": "1.2.64",
+  "version": "1.2.66",
   "description": "基于 Cesium 的地图工具库（无人机态势、轨迹、围栏、工具栏等）",
   "type": "module",
   "main": "./index.js",