From 2db1aa88e8ab53096a936163d686b90d8e056a99 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 21 Aug 2024 23:18:33 +0800
Subject: [PATCH] 国土对接返回信息加密
---
src/main/java/com/dji/sample/wayline/plane/PlaneCourseUtils.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/dji/sample/wayline/plane/PlaneCourseUtils.java b/src/main/java/com/dji/sample/wayline/plane/PlaneCourseUtils.java
index 1440128..c28adaa 100644
--- a/src/main/java/com/dji/sample/wayline/plane/PlaneCourseUtils.java
+++ b/src/main/java/com/dji/sample/wayline/plane/PlaneCourseUtils.java
@@ -2,6 +2,7 @@
import com.dji.sample.patches.utils.GeoToolsUtil;
import com.dji.sample.wayline.plane.param.CreateWaylineParam;
+import lombok.extern.slf4j.Slf4j;
import org.geotools.geometry.jts.JTSFactoryFinder;
import org.locationtech.jts.geom.*;
@@ -14,6 +15,7 @@
* 面状航线
* @Version 1.0
*/
+@Slf4j
public class PlaneCourseUtils {
/**
@@ -131,14 +133,19 @@
private static List<MapLatLng> createPoint(MapLatLng mapLatLng, int intValue, double bearing, MapLatLng mapLatLngMin) {
List<MapLatLng> pointList = new ArrayList<>();
+ int index = 0;//防止死循环
while (true) {
+ if (index > 100)
+ break ;
MapLatLng newLocation = getBearingLatLng(mapLatLng, intValue, bearing);
if (newLocation.getLatitude() <= mapLatLngMin.getLatitude())
break;
mapLatLng = newLocation;
pointList.add(newLocation);
- System.out.println(newLocation + ",");
+ index += 1;
+ log.info("创建航点，当前index:{}", index);
+
}
return pointList;
}
@@ -150,7 +157,7 @@
// 航向重叠计算 待完成
// 旁向重叠计算
- double distance2 = PlaneCourseUtils.get(param.getHeight(), param.getFrame(), param.getFocal(), 0.8);
+ double distance2 = PlaneCourseUtils.get(param.getHeight(), param.getFrame(), param.getFocal(), param.getSideRatio());
System.out.println("旁向重叠计算距离:" + distance2 * 100 / 100);
int intValue = (int) distance2;
--
Gitblit v1.9.3