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 })