From 9f3cd3d14b2025c79296ff6cbc49d7efe3302ec5 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 05 Nov 2025 16:58:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/domain/kml/KmlPlacemark.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/KmlPlacemark.java b/ard-route/src/main/java/com/ard/route/domain/kml/KmlPlacemark.java
index fe33390..4bd4725 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/KmlPlacemark.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/KmlPlacemark.java
@@ -1,10 +1,14 @@
package com.ard.route.domain.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
+import java.util.List;
+
@Data
@XStreamAlias("Placemark")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlPlacemark {
@XStreamAlias("wpml:isRisky")
@@ -50,7 +54,7 @@
private String gimbalPitchAngle;
@XStreamAlias("wpml:actionGroup")
- private KmlActionGroup actionGroup;
+ private List<KmlActionGroup> actionGroup;
// 下面 wpml 文件使用
@XStreamAlias("wpml:executeHeight")
@@ -84,18 +88,24 @@
@XStreamAlias("wpml:overlap")
private KmlOverlap overlap;
- @XStreamAlias("wpml:ovefacadeWaylineEnablerlap")
+ @XStreamAlias("wpml:facadeWaylineEnable")
private String facadeWaylineEnable;
@XStreamAlias("Polygon")
private KmlPolygon polygon;
@XStreamAlias("wpml:mappingHeadingParam")
- private KmlActionGroup mappingHeadingParam;
+ private KmlMappingHeadingParam mappingHeadingParam;
@XStreamAlias("wpml:gimbalPitchMode")
private String gimbalPitchMode;
+ @XStreamAlias("wpml:quickOrthoMappingEnable")
+ private String quickOrthoMappingEnable;
+
+ @XStreamAlias("wpml:quickOrthoMappingEnable")
+ private String quickOrthoMappingPitch;
+
// 倾斜摄影模板元素
@XStreamAlias("wpml:inclinedGimbalPitch")
private String inclinedGimbalPitch;
--
Gitblit v1.9.3