From d81fdeef2ad2f7ecc548cebad6ab15455bf3da27 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 30 Jul 2024 14:53:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java b/src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java
index e7993b1..85dab35 100644
--- a/src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java
+++ b/src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java
@@ -130,7 +130,7 @@
*/
public static XMLTemplateModel initPolygon(CreateWaylineParam param) {
- Folder folder = FolderUtils.setFloder(param.getTemplateType(), param.getAutoFlightSpeed());
+ Folder folder = FolderUtils.setFloder(param.getTemplateType(), param.getAutoFlightSpeed(),param.getExecuteHeightMode());
//坐标系参数
WaylineCoordinateSysParam wcs = new WaylineCoordinateSysParam("EGM96", String.valueOf(param.getHeight()), String.valueOf(param.getHeight()));
@@ -189,7 +189,7 @@
placemark.setCoordinates(c.x + "," + c.y);
placemark.setEllipsoidHeight(param.getHeight());
placemark.setHeight(param.getHeight());
- placemark.setExecuteHeight(param.getHeight() + param.getDroneHeight()); //执行高度 = 机场高度 + 飞行高度
+ placemark.setExecuteHeight(param.getHeight()); //执行高度 = 机场高度 + 飞行高度 *修改为前端直接传
placemark.setWaypointSpeed(param.getAutoFlightSpeed() + "");
placemark.setUseStraightLine(1);
--
Gitblit v1.9.3