From de1e4b290dbb4ca75c5869233c569570390155ae Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Tue, 30 Jul 2024 21:29:10 +0800
Subject: [PATCH] 面状航线
---
src/main/java/com/dji/sample/wayline/plane/PlaneCourseUtils.java | 2 +-
src/main/java/com/dji/sample/wayline/plane/controller/CreateWayLineController.java | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 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..3fccb65 100644
--- a/src/main/java/com/dji/sample/wayline/plane/PlaneCourseUtils.java
+++ b/src/main/java/com/dji/sample/wayline/plane/PlaneCourseUtils.java
@@ -150,7 +150,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;
diff --git a/src/main/java/com/dji/sample/wayline/plane/controller/CreateWayLineController.java b/src/main/java/com/dji/sample/wayline/plane/controller/CreateWayLineController.java
index 2890f55..27d0d52 100644
--- a/src/main/java/com/dji/sample/wayline/plane/controller/CreateWayLineController.java
+++ b/src/main/java/com/dji/sample/wayline/plane/controller/CreateWayLineController.java
@@ -53,15 +53,15 @@
CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
String creator = customClaim.getUsername();
// 初始化模板对象
-// XMLTemplateModel xmlModel = XMLTemplateModel.initPolygon(param);
-//// 生成航线文件
-// CreateWaylineFileUtils.createWaylineFileByPolygon(xmlModel, patchesConfigPojo.getPlaneTemplate(), patchesConfigPojo.getPlaneTargetTemplate());
-// CreateWaylineFileUtils.createWaylineFileByPolygon(xmlModel, patchesConfigPojo.getPlaneWaylines(), patchesConfigPojo.getPlaneTargetWaylines());
-//// kmz、上传航线库
-// String destKMZFile = patchesConfigPojo.getPlaneKMZFile() + param.getWaylineName() + ".kmz"; // 输出的KMZ文件路径
-// ZipUtil.zipFolder(patchesConfigPojo.getSourceDir(), destKMZFile);
-// MultipartFile multipartFile = MultipartFileTOFileUtil.convert(new File(destKMZFile));
-// waylineFileService.importKmzFile(multipartFile, workspaceId, creator, null, "1");
+ XMLTemplateModel xmlModel = XMLTemplateModel.initPolygon(param);
+// 生成航线文件
+ CreateWaylineFileUtils.createWaylineFileByPolygon(xmlModel, patchesConfigPojo.getPlaneTemplate(), patchesConfigPojo.getPlaneTargetTemplate());
+ CreateWaylineFileUtils.createWaylineFileByPolygon(xmlModel, patchesConfigPojo.getPlaneWaylines(), patchesConfigPojo.getPlaneTargetWaylines());
+// kmz、上传航线库
+ String destKMZFile = patchesConfigPojo.getPlaneKMZFile() + param.getWaylineName() + ".kmz"; // 输出的KMZ文件路径
+ ZipUtil.zipFolder(patchesConfigPojo.getSourceDir(), destKMZFile);
+ MultipartFile multipartFile = MultipartFileTOFileUtil.convert(new File(destKMZFile));
+ waylineFileService.importKmzFile(multipartFile, workspaceId, creator, null, "1");
return ResponseResult.success();
}
--
Gitblit v1.9.3