NN 132 (#7137)

Author: VysotskiVadim

changelog/unreleased/bugfixes/7137.md

@@ -0,0 +1,3 @@
+- Improved quality of continuous alternatives, now the mechanism respects routes from current navigation session.
+- Improved EV offline navigation, now it fallbacks to a regular onboard routing.
+- Improved location simulation when DR ends, i.e. when a driver leaves a tunnel.

gradle/dependencies.gradle

@@ -13,15 +13,15 @@ ext {
   // version which we should use in this build
   def mapboxNavigatorVersion = System.getenv("FORCE_MAPBOX_NAVIGATION_NATIVE_VERSION")
   if (mapboxNavigatorVersion == null || mapboxNavigatorVersion == '') {
-      mapboxNavigatorVersion = '131.0.0'
+      mapboxNavigatorVersion = '132.0.0'
   }
   println("Navigation Native version: " + mapboxNavigatorVersion)
 
   version = [
-      mapboxMapSdk              : '10.13.0-beta.1',
+      mapboxMapSdk              : '10.13.0-rc.1',
       mapboxSdkServices         : '6.11.0',
       mapboxNavigator           : "${mapboxNavigatorVersion}",
-      mapboxCommonNative        : '23.5.0-beta.1',
+      mapboxCommonNative        : '23.5.0-rc.1',
       mapboxCrashMonitor        : '2.0.0',
       mapboxAnnotationPlugin    : '0.8.0',
       mapboxBaseAndroid         : '0.8.0',

libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/factory/RoadObjectFactory.kt

@@ -6,7 +6,6 @@ import com.mapbox.navigation.base.trip.model.roadobject.UpcomingRoadObject
 import com.mapbox.navigation.base.trip.model.roadobject.distanceinfo.RoadObjectDistanceInfo
 import com.mapbox.navigation.base.trip.model.roadobject.mapToRoadObject
 import com.mapbox.navigator.RoadObjectType
-import com.mapbox.navigator.UpcomingRouteAlert
 import com.mapbox.navigator.UpcomingRouteAlertUpdate
 
 /**

libnavigation-base/src/main/java/com/mapbox/navigation/base/trip/model/eh/EHorizonMapper.kt

@@ -276,6 +276,7 @@ internal fun RoadObjectType.mapToRoadObjectType(): Int {
         RoadObjectType.RAILWAY_CROSSING -> SDKRoadObjectType.RAILWAY_CROSSING
         RoadObjectType.IC -> SDKRoadObjectType.IC
         RoadObjectType.JCT -> SDKRoadObjectType.JCT
+        RoadObjectType.NOTIFICATION -> SDKRoadObjectType.NOTIFICATION
     }
 }
 

libnavigation-base/src/main/java/com/mapbox/navigation/base/trip/model/roadobject/RoadObjectMapper.kt

@@ -9,6 +9,7 @@ import com.mapbox.navigation.base.trip.model.roadobject.custom.Custom
 import com.mapbox.navigation.base.trip.model.roadobject.ic.Interchange
 import com.mapbox.navigation.base.trip.model.roadobject.incident.Incident
 import com.mapbox.navigation.base.trip.model.roadobject.jct.Junction
+import com.mapbox.navigation.base.trip.model.roadobject.notification.Notification
 import com.mapbox.navigation.base.trip.model.roadobject.railwaycrossing.RailwayCrossing
 import com.mapbox.navigation.base.trip.model.roadobject.restrictedarea.RestrictedArea
 import com.mapbox.navigation.base.trip.model.roadobject.reststop.RestStop
@@ -145,6 +146,13 @@ internal fun com.mapbox.navigator.RoadObject.mapToRoadObject(): RoadObject {
             isUrban,
             this,
         )
+        RoadObjectType.NOTIFICATION -> Notification(
+            id,
+            length,
+            provider,
+            isUrban,
+            this
+        )
     }
 }
 

libnavigation-base/src/main/java/com/mapbox/navigation/base/trip/model/roadobject/RoadObjectType.kt

@@ -75,6 +75,11 @@ object RoadObjectType {
      */
     const val JCT = 10
 
+    /**
+     * Not finished yet, see https://mapbox.atlassian.net/browse/NAVAND-1311
+     */
+    internal const val NOTIFICATION = 11
+
     /**
      * Retention policy for the RoadObjectType
      */
@@ -91,6 +96,7 @@ object RoadObjectType {
         RAILWAY_CROSSING,
         IC,
         JCT,
+        NOTIFICATION
     )
     annotation class Type
 }

libnavigation-base/src/main/java/com/mapbox/navigation/base/trip/model/roadobject/notification/Notification.kt

@@ -0,0 +1,52 @@
+package com.mapbox.navigation.base.trip.model.roadobject.notification
+
+import com.mapbox.navigation.base.trip.model.roadobject.RoadObject
+import com.mapbox.navigation.base.trip.model.roadobject.RoadObjectProvider
+import com.mapbox.navigation.base.trip.model.roadobject.RoadObjectType
+
+/**
+ * Road object type that provides information about notification on the route.
+ *
+ * @see RoadObject
+ * @see RoadObjectType.NOTIFICATION
+ */
+internal class Notification internal constructor(
+    id: String,
+    length: Double?,
+    @RoadObjectProvider.Type provider: String,
+    isUrban: Boolean?,
+    nativeRoadObject: com.mapbox.navigator.RoadObject,
+) : RoadObject(
+    id,
+    RoadObjectType.NOTIFICATION,
+    length,
+    provider,
+    isUrban,
+    nativeRoadObject
+) {
+
+    /**
+     * Indicates whether some other object is "equal to" this one.
+     */
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        if (!super.equals(other)) return false
+
+        return true
+    }
+
+    /**
+     * Returns a hash code value for the object.
+     */
+    override fun hashCode(): Int {
+        return super.hashCode()
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    override fun toString(): String {
+        return "Notification"
+    }
+}

libnavigation-base/src/test/java/com/mapbox/navigation/base/internal/factory/RoadObjectFactoryTest.kt

@@ -17,6 +17,7 @@ import com.mapbox.navigation.base.trip.model.roadobject.incident.IncidentImpact
 import com.mapbox.navigation.base.trip.model.roadobject.incident.IncidentInfo
 import com.mapbox.navigation.base.trip.model.roadobject.incident.IncidentType
 import com.mapbox.navigation.base.trip.model.roadobject.jct.Junction
+import com.mapbox.navigation.base.trip.model.roadobject.notification.Notification
 import com.mapbox.navigation.base.trip.model.roadobject.railwaycrossing.RailwayCrossing
 import com.mapbox.navigation.base.trip.model.roadobject.railwaycrossing.RailwayCrossingInfo
 import com.mapbox.navigation.base.trip.model.roadobject.restrictedarea.RestrictedArea
@@ -293,6 +294,23 @@ class RoadObjectFactoryTest {
         assertEquals(RoadObjectType.RAILWAY_CROSSING, roadObject.objectType)
     }
 
+    @Test
+    fun `buildRoadObject - unsupported notification`() {
+        val nativeObject = notification
+
+        val expected = Notification(
+            ID,
+            LENGTH,
+            SDKRoadObjectProvider.MAPBOX,
+            false,
+            nativeObject
+        )
+
+        val roadObject = RoadObjectFactory.buildRoadObject(nativeObject)
+
+        assertEquals(expected, roadObject)
+    }
+
     @Test
     fun `toUpcomingRoadObjects - should map native to SDK UpcomingRoadObjects`() {
         val nativeObjects: List<com.mapbox.navigator.UpcomingRouteAlert> = listOf(
@@ -306,14 +324,18 @@ class RoadObjectFactoryTest {
             incident,
             railwayCrossing,
             ic,
-            jct
+            jct,
+            notification
         ).mapIndexed { distanceToStart, roadObject ->
             UpcomingRouteAlert(roadObject, distanceToStart.toDouble())
         }
+        // notification object isn't supported yet,
+        // see https://mapbox.atlassian.net/browse/NAVAND-1311
+        val unsupportedObjectsCount = 1
 
         val sdkObjects = nativeObjects.toUpcomingRoadObjects()
 
-        assertEquals(nativeObjects.size, sdkObjects.size)
+        assertEquals(nativeObjects.size - unsupportedObjectsCount, sdkObjects.size)
         assertTrue(sdkObjects[0].roadObject is Tunnel)
         assertTrue(sdkObjects[1].roadObject is CountryBorderCrossing)
         assertTrue(sdkObjects[2].roadObject is TollCollection)
@@ -325,7 +347,7 @@ class RoadObjectFactoryTest {
         assertTrue(sdkObjects[8].roadObject is RailwayCrossing)
         assertTrue(sdkObjects[9].roadObject is Interchange)
         assertTrue(sdkObjects[10].roadObject is Junction)
-        sdkObjects.forEachIndexed { distanceToStart, obj ->
+        sdkObjects.dropLast(unsupportedObjectsCount).forEachIndexed { distanceToStart, obj ->
             assertEquals(distanceToStart.toDouble(), obj.distanceToStart)
         }
     }
@@ -495,6 +517,11 @@ class RoadObjectFactoryTest {
         location = matchedRoadObjectLocation(location.shape),
     )
 
+    private val notification = createRoadObject(
+        type = com.mapbox.navigator.RoadObjectType.NOTIFICATION,
+        location = matchedRoadObjectLocation(location.shape)
+    )
+
     private fun createRoadObject(
         type: com.mapbox.navigator.RoadObjectType,
         location: MatchedRoadObjectLocation,

libnavigation-base/src/test/java/com/mapbox/navigation/base/trip/model/eh/EHorizonMapperMapToRoadObjectTypeTest.kt

@@ -38,6 +38,7 @@ internal class EHorizonMapperMapToRoadObjectTypeTest(
                 arrayOf<Any>(RoadObjectType.RAILWAY_CROSSING, SDKRoadObjectType.RAILWAY_CROSSING),
                 arrayOf<Any>(RoadObjectType.IC, SDKRoadObjectType.IC),
                 arrayOf<Any>(RoadObjectType.JCT, SDKRoadObjectType.JCT),
+                arrayOf<Any>(RoadObjectType.NOTIFICATION, SDKRoadObjectType.NOTIFICATION),
             )
             assertEquals(RoadObjectType.values().size, result.size)
             return result

libtesting-thirdparty/src/main/java/com/mapbox/navigation/testing/factories/NativeFactories.kt

@@ -3,12 +3,14 @@ package com.mapbox.navigation.testing.factories
 import com.mapbox.api.directions.v5.models.StepManeuver
 import com.mapbox.geojson.Point
 import com.mapbox.navigator.ActiveGuidanceInfo
+import com.mapbox.navigator.AlternativeRouteInfo
 import com.mapbox.navigator.BannerInstruction
 import com.mapbox.navigator.BannerSection
 import com.mapbox.navigator.FixLocation
 import com.mapbox.navigator.MapMatcherOutput
 import com.mapbox.navigator.NavigationStatus
 import com.mapbox.navigator.RoadName
+import com.mapbox.navigator.RouteIndices
 import com.mapbox.navigator.RouteInfo
 import com.mapbox.navigator.RouteInterface
 import com.mapbox.navigator.RouteState
@@ -50,6 +52,7 @@ fun createNavigationStatus(
     upcomingRouteAlertUpdates: List<UpcomingRouteAlertUpdate> = emptyList(),
     nextWaypointIndex: Int = 0,
     layer: Int = 0,
+    alternativeRouteIndices: List<RouteIndices> = emptyList()
 ): NavigationStatus {
     return NavigationStatus(
         routeState,
@@ -65,6 +68,7 @@ fun createNavigationStatus(
         geometryIndex,
         shapeIndex,
         intersectionIndex,
+        alternativeRouteIndices,
         roads,
         voiceInstruction,
         bannerInstruction,