huweili-cesium 1.2.62 → 1.2.64

package/js/customToolbarButtons.js

@@ -51,6 +51,10 @@ export function createCustomToolbarButtons() {
     button.className = `cesium-button cesium-toolbar-button ${options.className || ''}`
     button.title = options.title
 
+    if (options.isDefaultVisible) button.dataset.toolbarDefaultVisible = 'true'
+    if (options.isMoreToggle) button.dataset.toolbarMoreToggle = 'true'
+    if (options.isExpandToggle) button.dataset.toolbarExpandToggle = 'true'
+
     if (options.iconSrc) {
       const img = document.createElement('img')
       img.src = options.iconSrc
@@ -92,7 +96,11 @@ export function createCustomToolbarButtons() {
     toolbar.style.minWidth = 'unset'
     toolbar.style.flexWrap = 'nowrap'
     toolbar.style.position = 'absolute'
-    toolbar.style.setProperty('inset', 'initial', 'important')
+    toolbar.style.left = ''
+    toolbar.style.top = ''
+    toolbar.style.right = ''
+    toolbar.style.bottom = ''
+    toolbar.style.inset = 'initial'
 
     return buttons.map(opt => addToolbarButton(viewer, opt)).filter(Boolean)
   }

package/js/movePoint.js

@@ -288,14 +288,14 @@ export function movePointConfig(baseUrl) {
     })
 
     // ========== 终止当前所有飞行状态 ==========
-    // 终止旧飞行监听；飞行插值和轨迹更新都在同一个 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
@@ -307,61 +307,60 @@ export function movePointConfig(baseUrl) {
     // ========== 计算新的飞行路径 ==========
     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
+    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
 
-    // 按距离和速度计算本段飞行时长，由 SampledPositionProperty 自动插值位置。
-    const flightDuration = Math.sqrt(distanceSquared) / speed
-    const flightEndTime = Cesium.JulianDate.addSeconds(currentTime, flightDuration, new Cesium.JulianDate())
+    // 新坐标进来时不再按业务速度慢慢飞过去，而是用极短追踪时间快速贴到最新经纬度。
+    const fastArriveDuration = distanceSquared < MIN_DRONE_MOVE_DISTANCE_SQUARED ? 0 : 0.05
+    const flightEndTime = Cesium.JulianDate.addSeconds(currentTime, fastArriveDuration, modelEntity.scratchFlightEndTime)
 
     if (!map.clock.shouldAnimate) {
       map.clock.shouldAnimate = true
     }
 
-    // 不再为每个无人机改全局 clock.startTime/stopTime，避免多无人机互相抢时钟范围。
     modelEntity.positionProperty.addSample(flightEndTime, targetPosition)
     modelEntity.isFlying = true
+    modelEntity.currentPosition = Cesium.Cartesian3.clone(targetPosition, modelEntity.currentPosition)
 
     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
-        })
+      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 (!isFinished) return
+      if (!tickPosition) 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.currentPosition = Cesium.Cartesian3.clone(tickPosition, modelEntity.currentPosition)
+      moveDroneTrail({
+        pointId,
+        newPosition: modelEntity.currentPosition,
+        mapId
+      })
     }
 
     modelEntity.flightEndListener = flightTickListener

package/package.json

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