From 97976393d44780ed65dc2141db801eea8199c585 Mon Sep 17 00:00:00 2001
From: cbwu <504-wuchengbo@htsdfp.com>
Date: Tue, 16 Apr 2024 18:51:29 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E7=BB=98=E5=88=B6=E8=88=AA?=
 =?UTF-8?q?=E7=BA=BF=E6=96=B0=E5=A2=9E=E5=9E=82=E7=9B=B4=E8=BE=85=E5=8A=A9?=
 =?UTF-8?q?=E7=BA=BF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/map/SceneViewer.vue       | 12 ++---
 src/types/entityoptions.ts               |  5 +-
 src/utils/map/draw/drawPolyline.ts       | 59 ++++++++++++++++++++----
 src/utils/map/geometry/pointEntity.ts    | 14 +++++-
 src/utils/map/geometry/polylineEntity.ts | 14 +++++-
 src/utils/map/sceneViewer.ts             |  4 +-
 6 files changed, 85 insertions(+), 23 deletions(-)

diff --git a/src/components/map/SceneViewer.vue b/src/components/map/SceneViewer.vue
index 57c5164..0124341 100644
--- a/src/components/map/SceneViewer.vue
+++ b/src/components/map/SceneViewer.vue
@@ -2,7 +2,7 @@
  * @Author: cbwu 504-wuchengbo@htsdfp.com
  * @Date: 2024-03-07 14:15:35
  * @LastEditors: cbwu
- * @LastEditTime: 2024-04-15 16:00:27
+ * @LastEditTime: 2024-04-16 10:01:28
  * @Description:
 -->
 <template>
@@ -67,12 +67,12 @@ onMounted(() => {
 
   // 挂载在window，供全局组件共享
   window.viewer = viewer
-  inputGeoJson(viewer)
+  // inputGeoJson(viewer)
   //绘制多边形
-  // const drawPolyline = new CreatePolyline(viewer)
-  // drawPolyline.start()
-  const drawPolygon = new DrawPolygon(viewer)
-  drawPolygon.start()
+  const drawPolyline = new CreatePolyline(viewer)
+  drawPolyline.start()
+  // const drawPolygon = new DrawPolygon(viewer)
+  // drawPolygon.start()
 })
 </script>
 
diff --git a/src/types/entityoptions.ts b/src/types/entityoptions.ts
index bde5d46..084a374 100644
--- a/src/types/entityoptions.ts
+++ b/src/types/entityoptions.ts
@@ -2,10 +2,10 @@
  * @Author: cbwu 504-wuchengbo@htsdfp.com
  * @Date: 2024-04-13 10:36:06
  * @LastEditors: cbwu
- * @LastEditTime: 2024-04-13 11:14:53
+ * @LastEditTime: 2024-04-16 13:47:55
  * @Description:
  */
