huweili-cesium 1.2.67 → 1.2.69

package/js/movePath.js

@@ -10,7 +10,6 @@
  */
 import * as Cesium from 'cesium'
 import { useMapStore } from './stores/mapStore.js'
-import { DroneConfig } from './config/index.js'
 
 const scratchCutoffTime = new Cesium.JulianDate()
 
@@ -48,20 +47,8 @@ export function movePathConfig() {
 
     const positions = trailData.positions
     const renderPositions = trailData.renderPositions || (trailData.renderPositions = positions.map(point => point.position).filter(Boolean))
-    const lastPoint = positions[positions.length - 1]
-    const lastPosition = lastPoint?.position
-    const minTrailDistanceSquared = trailData.minTrailDistanceSquared || (trailData.minTrailDistanceSquared = DroneConfig.minTrailDistance * DroneConfig.minTrailDistance)
 
-    // 降低轨迹追加频率：距离小于5米且距离上次追加不足300ms时，不追加新轨迹点。
-    if (lastPoint && lastPosition) {
-      const distanceSquared = Cesium.Cartesian3.distanceSquared(lastPosition, newPosition)
-      const elapsedSeconds = Cesium.JulianDate.secondsDifference(currentTime, lastPoint.timestamp)
-      if (distanceSquared < minTrailDistanceSquared || elapsedSeconds < DroneConfig.minTrailIntervalSeconds) {
-        return trailData
-      }
-    }
-
-    // 添加新的轨迹点，包含位置和时间戳
+    // 轨迹必须和无人机同频更新：收到一次位置就立刻追加一次，不做距离/时间节流。
     const clonedPosition = Cesium.Cartesian3.clone(newPosition)
     positions.push({ position: clonedPosition, timestamp: Cesium.JulianDate.clone(currentTime) })
     renderPositions.push(clonedPosition)

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,23 +254,38 @@ export function movePointConfig(baseUrl) {
     info.distance = options.distance || ''
     info.receiveTime = options.receiveTime || ''
 
-    // ========== 终止当前所有飞行状态 ==========
-    // 本方案不再做平滑插值和断流续航：来一个新经纬度，无人机和拖尾就同步落到该经纬度。
+    // 约定：收到一次无人机数据，就立刻把无人机定位到这个点，同时拖尾追加同一个点。
+    // 不再做平滑插值，避免无人机和轨迹之间出现滞后。
+    const targetPosition = Cesium.Cartesian3.fromDegrees(lng, lat, height)
+
+    // 终止旧飞行监听，避免历史插值逻辑继续影响当前定位。
     if (modelEntity.flightEndListener) {
       map.clock.onTick.removeEventListener(modelEntity.flightEndListener)
       modelEntity.flightEndListener = null
     }
 
     modelEntity.isFlying = false
-    modelEntity.positionProperty = null
-    modelEntity.lastMoveDirection = null
-    modelEntity.lastSpeed = 0
-
-    const targetPosition = Cesium.Cartesian3.fromDegrees(lng, lat, height, modelEntity.currentPosition || 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.positionProperty = null
 
-    // 无人机实体和拖尾使用同一个目标点同步更新，不保留任何预测点，避免拖尾领先或回头找无人机。
-    modelEntity.entity.position = modelEntity.currentPosition
+    // 拖尾直接追加同一个点。
     moveDroneTrail({
       pointId,
       newPosition: modelEntity.currentPosition,

package/package.json

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