From d7fef91a4cbb702988dc820bcde82c166253ceec Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 07 Mar 2026 10:17:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/util/InitializationUtils.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/util/InitializationUtils.java b/ard-route/src/main/java/com/ard/route/util/InitializationUtils.java
index 0298de1..99845a7 100644
--- a/ard-route/src/main/java/com/ard/route/util/InitializationUtils.java
+++ b/ard-route/src/main/java/com/ard/route/util/InitializationUtils.java
@@ -31,7 +31,7 @@
public UavRouteReq initialization(UavRouteReq uavRouteReq){
uavRouteReq.setTemplateType("waypoint");
// 起始点默认航线第一个点
- if (uavRouteReq.getTakeOffRefPoint().isEmpty()){
+ if (uavRouteReq.getTakeOffRefPoint() == null){
uavRouteReq.setTakeOffRefPoint(
uavRouteReq.getRoutePointList().get(0).getLatitude() + "," +
uavRouteReq.getRoutePointList().get(0).getLongitude() + "," + "0");
@@ -106,7 +106,6 @@
for (PointActionReq action : actionGroupReq.getActions()) {
if (action.getZoom() != null){
action.setZoom(multiple_23(action.getZoom()));
- //action.setZoom(multiple_6(action.getZoom()));
}
}
}
@@ -282,8 +281,6 @@
// ardRoutePoints1.setLon(103.75851462);
// ardRoutePoints1.setSafeGohomeFlag(0);
// ardRoutePoints1.setSpeed(8);
-//
-//
// }
// private ArdRouteActions buildArdRouteActions(){
--
Gitblit v1.9.3