From 93c1aacc7d69a90089b93bf9e24a01dae180c790 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 29 Mar 2023 11:27:51 +0800 Subject: [PATCH] =?UTF-8?q?[2.15.0]=20=E4=B8=8D=E5=88=A4=E6=96=AD=E8=87=AA?= =?UTF-8?q?=E8=BD=A6=E8=88=AA=E5=90=91=E4=B8=8E=E4=BA=8B=E4=BB=B6=E8=88=AA?= =?UTF-8?q?=E5=90=91=E8=A7=92=E6=98=AF=E5=90=A6=E5=90=8C=E5=90=91,?= =?UTF-8?q?=E7=94=B1=E6=95=B0=E6=8D=AE=E4=BE=A7=E6=8E=A7=E5=88=B6=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E9=9D=9E=E8=87=AA=E8=BD=A6=E8=88=AA=E5=90=91=E4=B8=8A?= =?UTF-8?q?=E7=9A=84=E4=BA=8B=E4=BB=B6=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt | 3 +-- .../function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt index 216188d49c..8cfd2a9710 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt @@ -38,8 +38,7 @@ internal object V2NIdentifyDrawer { } val car = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() val filtered = events.filterIsInstance(TrackedObject::class.java).filter { itx -> - val diff = DrivingDirectionUtils.getAngleDiff(car.heading, itx.heading) - diff < 40 && DrivingDirectionUtils.getDegreeOfCar2Poi(car.longitude, car.latitude, itx.longitude, itx.latitude, car.heading.toInt()) <= 90 + DrivingDirectionUtils.getDegreeOfCar2Poi(car.longitude, car.latitude, itx.longitude, itx.latitude, car.heading.toInt()) <= 90 } if (filtered.isEmpty()) { return@Callback true diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt index 44ad54851b..9450162a65 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt @@ -55,7 +55,7 @@ class AiRoadMarker { private val checkExpiredTask = Runnable { val poi = this.marker.get() val car = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() - if (poi != null && car != null) { + if (poi != null) { val distance = CoordinateUtils.calculateLineDistance(car.longitude, car.latitude, poi.poi_lon, poi.poi_lat) if (distance < 500) { unMarker(poi)