huweili-cesium 1.2.82 → 1.2.83

package/js/movePoint.js

@@ -19,8 +19,6 @@ import { pointGetPool } from './cardPool'
 import { scheduleRefreshFlyHandQRCode } from './qrCodeGenerator'
 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) {
@@ -176,26 +174,54 @@ export function movePointConfig(baseUrl) {
   }
 
   /**
-   * 移动无人机点位到新的坐标位置
+   * 移动无人机点位到新的坐标位置（即时定位：收到新坐标立刻到位，无新数据则保持悬停）
    * @param options 配置选项
    * @param options.pointId 点位唯一标识
    * @param options.uavName 无人机名称
    * @param options.lng 新的经度
    * @param options.lat 新的纬度
    * @param options.height 高度
-   * @param options.speed 速度
+   * @param options.speed 速度（仅写入 info 展示，不参与位移）
    * @param options.flyingHandName 飞手姓名
    * @param options.flyingHandPhone 飞手电话
    * @param options.flyingHandPosition 飞手位置
    * @param options.frequencyBand 频段
    * @param options.distance 距离
-   * @param options.speed 速度
-   * @param options.height 高度
    * @param options.GROUND_LINK_LNG 地面固定点经度
    * @param options.GROUND_LINK_LAT 地面固定点纬度
    * @param options.status 无人机状态标识（0-绿色/默认, 1-红色, 2-灰色）
    * @param options.receiveTime 接收时间毫秒级时间戳）
-     */
+   */
+  const snapDronePosition = (modelEntity, map, position, currentTime) => {
+    if (modelEntity.flightEndListener) {
+      map.clock.onTick.removeEventListener(modelEntity.flightEndListener)
+      modelEntity.flightEndListener = null
+    }
+    modelEntity.isFlying = false
+
+    modelEntity.currentPosition = Cesium.Cartesian3.clone(
+      position,
+      modelEntity.currentPosition || new Cesium.Cartesian3()
+    )
+
+    const positionProperty = new Cesium.SampledPositionProperty()
+    positionProperty.forwardExtrapolationType = Cesium.ExtrapolationType.HOLD
+    positionProperty.backwardExtrapolationType = Cesium.ExtrapolationType.HOLD
+    positionProperty.forwardExtrapolationDuration = Number.POSITIVE_INFINITY
+    positionProperty.backwardExtrapolationDuration = Number.POSITIVE_INFINITY
+    positionProperty.addSample(currentTime, modelEntity.currentPosition)
+
+    const holdTime = Cesium.JulianDate.addSeconds(
+      currentTime,
+      DEFAULT_FAR_FUTURE_SECONDS,
+      new Cesium.JulianDate()
+    )
+    positionProperty.addSample(holdTime, modelEntity.currentPosition)
+
+    modelEntity.positionProperty = positionProperty
+    modelEntity.entity.position = positionProperty
+  }
+
   const moveDronePoint = (options) => {
     const { pointId, mapId, uavName } = options
     const map = mapStore.getMap(mapId)
@@ -204,7 +230,6 @@ export function movePointConfig(baseUrl) {
       return null
     }
 
-    // 先统一转换并校验经纬度，避免 Cesium 坐标计算出现 NaN。
     const lng = Number(options.lng)
     const lat = Number(options.lat)
     if (!Number.isFinite(lng) || !Number.isFinite(lat)) {
@@ -212,14 +237,13 @@ export function movePointConfig(baseUrl) {
       return false
     }
 
-    const speed = Number(options.speed) || 10
+    const speed = Number(options.speed)
     const height = Number(options.height) || 0
     const status = options.status || DroneStatus.WHITELIST
     const currentTime = map.clock.currentTime
 
     let modelEntity = mapStore.getGraphicMap(pointId, mapId)
     if (!modelEntity) {
-      // 首次收到该无人机点位时创建实体，后续更新才走插值飞行逻辑。
       modelEntity = setDronePointByGlb({
         id: pointId,
         uavName,
@@ -233,20 +257,11 @@ export function movePointConfig(baseUrl) {
         mapId
       })
       if (modelEntity) {
-        // 新建实体后立即绑定点击事件
         clickHandler.bindDroneClickHandler({ id: pointId, modelEntity, map, mapId })
       }
-      // 新创建的实体直接返回（首次创建无飞行状态）
       return modelEntity
     }
 
-    // 初始化复用对象，避免上百个无人机高频移动时反复创建临时对象
-    modelEntity.scratchPosition ||= new Cesium.Cartesian3()
-    modelEntity.scratchTargetPosition ||= new Cesium.Cartesian3()
-    modelEntity.scratchFlightEndTime ||= new Cesium.JulianDate()
-    modelEntity.scratchFarFutureTime ||= new Cesium.JulianDate()
-
-    // 如果存在实体，确保实体属性实时同步
     const groundLinkLng = Number(options.GROUND_LINK_LNG)
     const groundLinkLat = Number(options.GROUND_LINK_LAT)
 
@@ -255,7 +270,7 @@ export function movePointConfig(baseUrl) {
     info.lng = lng
     info.lat = lat
     info.height = height
-    info.speed = speed
+    info.speed = Number.isFinite(speed) ? speed : ''
     info.flyingHandName = options.flyingHandName || ''
     info.flyingHandPhone = options.flyingHandPhone || ''
     info.groundLinkLng = Number.isFinite(groundLinkLng) ? groundLinkLng.toFixed(4) : '--'
@@ -268,113 +283,15 @@ 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
-    // ========== 实时位置获取结束 ==========
+    const targetPosition = Cesium.Cartesian3.fromDegrees(lng, lat, height)
+    snapDronePosition(modelEntity, map, targetPosition, currentTime)
 
-    // ========== 保留轨迹 ==========
-    // 在飞行开始前，先记录当前点，保证轨迹不会从新目标点突兀开始。
     moveDroneTrail({
       pointId,
-      newPosition: currentRealPosition,
+      newPosition: modelEntity.currentPosition,
       mapId
     })
 
-    // ========== 终止当前所有飞行状态 ==========
-    // 终止旧飞行监听；飞行插值和轨迹更新都在同一个 onTick 中处理。
-    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)
-
-    // 距离过近则直接定位
-    if (distanceSquared < MIN_DRONE_MOVE_DISTANCE_SQUARED) {
-      modelEntity.currentPosition = Cesium.Cartesian3.clone(targetPosition, modelEntity.currentPosition)
-      modelEntity.positionProperty.addSample(currentTime, modelEntity.currentPosition)
-
-      moveDroneTrail({
-        pointId,
-        newPosition: modelEntity.currentPosition,
-        mapId
-      })
-      return modelEntity
-    }
-
-    // 按距离和速度计算本段飞行时长，由 SampledPositionProperty 自动插值位置。
-    const flightDuration = Math.sqrt(distanceSquared) / speed
-    const flightEndTime = Cesium.JulianDate.addSeconds(currentTime, flightDuration, new Cesium.JulianDate())
-
-    if (!map.clock.shouldAnimate) {
-      map.clock.shouldAnimate = true
-    }
-
-    // 不再为每个无人机改全局 clock.startTime/stopTime，避免多无人机互相抢时钟范围。
-    modelEntity.positionProperty.addSample(flightEndTime, targetPosition)
-    modelEntity.isFlying = true
-
-    const flightTickListener = (clock) => {
-      if (!modelEntity.isFlying) return
-
-      const isFinished = Cesium.JulianDate.compare(clock.currentTime, flightEndTime) >= 0
-      const tickPosition = isFinished
-        ? targetPosition
-        : modelEntity.positionProperty.getValue(clock.currentTime, modelEntity.scratchPosition)
-
-      if (tickPosition) {
-        // 每帧缓存插值后的真实位置，并同步追加轨迹点。
-        modelEntity.currentPosition = Cesium.Cartesian3.clone(tickPosition, modelEntity.currentPosition)
-        moveDroneTrail({
-          pointId,
-          newPosition: modelEntity.currentPosition,
-          mapId
-        })
-      }
-
-      if (!isFinished) return
-
-      modelEntity.currentPosition = Cesium.Cartesian3.clone(targetPosition, modelEntity.currentPosition)
-      modelEntity.isFlying = false
-
-      // 到达目标后追加远期采样点，让实体在终点保持不动。
-      const farFutureTime = Cesium.JulianDate.addSeconds(flightEndTime, DEFAULT_FAR_FUTURE_SECONDS, new Cesium.JulianDate())
-      modelEntity.positionProperty.addSample(farFutureTime, modelEntity.currentPosition)
-
-      clock.onTick.removeEventListener(flightTickListener)
-      modelEntity.flightEndListener = null
-    }
-
-    modelEntity.flightEndListener = flightTickListener
-    map.clock.onTick.addEventListener(flightTickListener)
-
     return modelEntity
   };
 

package/js/setPoint.js

@@ -261,20 +261,21 @@ export function setPoint(baseUrl) {
     positionProperty.forwardExtrapolationDuration = Number.POSITIVE_INFINITY
     positionProperty.backwardExtrapolationDuration = Number.POSITIVE_INFINITY
     positionProperty.addSample(currentTime, initialPosition)
+    const holdTime = Cesium.JulianDate.addSeconds(currentTime, 3600, new Cesium.JulianDate())
+    positionProperty.addSample(holdTime, initialPosition)
 
     // 模型实例（用于后续销毁/修改）
     const modelEntity = {
       receiveTime: receiveTime,
-      targetLng: lng, // 默认经度
-      targetLat: lat,  // 默认纬度
-      targetHeight: height,   // 默认高度
-      speed: 50,           // 默认速度
-      entity: null,        // Cesium实体
-      rippleEffect: null,  // 无人机图标扩散涟漪效果
-      positionProperty, // 位置属性
-      isFlying: false,     // 飞行状态
-      currentPosition: initialPosition, // 当前位置
-      trailEntityId: `${id}_trail`, // 轨迹实体ID，用于管理独立的轨迹
+      targetLng: lng,
+      targetLat: lat,
+      targetHeight: height,
+      speed: 50,
+      entity: null,
+      rippleEffect: null,
+      positionProperty,
+      currentPosition: initialPosition,
+      trailEntityId: `${id}_trail`,
       info: {}
     }
 

package/package.json

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