huweili-cesium 1.2.65 → 1.2.67

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实例
@@ -260,112 +259,28 @@ export function movePointConfig(baseUrl) {
     info.distance = options.distance || ''
     info.receiveTime = options.receiveTime || ''
 
-    // ========== 实时位置获取开始 ==========
-    const positionProperty = modelEntity.positionProperty || modelEntity.entity?.position
-    let currentRealPosition = positionProperty?.getValue?.(currentTime, modelEntity.scratchPosition)
-
-    if (!currentRealPosition && modelEntity.currentPosition) {
-      // 插值属性取不到值时，回退到上一次缓存的真实位置。
-      currentRealPosition = Cesium.Cartesian3.clone(modelEntity.currentPosition, modelEntity.scratchPosition)
-    }
-
-    if (!currentRealPosition) {
-      // 仍没有当前位置时，使用本次传入坐标作为起点。
-      currentRealPosition = Cesium.Cartesian3.fromDegrees(lng, lat, height, modelEntity.scratchPosition)
-    }
-
-    // getValue 复用 scratchPosition，后续 targetPosition 也会复用其它 scratch，先把当前位置固定到独立对象，避免被后续计算覆盖。
-    currentRealPosition = Cesium.Cartesian3.clone(currentRealPosition, modelEntity.currentPosition || new Cesium.Cartesian3())
-    modelEntity.currentPosition = currentRealPosition
-    // ========== 实时位置获取结束 ==========
-
-    // ========== 保留轨迹 ==========
-    // 在飞行开始前，先记录当前点，保证轨迹不会从新目标点突兀开始。
-    moveDroneTrail({
-      pointId,
-      newPosition: currentRealPosition,
-      mapId
-    })
-
     // ========== 终止当前所有飞行状态 ==========
-    // 新坐标一到，立即打断旧的插值/续航逻辑，优先追最新点位。
+    // 本方案不再做平滑插值和断流续航：来一个新经纬度，无人机和拖尾就同步落到该经纬度。
     if (modelEntity.flightEndListener) {
       map.clock.onTick.removeEventListener(modelEntity.flightEndListener)
       modelEntity.flightEndListener = null
     }
 
     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 cruiseSpeed = Math.max(speed, 0)
-    const moveDirection = distanceSquared >= MIN_DRONE_MOVE_DISTANCE_SQUARED
-      ? Cesium.Cartesian3.normalize(
-          Cesium.Cartesian3.subtract(targetPosition, currentRealPosition, modelEntity.scratchTargetPosition),
-          new Cesium.Cartesian3()
-        )
-      : modelEntity.lastMoveDirection
-
-    if (moveDirection) {
-      modelEntity.lastMoveDirection = Cesium.Cartesian3.clone(moveDirection, modelEntity.lastMoveDirection || new Cesium.Cartesian3())
-    }
-    modelEntity.lastSpeed = cruiseSpeed
+    modelEntity.positionProperty = null
+    modelEntity.lastMoveDirection = null
+    modelEntity.lastSpeed = 0
 
-    // 新坐标进来时不再按业务速度慢慢飞过去，而是用极短追踪时间快速贴到最新经纬度。
-    const fastArriveDuration = distanceSquared < MIN_DRONE_MOVE_DISTANCE_SQUARED ? 0 : 0.05
-    const flightEndTime = Cesium.JulianDate.addSeconds(currentTime, fastArriveDuration, modelEntity.scratchFlightEndTime)
+    const targetPosition = Cesium.Cartesian3.fromDegrees(lng, lat, height, modelEntity.currentPosition || new Cesium.Cartesian3())
+    modelEntity.currentPosition = Cesium.Cartesian3.clone(targetPosition, modelEntity.currentPosition || new Cesium.Cartesian3())
 
-    if (!map.clock.shouldAnimate) {
-      map.clock.shouldAnimate = true
-    }
-
-    modelEntity.positionProperty.addSample(flightEndTime, targetPosition)
-    modelEntity.isFlying = true
-    // 注意：这里不能提前把 currentPosition 写成 targetPosition。
-    // currentPosition 必须只缓存无人机每帧真实显示位置，否则下一次更新拖尾时会读到未来目标点，导致轨迹跑到无人机前面。
-
-    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
-
-      if (!isArriving && 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(
-          targetPosition,
-          Cesium.Cartesian3.multiplyByScalar(modelEntity.lastMoveDirection, extraDistance, modelEntity.scratchTargetPosition),
-          modelEntity.scratchPosition
-        )
-      }
-
-      if (!tickPosition) return
-
-      // 每帧缓存真实位置，并同步追加轨迹点。
-      modelEntity.currentPosition = Cesium.Cartesian3.clone(tickPosition, modelEntity.currentPosition)
-      moveDroneTrail({
-        pointId,
-        newPosition: modelEntity.currentPosition,
-        mapId
-      })
-    }
-
-    modelEntity.flightEndListener = flightTickListener
-    map.clock.onTick.addEventListener(flightTickListener)
+    // 无人机实体和拖尾使用同一个目标点同步更新，不保留任何预测点，避免拖尾领先或回头找无人机。
+    modelEntity.entity.position = modelEntity.currentPosition
+    moveDroneTrail({
+      pointId,
+      newPosition: modelEntity.currentPosition,
+      mapId
+    })
 
     return modelEntity
   };

package/package.json

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