huweili-cesium 1.2.93 → 1.2.94

package/js/measureBearing.js

@@ -1,5 +1,5 @@
 /**
- * 地图测向：以 RTK/起点为原点，点击目标点绘制方位线并显示方位角（北向 0°，顺时针）
+ * 地图测向：点击起点与终点，测量第二点相对于第一点的北向角（北向 0°，顺时针）
  *
  * @author huweili
  * @email czxyhuweili@163.com
@@ -13,12 +13,6 @@ function formatBearingDegrees(deg) {
   return `${(((deg % 360) + 360) % 360).toFixed(1)}°`
 }
 
-function formatDistanceMeters(meters) {
-  if (!Number.isFinite(meters)) return ''
-  if (meters >= 1000) return `${(meters / 1000).toFixed(2)} km`
-  return `${meters.toFixed(0)} m`
-}
-
 function getGroundCartesianFromScreen(map, screenPosition) {
   if (!screenPosition) return null
 
@@ -68,18 +62,7 @@ function computeBearingResult(start, end) {
     azimuth,
     azimuthText: formatBearingDegrees(azimuth),
     distance: dist,
-    distanceText: formatDistanceMeters(dist),
-  }
-}
-
-function resolveRtkOrigin(mapStore, mapId) {
-  const rtk = mapStore.getRtkData(mapId) || {}
-  const lng = Number(rtk.longitude)
-  const lat = Number(rtk.latitude)
-  if (!Number.isFinite(lng) || !Number.isFinite(lat) || (lng === 0 && lat === 0)) {
-    return null
   }
-  return { lng, lat }
 }
 
 export function measureBearing() {
@@ -91,15 +74,19 @@ export function measureBearing() {
       position: new Cesium.CallbackProperty(() => options.getPosition(), false),
       label: {
         text: new Cesium.CallbackProperty(() => options.getText(), false),
-        font: options.font || '10px Microsoft YaHei',
+        font: options.font || 'bold 10px Microsoft YaHei',
         fillColor: options.fillColor || Cesium.Color.WHITE,
+        style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+        outlineColor: Cesium.Color.BLACK,
+        outlineWidth: 2,
         showBackground: true,
         backgroundColor: Cesium.Color.fromCssColorString(options.backgroundColor || 'rgba(0, 0, 0, 0.7)'),
         backgroundPadding: options.backgroundPadding || new Cesium.Cartesian2(4, 4),
         verticalOrigin: options.verticalOrigin || Cesium.VerticalOrigin.BOTTOM,
         horizontalOrigin: options.horizontalOrigin || Cesium.HorizontalOrigin.LEFT,
-        pixelOffset: options.pixelOffset || new Cesium.Cartesian2(16, -16),
+        pixelOffset: options.pixelOffset || new Cesium.Cartesian2(18, -18),
         disableDepthTestDistance: Number.POSITIVE_INFINITY,
+        distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, options.maxDistance || 2000000),
       },
     })
   }
@@ -128,7 +115,6 @@ export function measureBearing() {
     }
 
     const color = Cesium.Color.fromCssColorString(options.color || '#ffd400')
-    const rtkOrigin = resolveRtkOrigin(mapStore, options.mapId)
 
     let startPosition = null
     let endPosition = null
@@ -143,7 +129,6 @@ export function measureBearing() {
     let handler = null
     let deleteHandler = null
     let isFinished = false
-    let useRtkOrigin = false
 
     const tempIds = {
       startPoint: `${options.id}_bearing_start`,
@@ -173,22 +158,18 @@ export function measureBearing() {
       )
     }
 
-    const getMeasureText = () => {
+    const getCurrentBearingText = () => {
       const target = endPosition || floatingPosition
-      if (!startPosition || !target) return ''
+      if (!startPosition || !target) return '--'
       const start = cartesianToLngLat(startPosition)
       const end = cartesianToLngLat(target)
-      const { azimuthText, distanceText } = computeBearingResult(start, end)
-      return `${azimuthText}\n${distanceText}`
+      return computeBearingResult(start, end).azimuthText
     }
 
     const getTipText = () => {
-      if (!startPosition) return '点击确定测向起点'
-      if (!endPosition) {
-        const preview = getMeasureText()
-        return preview ? `点击确定目标点，当前：${preview.replace('\n', ' / ')}` : '点击确定目标点'
-      }
-      return `测向完成：${getMeasureText().replace('\n', ' / ')}`
+      if (!startPosition) return '点击确定起点'
+      if (!endPosition) return `点击确定终点，当前北向角：${getCurrentBearingText()}`
+      return `测向完成，北向角：${getCurrentBearingText()}`
     }
 
     const ensurePreviewEntities = () => {
@@ -197,12 +178,13 @@ export function measureBearing() {
           id: tempIds.startPoint,
           position: startPosition,
           point: {
-            pixelSize: 7,
+            pixelSize: 6,
             color,
             outlineColor: Cesium.Color.WHITE,
             outlineWidth: 1.5,
             disableDepthTestDistance: Number.POSITIVE_INFINITY,
             heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+            scaleByDistance: new Cesium.NearFarScalar(1000, 1.5, 5000000, 0.5),
           },
         })
       }
@@ -224,24 +206,42 @@ export function measureBearing() {
           id: tempIds.label,
           position: new Cesium.CallbackProperty(() => getMidPosition(), false),
           label: {
-            text: new Cesium.CallbackProperty(() => getMeasureText(), false),
-            font: 'bold 11px Microsoft YaHei',
+            text: new Cesium.CallbackProperty(() => `北向角 ${getCurrentBearingText()}`, false),
+            font: 'bold 10px Microsoft YaHei',
             fillColor: Cesium.Color.WHITE,
             style: Cesium.LabelStyle.FILL_AND_OUTLINE,
             outlineColor: Cesium.Color.BLACK,
             outlineWidth: 2,
             showBackground: true,
             backgroundColor: Cesium.Color.fromCssColorString('rgba(0, 0, 0, 0.75)'),
-            backgroundPadding: new Cesium.Cartesian2(6, 4),
+            backgroundPadding: new Cesium.Cartesian2(4, 4),
             verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
             horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
-            pixelOffset: new Cesium.Cartesian2(0, -14),
+            pixelOffset: new Cesium.Cartesian2(0, -16),
             disableDepthTestDistance: Number.POSITIVE_INFINITY,
+            distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 2000000),
           },
         })
       }
     }
 
+    const createEndPointEntity = () => {
+      if (endPointEntity || !endPosition) return
+      endPointEntity = map.entities.add({
+        id: tempIds.endPoint,
+        position: endPosition,
+        point: {
+          pixelSize: 6,
+          color,
+          outlineColor: Cesium.Color.WHITE,
+          outlineWidth: 1.5,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY,
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+          scaleByDistance: new Cesium.NearFarScalar(1000, 1.5, 5000000, 0.5),
+        },
+      })
+    }
+
     const removeEntities = () => {
       [startPointEntity, endPointEntity, lineEntity, labelEntity, deleteButtonEntity, tipEntity].forEach((entity) => {
         if (entity) map.entities.remove(entity)
@@ -267,6 +267,15 @@ export function measureBearing() {
       mapStore.removeGraphicMap(options.id, options.mapId)
     }
 
+    const cancel = () => {
+      if (isFinished) return
+      if (handler) {
+        handler.destroy()
+        handler = null
+      }
+      removeEntities()
+    }
+
     const finalize = () => {
       if (isFinished || !startPosition || !endPosition) return null
       isFinished = true
@@ -279,18 +288,7 @@ export function measureBearing() {
         tipEntity = null
       }
 
-      endPointEntity = map.entities.add({
-        id: tempIds.endPoint,
-        position: endPosition,
-        point: {
-          pixelSize: 7,
-          color,
-          outlineColor: Cesium.Color.WHITE,
-          outlineWidth: 1.5,
-          disableDepthTestDistance: Number.POSITIVE_INFINITY,
-          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-        },
-      })
+      createEndPointEntity()
 
       deleteButtonEntity = map.entities.add({
         id: tempIds.deleteButton,
@@ -319,7 +317,7 @@ export function measureBearing() {
 
       const start = cartesianToLngLat(startPosition)
       const end = cartesianToLngLat(endPosition)
-      const result = { id: options.id, start, end, useRtkOrigin, ...computeBearingResult(start, end) }
+      const result = { id: options.id, start, end, ...computeBearingResult(start, end) }
 
       mapStore.setGraphicMap(options.id, {
         id: options.id,
@@ -332,13 +330,6 @@ export function measureBearing() {
       return result
     }
 
-    if (rtkOrigin) {
-      startPosition = Cesium.Cartesian3.fromDegrees(rtkOrigin.lng, rtkOrigin.lat, 0)
-      floatingPosition = startPosition
-      useRtkOrigin = true
-      ensurePreviewEntities()
-    }
-
     tipEntity = createMouseTipEntity(map, {
       id: tempIds.tip,
       getPosition: () => cursorPosition || endPosition || floatingPosition || startPosition,
@@ -363,25 +354,26 @@ export function measureBearing() {
       if (!startPosition) {
         startPosition = cartesian
         floatingPosition = cartesian
+        cursorPosition = cartesian
         ensurePreviewEntities()
         return
       }
 
       endPosition = cartesian
       floatingPosition = null
+      createEndPointEntity()
       finalize()
     }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
 
     handler.setInputAction(() => {
-      if (!isFinished) destroyGraphic()
+      cancel()
     }, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
 
-    return { id: options.id, finish: finalize, cancel: destroyGraphic }
+    return { id: options.id, finish: finalize, cancel, destroy: destroyGraphic }
   }
 
   return {
     startBearingMeasure,
     formatBearingDegrees,
-    formatDistanceMeters,
   }
 }

package/package.json

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