From c7781a42356330032669743e98d471bc72baacc3 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 31 Jan 2026 16:23:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/utils/cesium/shapeTools/edit/EditEllipseTool.js | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/applications/drone-command/src/utils/cesium/shapeTools/edit/EditEllipseTool.js b/applications/drone-command/src/utils/cesium/shapeTools/edit/EditEllipseTool.js
index 228eae3..7d41ec1 100644
--- a/applications/drone-command/src/utils/cesium/shapeTools/edit/EditEllipseTool.js
+++ b/applications/drone-command/src/utils/cesium/shapeTools/edit/EditEllipseTool.js
@@ -1,5 +1,5 @@
import * as Cesium from 'cesium'
-import { MapTooltip } from '../Tooltip'
+import { MapTooltip } from '@ztzf/utils'
import { ToolBase } from '../ToolBase'
import {
getBoundsFromLngLats,
@@ -81,10 +81,8 @@
const minorFromMeta = Number.isFinite(meta?.semiMinor) ? Number(meta.semiMinor) : 0
const majorPoint = resolveCartographic(meta?.majorPoint)
const minorPoint = resolveCartographic(meta?.minorPoint)
- const majorDistance =
- majorFromMeta || (majorPoint ? getMetersBetween(centerCarto, majorPoint) : 0)
- const minorDistance =
- minorFromMeta || (minorPoint ? getMetersBetween(centerCarto, minorPoint) : 0)
+ const majorDistance = majorFromMeta || (majorPoint ? getMetersBetween(centerCarto, majorPoint) : 0)
+ const minorDistance = minorFromMeta || (minorPoint ? getMetersBetween(centerCarto, minorPoint) : 0)
if (majorDistance > 0) this.semiMajor = Math.max(1, majorDistance)
if (minorDistance > 0) this.semiMinor = Math.max(1, minorDistance)
if (this.semiMinor > this.semiMajor) this.semiMinor = this.semiMajor
--
Gitblit v1.9.3