-import { Color, Cartesian2 } from 'cesium'
+import { Color, Cartesian2, HeightReference } from 'cesium'
 export interface EntityOptions {
   id?: string
   name?: string
@@ -23,4 +23,5 @@ export interface EntityOptions {
   image?: string //图片url
   imageWidth?: number //图片宽
   imageHeight?: number //图片高
+  heightReference?: HeightReference
 }
diff --git a/src/utils/map/draw/drawPolyline.ts b/src/utils/map/draw/drawPolyline.ts
index c61d76f..de96eb1 100644
--- a/src/utils/map/draw/drawPolyline.ts
+++ b/src/utils/map/draw/drawPolyline.ts
@@ -2,7 +2,7 @@
  * @Author: cbwu 504-wuchengbo@htsdfp.com
  * @Date: 2024-03-27 08:43:44
  * @LastEditors: cbwu
- * @LastEditTime: 2024-04-13 10:46:58
+ * @LastEditTime: 2024-04-16 14:25:43
  * @Description: 绘制Polyline类
  */
 import {
@@ -14,8 +14,12 @@ import {
   Entity,
   CallbackProperty,
   PolylineDashMaterialProperty,
+  HeightReference,
 } from 'cesium'
-import { cartesian2ToCartesian3 } from '@/utils/map/coordinate'
+import {
+  cartesian2ToCartesian3,
+  cartesian3ToWGS84,
+} from '@/utils/map/coordinate'
 // import { PointEntity, PolylineEntity } from '@/utils/map/geometry'
 import { PolylineEntity } from '../geometry/polylineEntity'
 import { PointEntity } from '@/utils/map/geometry/pointEntity'
@@ -46,6 +50,8 @@ export default class CreatePolyline {
   bMove: boolean = false
   bLongClick: boolean = false
   clickTimeout: any
+  altitudeOffset: number = 20 //相对高度
+  vDashLinePosition: Cartesian3[][] = [] //垂直辅助线坐标数组
   // layer: CustomDataSource
   defaultStyle: EntityOptions = {
     // id: 'Polyline' + String(PolylineEntity.id),
@@ -102,11 +108,11 @@ export default class CreatePolyline {
         pickedObject.id.id ===
         this.polyline?.controlPointsID[this.positions.length - 1]
       ) {
+        console.log('********click the same point')
         return
-        // console.log('********click the same point')
       }
     }
-    const cartesian3 = cartesian2ToCartesian3(this.viewer, event.position)
+    let cartesian3 = cartesian2ToCartesian3(this.viewer, event.position)
     if (cartesian3 != undefined) {
       if (!this.polyline) {
         this.polyline = new PolylineEntity(this.positions)
@@ -114,8 +120,24 @@ export default class CreatePolyline {
         this.viewer.entities.add(this.dashLine)
         this.viewer.dataSources.add(this.polyline)
       }
+      const oldPosition = cartesian3
+      //计算高度偏移后的新坐标
+      cartesian3 = this.calculateAltitudeOffsetPosition(
+        cartesian3,
+        this.altitudeOffset,
+      )
       this.polyline.addPoint(cartesian3)
       this.trackingLinePositions[0] = cartesian3
+      //垂直辅助线
+      const n = this.positions.length - 1
+      const ptArr = [oldPosition, cartesian3]
+      this.vDashLinePosition[n] = ptArr
+      this.viewer.entities.add(
+        this.createTrackingLine(this.vDashLinePosition[n], Color.WHITE),
+      )
+      //添加地表控制点
+      const groundControlPoint = new PointEntity(this.vDashLinePosition[n][0])
+      this.viewer.entities.add(groundControlPoint)
       this.bMove = true
 
       this.viewer.scene.requestRender() //刷新
@@ -124,8 +146,13 @@ export default class CreatePolyline {
   // 移动回调事件
   private moveCallBack = (event: ScreenSpaceEventHandler.MotionEvent) => {
     if (this.bMove) {
-      const cartesian3 = cartesian2ToCartesian3(this.viewer, event.endPosition)
+      let cartesian3 = cartesian2ToCartesian3(this.viewer, event.endPosition)
       if (cartesian3 != undefined) {
+        //计算高度偏移后的新坐标
+        cartesian3 = this.calculateAltitudeOffsetPosition(
+          cartesian3,
+          this.altitudeOffset,
+        )
         //更新追踪线坐标
         this.trackingLinePositions[1] = cartesian3
         if (!this.trackingLine) {
@@ -159,6 +186,7 @@ export default class CreatePolyline {
     this.clearEvent()
     console.log('end:' + this.positions.length.toString())
     console.log(this.positions)
+    console.log(this.polyline.controlPointsID.length)
     //结束绘制进入编辑模式
     this.polyline.removeControlPoints()
     const editTool = new EditGeometry(this.viewer, this.polyline.geometry!)
@@ -178,8 +206,21 @@ export default class CreatePolyline {
     this.handler.removeInputAction(ScreenSpaceEventType.MOUSE_MOVE)
     this.handler.removeInputAction(ScreenSpaceEventType.LEFT_DOUBLE_CLICK)
   }
+  //计算高度偏移后的坐标
+  calculateAltitudeOffsetPosition(
+    oldPosition: Cartesian3,
+    altitudeOffset: number,
+  ): Cartesian3 {
+    const newGeoPosition = cartesian3ToWGS84(oldPosition)
+    newGeoPosition[2] = newGeoPosition[2] + altitudeOffset
+    return Cartesian3.fromDegrees(
+      newGeoPosition[0],
+      newGeoPosition[1],
+      newGeoPosition[2],
+    )
+  }
   //创建追踪线
-  createTrackingLine(positions: Cartesian3[]) {
+  createTrackingLine(positions: Cartesian3[], color: Color = Color.GREEN) {
     return new Entity({
       polyline: {
         positions: new CallbackProperty(() => {
@@ -187,10 +228,10 @@ export default class CreatePolyline {
         }, false),
         width: 2,
         material: new PolylineDashMaterialProperty({
-          color: Color.GREEN,
-          dashLength: 15, //短划线长度
+          color: color,
+          dashLength: 12, //短划线长度
         }),
-        clampToGround: true,
+        // clampToGround: true,
       },
     })
   }
diff --git a/src/utils/map/geometry/pointEntity.ts b/src/utils/map/geometry/pointEntity.ts
index 1bd5c47..c36a8be 100644
--- a/src/utils/map/geometry/pointEntity.ts
+++ b/src/utils/map/geometry/pointEntity.ts
@@ -2,10 +2,17 @@
  * @Author: cbwu 504-wuchengbo@htsdfp.com
  * @Date: 2024-03-28 16:35:33
  * @LastEditors: cbwu
- * @LastEditTime: 2024-04-13 11:15:48
+ * @LastEditTime: 2024-04-16 13:57:15
  * @Description: 封装的点几何类
  */
-import { Entity, Cartesian3, Color, PointGraphics, LabelGraphics } from 'cesium'
+import {
+  Entity,
+  Cartesian3,
+  Color,
+  PointGraphics,
+  LabelGraphics,
+  HeightReference,
+} from 'cesium'
 import { EntityOptions } from '@/types/entityoptions'
 // 点
 class PointEntity extends Entity {
@@ -19,6 +26,7 @@ class PointEntity extends Entity {
     color: Color.WHITE,
     outlineColor: Color.GREEN,
     outlineWidth: 0,
+    // heightReference: HeightReference.NONE,
   }
   constructor(position: Cartesian3, options?: EntityOptions) {
     super({
@@ -31,6 +39,8 @@ class PointEntity extends Entity {
       color: this.options.color,
       outlineColor: this.options.outlineColor,
       outlineWidth: this.options.outlineWidth,
+      disableDepthTestDistance: 50000,
+      // heightReference: this.options.heightReference,
     })
     // 标注对象
     this.label = new LabelGraphics({
diff --git a/src/utils/map/geometry/polylineEntity.ts b/src/utils/map/geometry/polylineEntity.ts
index 5a4aa26..d0d978d 100644
--- a/src/utils/map/geometry/polylineEntity.ts
+++ b/src/utils/map/geometry/polylineEntity.ts
@@ -2,10 +2,16 @@
  * @Author: cbwu 504-wuchengbo@htsdfp.com
  * @Date: 2024-03-28 16:49:02
  * @LastEditors: cbwu
- * @LastEditTime: 2024-04-13 10:45:17
+ * @LastEditTime: 2024-04-16 11:12:08
  * @Description: 封装的Polyline类
  */
-import { Entity, Cartesian3, Color, CallbackProperty } from 'cesium'
+import {
+  Entity,
+  Cartesian3,
+  Color,
+  CallbackProperty,
+  PolylineDashMaterialProperty,
+} from 'cesium'
 import { BaseGeometry } from './baseGeometry'
 import { EntityOptions } from '@/types/entityoptions'
 export class PolylineEntity extends BaseGeometry {
@@ -35,6 +41,10 @@ export class PolylineEntity extends BaseGeometry {
         show: this.options.show,
         width: this.options.width,
         material: this.options.color,
+        // depthFailMaterial: new PolylineDashMaterialProperty({
+        //   color: Color.GREEN,
+        //   dashLength: 15, //短划线长度
+        // }),
       },
     })
     this.entities.add(this.geometry)
diff --git a/src/utils/map/sceneViewer.ts b/src/utils/map/sceneViewer.ts
index de407d8..eded265 100644
--- a/src/utils/map/sceneViewer.ts
+++ b/src/utils/map/sceneViewer.ts
@@ -2,7 +2,7 @@
  * @Author: cbwu 504-wuchengbo@htsdfp.com
  * @Date: 2024-03-13 09:32:21
  * @LastEditors: cbwu
- * @LastEditTime: 2024-04-13 10:49:06
+ * @LastEditTime: 2024-04-16 10:58:25
  * @Description:
  */
 // Viewer初始化
@@ -53,7 +53,7 @@ function initViewer(container: string | Element): Viewer {
   const creditContainer = viewer.cesiumWidget.creditContainer as HTMLDivElement
   creditContainer.style.display = 'none'
   // 开启深度检测
-  viewer.scene.globe.depthTestAgainstTerrain = false
+  viewer.scene.globe.depthTestAgainstTerrain = true
   // 水雾特效
   viewer.scene.globe.showGroundAtmosphere = true
   // 设置更高的缩放惯性以使缩放操作更平滑

From fc4c74e21aa00fb89a551481f63ad44eeb073a5d Mon Sep 17 00:00:00 2001
From: cbwu <504-wuchengbo@htsdfp.com>
Date: Mon, 22 Apr 2024 11:41:48 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=98=E5=88=B6?=
 =?UTF-8?q?=E8=88=AA=E7=BA=BF=E5=8F=8C=E5=87=BB=E7=BB=93=E6=9D=9F=E5=88=A4?=
 =?UTF-8?q?=E5=AE=9A=E9=80=BB=E8=BE=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/map/draw/drawPolyline.ts     |  65 +++++++------
 src/utils/map/geometry/baseGeometry.ts |   8 +-
 src/utils/map/geometry/textLabel.ts    | 123 +++++++++++++++----------
 3 files changed, 116 insertions(+), 80 deletions(-)

diff --git a/src/utils/map/draw/drawPolyline.ts b/src/utils/map/draw/drawPolyline.ts
index 3ea84af..9482c4a 100644
--- a/src/utils/map/draw/drawPolyline.ts
+++ b/src/utils/map/draw/drawPolyline.ts
@@ -2,7 +2,7 @@
  * @Author: cbwu 504-wuchengbo@htsdfp.com
  * @Date: 2024-03-27 08:43:44
  * @LastEditors: cbwu
- * @LastEditTime: 2024-04-16 19:00:18
+ * @LastEditTime: 2024-04-22 11:23:47
  * @Description: 绘制Polyline类
  */
 import {
@@ -14,6 +14,7 @@ import {
   Entity,
   CallbackProperty,
   PolylineDashMaterialProperty,
+  Cartesian2,
   HeightReference,
 } from 'cesium'
 import {
@@ -27,17 +28,8 @@ import EditGeometry from '@/utils/map/draw/editGeometry'
 import { getDistance } from '@/utils/map/geocomputation.ts'
 import { Angle } from '@/utils/map/angle.ts'
 import { TextLabel } from '@/utils/map/geometry/textLabel.ts'
-type EntityOptions = {
-  id?: string
-  name?: string
-  show?: boolean
-  pixelSize?: number
-  color?: Color
-  fillColor?: Color
-  fill?: boolean
-  width?: number
-  outlineWidth?: number
-}
+import { EntityOptions } from '@/types/entityoptions.ts'
+
 export default class CreatePolyline {
   viewer: Viewer
   handler: ScreenSpaceEventHandler
@@ -57,6 +49,9 @@ export default class CreatePolyline {
   clickTimeout: any
   altitudeOffset: number = 20 //相对高度
   vDashLinePosition: Cartesian3[][] = [] //垂直辅助线坐标数组
+  // 存储第一次点击的信息
+  firstClickPosition: Cartesian2 | null = null
+  firstClickTime: number | null = null
   // layer: CustomDataSource
   defaultStyle: EntityOptions = {
     // id: 'Polyline' + String(PolylineEntity.id),
@@ -111,17 +106,9 @@ export default class CreatePolyline {
   private leftClickCallBack = (
     event: ScreenSpaceEventHandler.PositionedEvent,
   ) => {
-    const pickedObject = this.viewer.scene.pick(event.position)
-    if (pickedObject) {
-      //点击同一位置，返回
-      if (
-        pickedObject.id.id ===
-        this.polyline?.controlPointsID[this.positions.length - 1]
-      ) {
-        console.log('********click the same point')
-        return
-      }
-    }
+    //根据屏幕坐标判断是否为同一点
+    if (this.isSamplePosition(event.position.clone())) return
+
     let cartesian3 = cartesian2ToCartesian3(this.viewer, event.position)
     if (cartesian3 != undefined) {
       if (!this.polyline) {
@@ -152,24 +139,24 @@ export default class CreatePolyline {
       this.viewer.scene.requestRender() //刷新
       // 计算2点距离
       if (this.positions.length >= 2 && this.bMeasure) {
-        let distance = getDistance(
+        const distance = getDistance(
           this.positions[this.positions.length - 1],
           this.positions[this.positions.length - 2],
         )
         this.totalDistance += distance
         // 计算2点方位角
-        let azimuth = Angle.getAzimuth(
+        const azimuth = Angle.getAzimuth(
           this.positions[this.positions.length - 2],
           this.positions[this.positions.length - 1],
         )
         // 计算2点的中间点
-        let midPoint = Cartesian3.midpoint(
+        const midPoint = Cartesian3.midpoint(
           this.positions[this.positions.length - 1],
           this.positions[this.positions.length - 2],
           new Cartesian3(),
         )
         // 添加label
-        let labelText = `距离: ${distance.toFixed(2)}km, 方位角: ${azimuth}°`
+        const labelText = `距离: ${distance.toFixed(2)}km, 方位角: ${azimuth}°`
         new TextLabel(this.viewer, midPoint, labelText)
       }
     }
@@ -272,4 +259,28 @@ export default class CreatePolyline {
       },
     })
   }
+  //判断点击是否同一位置
+  isSamplePosition(clickPosition: Cartesian2) {
+    if (this.firstClickPosition) {
+      const dist = Cartesian2.distance(this.firstClickPosition, clickPosition)
+      if (dist <= 3) {
+        console.log('********click the same point0')
+        return true
+      }
+    }
+    this.firstClickPosition = clickPosition
+
+    // const pickedObject = this.viewer.scene.pick(clickPosition)
+    // if (pickedObject) {
+    //   //点击同一位置，返回
+    //   if (
+    //     pickedObject.id.id ===
+    //     this.polyline?.controlPointsID[this.positions.length - 1]
+    //   ) {
+    //     console.log('********click the same point')
+    //     return
+    //   }
+    // }
+    return false
+  }
 }
diff --git a/src/utils/map/geometry/baseGeometry.ts b/src/utils/map/geometry/baseGeometry.ts
index 2099c6c..2474505 100644
--- a/src/utils/map/geometry/baseGeometry.ts
+++ b/src/utils/map/geometry/baseGeometry.ts
@@ -2,7 +2,7 @@
  * @Author: cbwu 504-wuchengbo@htsdfp.com
  * @Date: 2024-03-28 16:22:58
  * @LastEditors: cbwu
- * @LastEditTime: 2024-04-13 10:45:37
+ * @LastEditTime: 2024-04-22 11:32:00
  * @Description: 几何类抽象基类
  */
 import {
@@ -41,7 +41,11 @@ export abstract class BaseGeometry extends CustomDataSource {
    * @param bAddControlPoint
    * @bAddControlPoint 是否添加控制点
    */
-  public addPoint(pos: Cartesian3, index: number = -1, bAddControlPoint: boolean = true,) {
+  public addPoint(
+    pos: Cartesian3,
+    index: number = -1,
+    bAddControlPoint: boolean = true,
+  ) {
     if (index === -1) {
       //插入尾部
       this.positions.push(pos)
diff --git a/src/utils/map/geometry/textLabel.ts b/src/utils/map/geometry/textLabel.ts
index 0fc91bb..ca467cb 100644
--- a/src/utils/map/geometry/textLabel.ts
+++ b/src/utils/map/geometry/textLabel.ts
@@ -1,4 +1,20 @@
-import {Cartesian3, Entity, Color, Viewer, Cartesian2, HorizontalOrigin, VerticalOrigin, HeightReference} from "cesium";
+/*
+ * @Author: cbwu 504-wuchengbo@htsdfp.com
+ * @Date: 2024-04-16 18:59:56
+ * @LastEditors: cbwu
+ * @LastEditTime: 2024-04-22 09:11:33
+ * @Description: 
+ */
+import {
+  Cartesian3,
+  Entity,
+  Color,
+  Viewer,
+  Cartesian2,
+  HorizontalOrigin,
+  VerticalOrigin,
+  HeightReference,
+} from 'cesium'
 
 /**
  文件描述：文本标注
@@ -6,59 +22,64 @@ import {Cartesian3, Entity, Color, Viewer, Cartesian2, HorizontalOrigin, Vertica
  创建人：Zhaipeixiu
  */
 export type textLabelOptions = {
- showBackground?: boolean,  //显示背景
- backgroundColor?: Color, //背景色
- backgroundPadding?: any,   //padding值
- fillColor: Color,
- horizontalOrigin?: any, //水平对齐方式
- verticalOrigin?: any,   //竖直对齐方式
- outlineColor?: any,
- outlineWidth?: any
+  showBackground?: boolean //显示背景
+  backgroundColor?: Color //背景色
+  backgroundPadding?: any //padding值
+  fillColor: Color
+  horizontalOrigin?: any //水平对齐方式
+  verticalOrigin?: any //竖直对齐方式
+  outlineColor?: any
+  outlineWidth?: any
 }
 
-export class TextLabel{
- _viewer: Viewer|undefined = undefined
- _defaultStyle: textLabelOptions = {
-  showBackground: true, //显示背景
-  backgroundColor: Color.BLACK, //背景色
-  backgroundPadding: new Cartesian2(10, 10), //padding值
-  fillColor: Color.WHITE,
-  outlineColor: Color.WHITESMOKE,
-  outlineWidth: 1.0,
-  horizontalOrigin: HorizontalOrigin.CENTER,//对齐方式
-  verticalOrigin: VerticalOrigin.CENTER,
- }
- _cesiumLabel: Entity|undefined = undefined
+export class TextLabel {
+  _viewer: Viewer | undefined = undefined
+  _defaultStyle: textLabelOptions = {
+    showBackground: true, //显示背景
+    backgroundColor: Color.BLACK, //背景色
+    backgroundPadding: new Cartesian2(10, 10), //padding值
+    fillColor: Color.WHITE,
+    outlineColor: Color.WHITESMOKE,
+    outlineWidth: 1.0,
+    horizontalOrigin: HorizontalOrigin.CENTER, //对齐方式
+    verticalOrigin: VerticalOrigin.CENTER,
+  }
+  _cesiumLabel: Entity | undefined = undefined
 
- // 构造函数，新建label并显示
- constructor(viewer: Viewer, position: Cartesian3, text: string, options?: textLabelOptions) {
-  this._viewer = viewer
-  this._defaultStyle = {...this._defaultStyle, ...options}
+  // 构造函数，新建label并显示
+  constructor(
+    viewer: Viewer,
+    position: Cartesian3,
+    text: string,
+    options?: textLabelOptions,
+  ) {
+    this._viewer = viewer
+    this._defaultStyle = { ...this._defaultStyle, ...options }
 
-  this._cesiumLabel = new Entity({
-   position: position,
-   name: 'default',
-   label: {
-    text: text,
-    scale: .6,
-    pixelOffset:  new Cartesian2(20, -20),
-    showBackground: this._defaultStyle.showBackground, //显示背景
-    backgroundColor: this._defaultStyle.backgroundColor, //背景色
-    backgroundPadding: this._defaultStyle.backgroundPadding, //padding值
-    fillColor: this._defaultStyle.fillColor,
-    outlineColor: this._defaultStyle.outlineColor,
-    outlineWidth: this._defaultStyle.outlineWidth,
-    horizontalOrigin: this._defaultStyle.horizontalOrigin, //对齐方式
-    verticalOrigin: this._defaultStyle.verticalOrigin,
-    heightReference: HeightReference.CLAMP_TO_GROUND
-   }
-  })
-  this._viewer.entities.add(this._cesiumLabel)
- }
+    this._cesiumLabel = new Entity({
+      position: position,
+      name: 'default',
+      label: {
+        text: text,
+        scale: 0.6,
+        pixelOffset: new Cartesian2(20, -20),
+        showBackground: this._defaultStyle.showBackground, //显示背景
+        backgroundColor: this._defaultStyle.backgroundColor, //背景色
+        backgroundPadding: this._defaultStyle.backgroundPadding, //padding值
+        fillColor: this._defaultStyle.fillColor,
+        outlineColor: this._defaultStyle.outlineColor,
+        outlineWidth: this._defaultStyle.outlineWidth,
+        horizontalOrigin: this._defaultStyle.horizontalOrigin, //对齐方式
+        verticalOrigin: this._defaultStyle.verticalOrigin,
+        heightReference: HeightReference.CLAMP_TO_GROUND,
+      },
+    })
+    this._viewer.entities.add(this._cesiumLabel)
+  }
 
- //移除label
- public remove(){
-  if(this._cesiumLabel !== undefined && this._viewer!==null)
-   this._viewer.entities.remove(this._cesiumLabel)
- }
+  //移除label
+  public remove() {
+    if (this._cesiumLabel !== undefined && this._viewer !== null)
+      this._viewer.entities.remove(this._cesiumLabel)
+  }
 }

From 1ae19f2896178869dd78478e13a0463553103d52 Mon Sep 17 00:00:00 2001
From: cbwu <504-wuchengbo@htsdfp.com>
Date: Mon, 22 Apr 2024 17:22:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E5=9C=B0=E8=A1=A8=E8=BE=85?=
 =?UTF-8?q?=E5=8A=A9=E7=BA=BF(=E5=BE=85=E5=AE=8C=E5=96=84)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/map/draw/drawPolyline.ts    |  2 +-
 src/utils/map/draw/editGeometry.ts    | 89 +++++++++++++++++++++++----
 src/utils/map/geometry/pointEntity.ts |  1 +
 3 files changed, 79 insertions(+), 13 deletions(-)

diff --git a/src/utils/map/draw/drawPolyline.ts b/src/utils/map/draw/drawPolyline.ts
index 9482c4a..f8903df 100644
--- a/src/utils/map/draw/drawPolyline.ts
+++ b/src/utils/map/draw/drawPolyline.ts
@@ -2,7 +2,7 @@
  * @Author: cbwu 504-wuchengbo@htsdfp.com
  * @Date: 2024-03-27 08:43:44
  * @LastEditors: cbwu
- * @LastEditTime: 2024-04-22 11:23:47
+ * @LastEditTime: 2024-04-22 16:19:27
  * @Description: 绘制Polyline类
  */
 import {
diff --git a/src/utils/map/draw/editGeometry.ts b/src/utils/map/draw/editGeometry.ts
index 06cfb0b..2f8729c 100644
--- a/src/utils/map/draw/editGeometry.ts
+++ b/src/utils/map/draw/editGeometry.ts
@@ -2,7 +2,7 @@
  * @Author: cbwu 504-wuchengbo@htsdfp.com
  * @Date: 2024-03-27 11:06:45
  * @LastEditors: cbwu
- * @LastEditTime: 2024-04-13 10:47:09
+ * @LastEditTime: 2024-04-22 16:49:15
  * @Description: 编辑几何体类。操作逻辑
  */
 import {
@@ -16,6 +16,10 @@ import {
   Entity,
   ConstantPositionProperty,
   defined,
+  CallbackProperty,
+  PolylineDashMaterialProperty,
+  Color,
+  Cartographic,
 } from 'cesium'
 import { cartesian2ToCartesian3 } from '@/utils/map/coordinate'
 import { getClosestPoint, isOnLineSegment } from '@/utils/map/geocomputation'
@@ -26,8 +30,12 @@ export default class EditGeometry {
   geometry: Entity //要编辑的几何对象
   oldPositions: Cartesian3[] = [] //存储未修改前的坐标
   positions: Cartesian3[] = [] //要编辑的几个对象坐标
-  controlPointsID: string[] = []
-  controlPoint: PointEntity | null = null
+  controlPointsID: string[] = [] //节点控制点ID数组
+  groundPointsID: string[] = [] //地表控制点ID数组
+  groundDashLineID: string[] = [] //垂直辅助线ID数组
+  groundDashLinesPosition: Cartesian3[][] = [] //垂直辅助线坐标数组
+  heightPoint: PointEntity | null = null //高度控制点
+  groundPoint: PointEntity | null = null //地表控制点
   clickedGeometry: Entity | null = null
   clickDownPosition: Cartesian3 | null = null
   moveSelectedPoint: PointEntity | null = null
@@ -46,6 +54,13 @@ export default class EditGeometry {
     // 创建控制点
     this.positions.forEach((value, index) => {
       this.createPoint(value, index)
+      //地表点
+      const groundPosition = this.calculateGroundPosition(value)
+      this.createGroundPoint(value, index)
+      //垂直辅助线
+      const ptArr = [value, groundPosition]
+      this.groundDashLinesPosition[index] = ptArr
+      this.createGroundDashLine(this.groundDashLinesPosition[index], index)
     })
   }
   public start() {
@@ -86,7 +101,7 @@ export default class EditGeometry {
   ) => {
     // 清除可能已经设置的单击定时器
     clearTimeout(this.clickTimeout)
-    // 判断是不是长按
+    // 判断是不是长按(100ms)
     this.clickTimeout = setTimeout(() => {
       this.bLongClick = true
     }, 100)
@@ -111,8 +126,14 @@ export default class EditGeometry {
       // 点中控制点
       if (pickedObject.id.point instanceof PointGraphics) {
         console.log('You clicked a point entity.')
-        this.controlPoint = pickedObject.id
-        console.log(this.controlPoint?.subId)
+        if (pickedObject.id.point.type === 0) {
+          console.log('You clicked a HeightPoint entity.')
+          this.heightPoint = pickedObject.id
+        } else if (pickedObject.id.point.type === 1) {
+          console.log('You clicked a GroundPoint entity.')
+          this.groundPoint = pickedObject.id
+        }
+        // console.log(this.heightPoint?.subId)
         this.bDrag = true
         this.forbidDrawWorld(true)
       }
@@ -134,7 +155,7 @@ export default class EditGeometry {
         ) {
           this.moveSelectedPoint = pickedObject.id
           this.moveSelectedPoint!.point!.pixelSize = new ConstantProperty(
-            this.moveSelectedPoint!.options.pixelSize! + 2,
+            this.moveSelectedPoint!.options.pixelSize! + 1,
           )
           // console.log(this.moveSelectedPoint)
         }
@@ -144,19 +165,19 @@ export default class EditGeometry {
       // 离开控制点恢复原始大小
       if (this.moveSelectedPoint) {
         this.moveSelectedPoint!.point!.pixelSize = new ConstantProperty(
-          this.moveSelectedPoint!.options.pixelSize! - 2,
+          this.moveSelectedPoint!.options.pixelSize! - 1,
         )
         this.moveSelectedPoint = null
         this.viewer.scene.requestRender() //刷新
       }
     }
 
-    if (!this.controlPoint || !this.bDrag) return
+    if (!this.heightPoint || !this.bDrag) return
     console.log('************************left down')
     const cartesian3 = cartesian2ToCartesian3(this.viewer, event.endPosition)
     if (cartesian3) {
       // 修改节点坐标
-      this.modifyPoint(cartesian3, this.controlPoint.subId)
+      this.modifyPoint(cartesian3, this.heightPoint.subId)
       // this.geometry?.modifyPoint(cartesian3, this.controlPoint.subId)
       this.viewer.scene.requestRender() //刷新
     }
@@ -230,10 +251,10 @@ export default class EditGeometry {
     // 修改线坐标
     this.positions.splice(index, 1, pos)
     // 修改控制点坐标
-    this.controlPoint!.position = new ConstantPositionProperty(pos)
+    this.heightPoint!.position = new ConstantPositionProperty(pos)
   }
   /**
-   * 新加一个点
+   * 新加一个节点
    * @param pos 点的坐标
    * @param index 插入的位置,0起步
    */
@@ -246,4 +267,48 @@ export default class EditGeometry {
     this.controlPointsID.splice(index, 0, point.id)
     // }
   }
+  /**
+   * 新加一个地表控制点
+   * @param pos 点的坐标
+   * @param index 插入的位置,0起步
+   */
+  createGroundPoint(pos: Cartesian3, index: number) {
+    const point = new PointEntity(pos)
+    point.parent = this.geometry
+    point.subId = index
+    point.type = 1
+    this.geometry.entityCollection.add(point)
+    this.groundPointsID.splice(index, 0, point.id)
+  }
+  /**
+   * 新加一个垂直地表的辅助线
+   * @param pos 直线的坐标
+   * @param index 插入的位置,0起步
+   */
+  createGroundDashLine(positions: Cartesian3[], index: number) {
+    const vDashLine = new Entity({
+      polyline: {
+        positions: new CallbackProperty(() => {
+          return positions
+        }, false),
+        width: 2,
+        material: new PolylineDashMaterialProperty({
+          color: Color.WHITE,
+          dashLength: 12, //短划线长度
+        }),
+      },
+    })
+    this.groundDashLineID.splice(index, 0, vDashLine.id)
+    this.geometry.entityCollection.add(vDashLine)
+  }
+  //获取地表坐标
+  calculateGroundPosition(pos: Cartesian3) {
+    // 输入的当前点的笛卡尔坐标
+    const cartographic = Cartographic.fromCartesian(pos)
+    // 经度、纬度不变，将地面高度加上需要上升的距离, 假设垂直升高1000米
+    cartographic.height -= cartographic.height
+
+    // 最后使用Cesium.Cartographic.toCartesian将刚才得到的Cartographic对象转换为笛卡尔坐标
+    return Cartographic.toCartesian(cartographic)
+  }
 }
diff --git a/src/utils/map/geometry/pointEntity.ts b/src/utils/map/geometry/pointEntity.ts
index c36a8be..a3988fe 100644
--- a/src/utils/map/geometry/pointEntity.ts
+++ b/src/utils/map/geometry/pointEntity.ts
@@ -18,6 +18,7 @@ import { EntityOptions } from '@/types/entityoptions'
 class PointEntity extends Entity {
   static ID: number = 0
   public subId: number = 0 //用于作为其他几何体的控制点时标记节点号
+  public type: number = 0 //用于判断是线上节点(0)还是地表控制点(1)
   options: EntityOptions = {
     id: 'Point' + String(PointEntity.ID),
     name: 'Point' + String(PointEntity.ID + 1),