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/DrawPolygonTool.js | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawPolygonTool.js b/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawPolygonTool.js
index 88674c7..1a9c489 100644
--- a/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawPolygonTool.js
+++ b/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawPolygonTool.js
@@ -91,6 +91,9 @@
}
start() {
+ if (!this.tooltip) {
+ this.tooltip = new MapTooltip(this.viewer)
+ }
this.dataSource = new Cesium.CustomDataSource('draw-polygon')
this.viewer.dataSources.add(this.dataSource)
this.handler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas)
@@ -137,12 +140,18 @@
handleMouseMove(movement) {
if (!this.isDrawing) return
+ const tipText = this.getTipText()
+ if (!this.tooltip?.isVisible) {
+ this.tooltip?.show(tipText, movement.endPosition)
+ } else {
+ this.tooltip?.show(tipText)
+ this.tooltip?.move(movement.endPosition)
+ }
if (this.positions.length === 0) return
const position = this.getPositionFromScreen(movement.endPosition)
if (!position) return
this.lastMousePosition = position
this.floatPosition = position
- this.tooltip.show(this.getTipText(), movement.endPosition)
}
getTipText() {
@@ -277,7 +286,7 @@
this.floatPosition = null
this.isIntersecting = false
this.notify('getPolygonPositions', this.positions)
- this.tooltip.hide()
+ this.tooltip?.hide()
this.clearPreviewEntities()
}
@@ -304,7 +313,8 @@
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)
}
--
Gitblit v1.9.3