From 25585416ad4e77be0f3e7625ac6992f6e342aa98 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Mon, 30 Jan 2023 11:30:21 +0800
Subject: [PATCH] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E9=AB=98=E7=B2=BE=E5=9D=90=E6=A0=87=E6=9B=BF=E6=8D=A2=E9=AB=98?=
 =?UTF-8?q?=E5=BE=B7=E5=9D=90=E6=A0=87=E6=96=B9=E6=B3=95=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../function/v2x/events/utils/EntityUtils.kt  | 38 +++++++------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/EntityUtils.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/EntityUtils.kt
index 497a287343..65ebd78c9d 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/EntityUtils.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/EntityUtils.kt
@@ -8,6 +8,7 @@ import com.mogo.eagle.core.data.map.entity.MarkerUserInfo
 import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity
 import com.mogo.eagle.core.function.v2x.events.scenario.scene.airoad.AiRoadMarker
 import com.mogo.eagle.core.function.v2x.internal.data.*
+import com.mogo.eagle.core.utilcode.util.CoordinateTransform
 import mogo.telematics.pad.MessagePad
 import roadwork.Road
 
@@ -85,15 +86,10 @@ fun Road.RW_PB.toRoadMarker(): V2XMarkerCardResult =
                 l3.poiType = this.roadwork?.poiType?.toString()
                 l3.generateTime = this.roadwork?.detectTime ?: 0L
                 l3.location = V2XMarkerLocation().also { l4 ->
-                    /*
-                    TODO zhongchao 先注掉，编译通过
-                    val p = MogoMap.getInstance().mogoMap.switchLonLat(
-                        this.roadwork?.center?.point?.lon ?: 0.0,
-                        this.roadwork?.center?.point?.lat ?: 0.0
-                    )
-                    l4.lon = p.lon
-                    l4.lat = p.lat
-                    l4.angle = this.roadwork?.center?.road?.bearing?.toDouble() ?: 0.0*/
+                    val p = CoordinateTransform.WGS84ToGCJ02(this.roadwork?.center?.point?.lon ?: 0.0, this.roadwork?.center?.point?.lat ?: 0.0)
+                    l4.lon = p[0]
+                    l4.lat = p[1]
+                    l4.angle = this.roadwork?.center?.road?.bearing?.toDouble() ?: 0.0
                 }
                 l3.infoId = id
             })
@@ -117,15 +113,10 @@ fun V2XRoadXData.toRoadMarker(): V2XMarkerCardResult =
                 l3.poiType = this.poiType
                 l3.generateTime = this.detectTime ?: 0L
                 l3.location = V2XMarkerLocation().also { l4 ->
-                    /*
-                    TODO zhongchao 先注掉，编译通过
-                    val p = MogoMap.getInstance().mogoMap.switchLonLat(
-                        this.center?.lon ?: 0.0,
-                        this.center?.lat ?: 0.0
-                    )
-                    l4.lon = p.lon
-                    l4.lat = p.lat
-                    l4.angle = this.centerRoad?.bearing ?: 0.0*/
+                    val p = CoordinateTransform.WGS84ToGCJ02(this.center?.lon ?: 0.0, this.center?.lat ?: 0.0)
+                    l4.lon = p[0]
+                    l4.lat = p[1]
+                    l4.angle = this.centerRoad?.bearing ?: 0.0
                 }
                 l3.infoId = this.index
             })
@@ -148,13 +139,10 @@ fun MessagePad.TrackedObject.toRoadMarker(poiType: String): V2XMarkerCardResult
                 l3.poiType = poiType
                 l3.generateTime = 0L
                 l3.location = V2XMarkerLocation().also { l4 ->
-                    /*
-                    TODO zhongchao 先注掉，编译通过
-                    val p =
-                        MogoMap.getInstance().mogoMap.switchLonLat(this.longitude, this.latitude)
-                    l4.lon = p.lon
-                    l4.lat = p.lat
-                    l4.angle = this.heading*/
+                    val p = CoordinateTransform.WGS84ToGCJ02(this.longitude, this.latitude)
+                    l4.lon = p[0]
+                    l4.lat = p[1]
+                    l4.angle = this.heading
                 }
                 l3.infoId = id
             })