huweili-cesium 1.2.66 → 1.2.68

package/js/movePoint.js

@@ -21,6 +21,7 @@ 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实例
@@ -239,12 +240,6 @@ export function movePointConfig(baseUrl) {
       return modelEntity
     }
 
-    // 初始化复用对象，避免上百个无人机高频移动时反复创建临时对象
-    modelEntity.scratchPosition ||= new Cesium.Cartesian3()
-    modelEntity.scratchTargetPosition ||= new Cesium.Cartesian3()
-    modelEntity.scratchFlightEndTime ||= new Cesium.JulianDate()
-    modelEntity.scratchFarFutureTime ||= new Cesium.JulianDate()
-
     // 如果存在实体，确保实体属性实时同步
     const info = modelEntity.info || (modelEntity.info = {})
     info.pointId = pointId
@@ -259,112 +254,43 @@ 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
-    })
+    // 约定：收到一次无人机数据，就立刻把无人机定位到这个点，同时拖尾追加同一个点。
+    // 不再做平滑插值，避免无人机和轨迹之间出现滞后。
+    const targetPosition = Cesium.Cartesian3.fromDegrees(lng, lat, height)
 
-    // ========== 终止当前所有飞行状态 ==========
-    // 新坐标一到，立即打断旧的插值/续航逻辑，优先追最新点位。
+    // 终止旧飞行监听，避免历史插值逻辑继续影响当前定位。
     if (modelEntity.flightEndListener) {
       map.clock.onTick.removeEventListener(modelEntity.flightEndListener)
       modelEntity.flightEndListener = null
     }
 
     modelEntity.isFlying = false
-
-    // ========== 计算新的飞行路径 ==========
-    const targetPosition = Cesium.Cartesian3.fromDegrees(lng, lat, height)
-    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, startPosition, modelEntity.scratchTargetPosition),
-          new Cesium.Cartesian3()
-        )
-      : modelEntity.lastMoveDirection
-
-    if (moveDirection) {
-      modelEntity.lastMoveDirection = Cesium.Cartesian3.clone(moveDirection, modelEntity.lastMoveDirection || new Cesium.Cartesian3())
+    modelEntity.currentPosition = Cesium.Cartesian3.clone(targetPosition, modelEntity.currentPosition || new Cesium.Cartesian3())
+    modelEntity.info = modelEntity.info || {}
+    modelEntity.info.pointId = pointId
+    modelEntity.info.lng = lng
+    modelEntity.info.lat = lat
+    modelEntity.info.height = height
+    modelEntity.info.speed = speed
+    modelEntity.info.flyingHandName = options.flyingHandName || ''
+    modelEntity.info.flyingHandPhone = options.flyingHandPhone || ''
+    modelEntity.info.flyingHandPosition = options.flyingHandPosition || ''
+    modelEntity.info.frequencyBand = options.frequencyBand || ''
+    modelEntity.info.distance = options.distance || ''
+    modelEntity.info.receiveTime = options.receiveTime || ''
+
+    // 直接使用当前点覆盖实体位置，不再依赖 SampledPositionProperty 做插值。
+    if (modelEntity.entity) {
+      modelEntity.entity.position = targetPosition
     }
-    modelEntity.lastSpeed = cruiseSpeed
+    modelEntity.positionProperty = null
 
-    // 新坐标进来时不再按业务速度慢慢飞过去，而是用极短追踪时间快速贴到最新经纬度。
-    // 关键：无人机实体位置和拖尾必须使用同一个 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.isFlying = true
-
-    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
-
-      let tickPosition = targetPosition
-      const isArriving = fastArriveDuration > 0 && Cesium.JulianDate.compare(clock.currentTime, flightEndTime) < 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(
-          targetPosition,
-          Cesium.Cartesian3.multiplyByScalar(modelEntity.lastMoveDirection, extraDistance, modelEntity.scratchTargetPosition),
-          modelEntity.scratchPosition
-        )
-      }
-
-      if (!tickPosition) return
-
-      applyDronePosition(tickPosition)
-    }
-
-    modelEntity.flightEndListener = flightTickListener
-    map.clock.onTick.addEventListener(flightTickListener)
+    // 拖尾直接追加同一个点。
+    moveDroneTrail({
+      pointId,
+      newPosition: modelEntity.currentPosition,
+      mapId
+    })
 
     return modelEntity
   };

package/package.json

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