From 6e88705bd5b443a259b24c17c8a299765d059d96 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 23 Jul 2026 16:50:41 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/utils/cesium/shapeTools/draw/DrawBufferCircleTool.js | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 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 645e5c4..2f309bd 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, formatBufferRadius } from '../shapeUtils'
+import {
+ buildEllipsePositions,
+ formatBufferRadius,
+ getBufferRadiusLabelStyle,
+ getBufferRadiusPoint,
+} from '../shapeUtils'
export class DrawBufferCircleTool extends ToolBase {
constructor(viewer) {
@@ -37,7 +42,7 @@
this.handler.setInputAction(movement => this.handleMouseMove(movement), Cesium.ScreenSpaceEventType.MOUSE_MOVE)
this.drawStep = 0
this.isCompleted = false
- this.tooltip.show('单击设置中心点', { x: 0, y: 0 })
+ this.tooltip.hide()
}
handleLeftClick(click) {
@@ -103,7 +108,19 @@
handleMouseMove(movement) {
if (this.isCompleted) return
- this.tooltip.move(movement.endPosition)
+ const tipText = this.drawStep === 0
+ ? '单击设置中心点'
+ : this.drawStep === 1
+ ? '单击设置一级缓冲圆'
+ : this.drawStep === 2
+ ? '单击设置二级缓冲圆'
+ : '单击设置三级缓冲圆'
+ if (!this.tooltip?.isVisible) {
+ this.tooltip.show(tipText, movement.endPosition)
+ } else {
+ this.tooltip.show(tipText)
+ this.tooltip.move(movement.endPosition)
+ }
if (!this.isDrawing) return
const position = this.getPositionFromScreen(movement.endPosition)
if (!position) return
@@ -225,34 +242,25 @@
getPositionFromScreen(screenPosition) {
const scene = this.viewer.scene
- const cartesian = scene.pickPosition(screenPosition)
+ const ray = scene.camera.getPickRay(screenPosition)
+ const cartesian = ray ? scene.globe.pick(ray, scene) : null
if (cartesian) return cartesian
return scene.camera.pickEllipsoid(screenPosition, scene.globe.ellipsoid)
}
getRadiusPoint(radius) {
- const frame = Cesium.Transforms.eastNorthUpToFixedFrame(this.centerCartesian)
- const local = new Cesium.Cartesian3(radius, 0, 0)
- return Cesium.Matrix4.multiplyByPoint(frame, local, new Cesium.Cartesian3())
+ return getBufferRadiusPoint(this.centerCartesian, radius)
}
createRadiusLabelEntity(getRadius) {
return this.dataSource.entities.add({
- position: new Cesium.CallbackProperty(() => this.getRadiusPoint(getRadius()), false),
+ position: new Cesium.CallbackProperty(
+ () => getBufferRadiusPoint(this.centerCartesian, getRadius()),
+ false
+ ),
label: {
+ ...getBufferRadiusLabelStyle(),
text: new Cesium.CallbackProperty(() => formatBufferRadius(getRadius()), false),
- font: '14px Source Han Sans CN',
- fillColor: Cesium.Color.WHITE,
- outlineColor: Cesium.Color.fromBytes(24, 48, 92, 255),
- outlineWidth: 2,
- style: Cesium.LabelStyle.FILL_AND_OUTLINE,
- showBackground: true,
- backgroundColor: Cesium.Color.fromBytes(8, 12, 22, 180),
- heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
- verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
- horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
- pixelOffset: new Cesium.Cartesian2(0, -12),
- disableDepthTestDistance: Number.POSITIVE_INFINITY,
},
})
}
--
Gitblit v1.9.3