huweili-cesium 1.2.14 → 1.2.16

package/js/measureDistance.js

@@ -77,27 +77,6 @@ export function measureDistance() {
     }
   }
 
-  const createGroundPolylinePositions = (startPosition, endPosition, segmentCount = 32) => {
-    if (!startPosition || !endPosition) return []
-
-    const start = Cesium.Cartographic.fromCartesian(startPosition)
-    const end = Cesium.Cartographic.fromCartesian(endPosition)
-    const positions = []
-
-    for (let i = 0; i <= segmentCount; i += 1) {
-      const t = i / segmentCount
-      positions.push(
-        Cesium.Cartesian3.fromRadians(
-          Cesium.Math.lerp(start.longitude, end.longitude, t),
-          Cesium.Math.lerp(start.latitude, end.latitude, t),
-          0
-        )
-      )
-    }
-
-    return positions
-  }
-
   const getGroundDistance = (startPosition, endPosition) => {
     if (!startPosition || !endPosition) return 0
     return Cesium.Cartesian3.distance(startPosition, endPosition)
@@ -135,13 +114,6 @@ export function measureDistance() {
     const color = Cesium.Color.fromCssColorString(options.color || '#00ffff')
     const width = options.width ?? 3
     const clampToGround = options.clampToGround ?? true
-    const lineMaterial =
-      options.lineMaterial ||
-      new Cesium.PolylineGlowMaterialProperty({
-        color: Cesium.Color.fromAlpha(color, options.opacity ?? 0.95),
-        glowPower: options.glowPower ?? 0.12,
-        taperPower: options.taperPower ?? 0
-      })
 
     let startPosition = null
     let endPosition = null
@@ -151,8 +123,10 @@ export function measureDistance() {
     let endPointEntity = null
     let lineEntity = null
     let distanceLabelEntity = null
+    let deleteButtonEntity = null
     let tipEntity = null
     let handler = null
+    let deleteHandler = null
     let isFinished = false
 
     const tempIds = {
@@ -160,14 +134,15 @@ export function measureDistance() {
       endPoint: `${options.id}_measure_end_point`,
       line: `${options.id}_measure_line`,
       label: `${options.id}_measure_label`,
-      tip: `${options.id}_measure_tip`
+      tip: `${options.id}_measure_tip`,
+      deleteButton: `${options.id}_measure_delete_button`
     }
 
     const getLinePositions = () => {
       if (!startPosition) return []
       const targetPosition = endPosition || floatingPosition
       if (!targetPosition) return [startPosition]
-      return createGroundPolylinePositions(startPosition, targetPosition, options.segmentCount ?? 48)
+      return [startPosition, targetPosition]
     }
 
     const getCurrentDistance = () => getGroundDistance(startPosition, endPosition || floatingPosition)
@@ -231,11 +206,8 @@ export function measureDistance() {
           polyline: {
             positions: new Cesium.CallbackProperty(() => getLinePositions(), false),
             width,
-            material: lineMaterial,
-            clampToGround,
-            arcType: Cesium.ArcType.GEODESIC,
-            granularity: options.granularity ?? Cesium.Math.toRadians(0.2),
-            depthFailMaterial: options.depthFailMaterial || new Cesium.ColorMaterialProperty(Cesium.Color.fromAlpha(color, 0.7))
+            material: color,
+            clampToGround
           }
         })
       }
@@ -277,14 +249,36 @@ export function measureDistance() {
       })
     }
 
+    const createDeleteButtonEntity = () => {
+      if (deleteButtonEntity || !endPosition) return
+      deleteButtonEntity = map.entities.add({
+        id: tempIds.deleteButton,
+        position: endPosition,
+        label: {
+          text: '删除',
+          font: '12px Microsoft YaHei',
+          fillColor: Cesium.Color.WHITE,
+          showBackground: true,
+          backgroundColor: Cesium.Color.fromCssColorString('rgba(220, 53, 69, 0.95)'),
+          backgroundPadding: new Cesium.Cartesian2(10, 6),
+          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+          horizontalOrigin: Cesium.HorizontalOrigin.LEFT,
+          pixelOffset: new Cesium.Cartesian2(14, -28),
+          disableDepthTestDistance: Number.POSITIVE_INFINITY,
+          distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, Number.POSITIVE_INFINITY)
+        }
+      })
+    }
+
     const removeTemporaryEntities = () => {
-      ;[startPointEntity, endPointEntity, lineEntity, distanceLabelEntity, tipEntity].forEach((entity) => {
+      ;[startPointEntity, endPointEntity, lineEntity, distanceLabelEntity, deleteButtonEntity, tipEntity].forEach((entity) => {
         if (entity) map.entities.remove(entity)
       })
       startPointEntity = null
       endPointEntity = null
       lineEntity = null
       distanceLabelEntity = null
+      deleteButtonEntity = null
       tipEntity = null
     }
 
@@ -293,6 +287,16 @@ export function measureDistance() {
         handler.destroy()
         handler = null
       }
+      if (deleteHandler) {
+        deleteHandler.destroy()
+        deleteHandler = null
+      }
+    }
+
+    const destroyGraphic = () => {
+      destroyHandler()
+      removeTemporaryEntities()
+      mapStore.removeGraphicMap(options.id, options.mapId)
     }
 
     const cancel = () => {
@@ -311,6 +315,7 @@ export function measureDistance() {
         tipEntity = null
       }
       createEndPointEntity()
+      createDeleteButtonEntity()
       const result = buildResult()
       const graphic = {
         id: options.id,
@@ -318,6 +323,7 @@ export function measureDistance() {
         endPointEntity,
         lineEntity,
         labelEntity: distanceLabelEntity,
+        deleteButtonEntity,
         result,
         type: 'measureDistance'
       }
@@ -367,11 +373,20 @@ export function measureDistance() {
       cancel()
     }, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
 
+    deleteHandler = new Cesium.ScreenSpaceEventHandler(map.scene.canvas)
+    deleteHandler.setInputAction((movement) => {
+      const picked = map.scene.pick(movement.position)
+      if (!Cesium.defined(picked) || picked.id !== deleteButtonEntity) return
+      destroyGraphic()
+      if (typeof options.onDelete === 'function') options.onDelete(options.id)
+    }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
+
     return {
       id: options.id,
       finish: finalize,
       cancel,
       destroy: cancel,
+      delete: destroyGraphic,
       getStart: () => (startPosition ? cartesianToLngLatHeight(startPosition) : null),
       getEnd: () => (endPosition ? cartesianToLngLatHeight(endPosition) : null),
       getDistance: () => getGroundDistance(startPosition, endPosition || floatingPosition),

package/package.json

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