From cf982e09916174dc90d5f6d51c8d9e8e1c2abebe Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 02 Feb 2026 11:34:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/utils/cesium/shapeTools/draw/DrawBufferCircleTool.js | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawBufferCircleTool.js b/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawBufferCircleTool.js
index 71e04c8..c1f606f 100644
--- a/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawBufferCircleTool.js
+++ b/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawBufferCircleTool.js
@@ -1,7 +1,12 @@
import * as Cesium from 'cesium'
import { MapTooltip } from '@ztzf/utils'
import { ToolBase } from '../ToolBase'
-import { buildEllipsePositions } from '../shapeUtils'
+import {
+ buildEllipsePositions,
+ formatBufferRadius,
+ getBufferRadiusLabelStyle,
+ getBufferRadiusPoint,
+} from '../shapeUtils'
export class DrawBufferCircleTool extends ToolBase {
constructor(viewer) {
@@ -21,6 +26,9 @@
this.radiusPoint1 = null
this.radiusPoint2 = null
this.radiusPoint3 = null
+ this.radiusLevel1LabelEntity = null
+ this.radiusLevel2LabelEntity = null
+ this.radiusLevel3LabelEntity = null
this.isDrawing = false
this.drawStep = 0
this.isCompleted = false
@@ -193,6 +201,10 @@
material: Cesium.Color.fromBytes(0, 251, 255, 255),
},
})
+
+ this.radiusLevel1LabelEntity = this.createRadiusLabelEntity(() => this.radiusLevel1)
+ this.radiusLevel2LabelEntity = this.createRadiusLabelEntity(() => this.radiusLevel2)
+ this.radiusLevel3LabelEntity = this.createRadiusLabelEntity(() => this.radiusLevel3)
}
clearPreviewEntities() {
@@ -204,6 +216,9 @@
this.circleLevel1OutlineEntity = null
this.circleLevel2OutlineEntity = null
this.circleLevel3OutlineEntity = null
+ this.radiusLevel1LabelEntity = null
+ this.radiusLevel2LabelEntity = null
+ this.radiusLevel3LabelEntity = null
}
getSurfaceDistance(startCartesian, endCartesian) {
@@ -218,6 +233,23 @@
const cartesian = scene.pickPosition(screenPosition)
if (cartesian) return cartesian
return scene.camera.pickEllipsoid(screenPosition, scene.globe.ellipsoid)
+ }
+
+ getRadiusPoint(radius) {
+ return getBufferRadiusPoint(this.centerCartesian, radius)
+ }
+
+ createRadiusLabelEntity(getRadius) {
+ return this.dataSource.entities.add({
+ position: new Cesium.CallbackProperty(
+ () => getBufferRadiusPoint(this.centerCartesian, getRadius()),
+ false
+ ),
+ label: {
+ ...getBufferRadiusLabelStyle(),
+ text: new Cesium.CallbackProperty(() => formatBufferRadius(getRadius()), false),
+ },
+ })
}
destroy() {
@@ -241,6 +273,9 @@
this.radiusPoint1 = null
this.radiusPoint2 = null
this.radiusPoint3 = null
+ this.radiusLevel1LabelEntity = null
+ this.radiusLevel2LabelEntity = null
+ this.radiusLevel3LabelEntity = null
this.isDrawing = false
this.drawStep = 0
this.isCompleted = false
--
Gitblit v1.9.3