[add] 预警marker打点,类型:行人

modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XWarningEntity.java

@@ -19,20 +19,37 @@ public class V2XWarningEntity implements Serializable {
     //预测碰撞点位置
     private double collisionLat;
     private double collisionLon;
-    //来源 ADAS/云端
-    private int from;
     //朝向 角度
     private double angle;
     //方位  前 后 左 右
     private int direction;
     //速度
     private float speed;
+    //停止线经纬度
+    private double stopLineLat;
+    private double stopLineLon;
 
-    //以下为自组字段
     //预警文案
     private String tipContent;
     //tts播报
     private String tts;
+    //打点位置
+    private MarkerLocation location;
+
+    public void setLocation(MarkerLocation location) {
+        this.location = location;
+    }
+
+    public MarkerLocation getLocation() {
+        if (location == null) {
+            MarkerLocation location = new MarkerLocation();
+            location.setLat(getLat());
+            location.setLon(getLon());
+            setLocation(location);
+        }
+        return location;
+    }
+
 
     public void setTipContent(int type) {
         switch (type) {
@@ -96,10 +113,6 @@ public class V2XWarningEntity implements Serializable {
         this.collisionLon = collisionLon;
     }
 
-    public void setFrom(int from) {
-        this.from = from;
-    }
-
     public void setAngle(double angle) {
         this.angle = angle;
     }
@@ -137,9 +150,6 @@ public class V2XWarningEntity implements Serializable {
         return distance;
     }
 
-    public int getFrom() {
-        return from;
-    }
 
     public double getAngle() {
         return angle;
@@ -167,6 +177,30 @@ public class V2XWarningEntity implements Serializable {
         return tts;
     }
 
+    public void setStopLineLat(double stopLineLat) {
+        this.stopLineLat = stopLineLat;
+    }
+
+    public void setStopLineLon(double stopLineLon) {
+        this.stopLineLon = stopLineLon;
+    }
+
+    public void setTipContent(String tipContent) {
+        this.tipContent = tipContent;
+    }
+
+    public void setTts(String tts) {
+        this.tts = tts;
+    }
+
+    public double getStopLineLat() {
+        return stopLineLat;
+    }
+
+    public double getStopLineLon() {
+        return stopLineLon;
+    }
+
     @Override
     public String toString() {
         return "V2XWarningEntity{" +
@@ -176,12 +210,14 @@ public class V2XWarningEntity implements Serializable {
                 ", distance=" + distance +
                 ", collisionLat=" + collisionLat +
                 ", collisionLon=" + collisionLon +
-                ", from=" + from +
                 ", angle=" + angle +
                 ", direction=" + direction +
                 ", speed=" + speed +
+                ", stopLineLat=" + stopLineLat +
+                ", stopLineLon=" + stopLineLon +
                 ", tipContent='" + tipContent + '\'' +
                 ", tts='" + tts + '\'' +
+                ", location=" + location +
                 '}';
     }
 }