From b8b5a3895e741d5348ecdd39ad2e5cbd443f8e89 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 01 Apr 2026 12:17:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/component/websocket/handler/NoFlyDistanceManager.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/component/websocket/handler/NoFlyDistanceManager.java b/ard-work/src/main/java/com/ard/work/component/websocket/handler/NoFlyDistanceManager.java
index 70aced6..6e89232 100644
--- a/ard-work/src/main/java/com/ard/work/component/websocket/handler/NoFlyDistanceManager.java
+++ b/ard-work/src/main/java/com/ard/work/component/websocket/handler/NoFlyDistanceManager.java
@@ -54,13 +54,10 @@
List<Vertex> polygon = zone.getVertices();
if (polygon == null || polygon.size() < 3) continue;
- double distanceDeg = NoFlyZoneUtils.pointToPolygonDistance(current, polygon);
+ double distance = NoFlyZoneUtils.pointToPolygonDistance(current, polygon);
- // ⭐ 转成米
- double distanceMeter = NoFlyZoneUtils.degDistanceToMeter(distanceDeg, current.y);
-
- if (distanceMeter < minDistance) {
- minDistance = distanceMeter;
+ if (distance < minDistance) {
+ minDistance = distance;
nearestZone = zone;
}
}
--
Gitblit v1.9.3