NN 161.1.1 (#7626)

mapbox · Nov 23, 2023 · 8508ba3 · 8508ba3
1 parent 50ef0b0
commit 8508ba3
Show file tree

Hide file tree

Showing 9 changed files with 6,692 additions and 189 deletions.
diff --git a/changelog/unreleased/bugfixes/7626.md b/changelog/unreleased/bugfixes/7626.md
@@ -0,0 +1 @@
+- Fixed an issue when navigation could switch between alternative routes in cycle when a user moves backward.
diff --git a/changelog/unreleased/issues/7626.md b/changelog/unreleased/issues/7626.md
@@ -0,0 +1 @@
+- Seamless switch to a route alternative doesn't always work for multi legs routes, regular reroute happens instead.
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -13,7 +13,7 @@ ext {
   // version which we should use in this build
   def mapboxNavigatorVersion = System.getenv("FORCE_MAPBOX_NAVIGATION_NATIVE_VERSION")
   if (mapboxNavigatorVersion == null || mapboxNavigatorVersion == '') {
-      mapboxNavigatorVersion = '161.1.0'
+      mapboxNavigatorVersion = '161.1.1'
   }
   println("Navigation Native version: " + mapboxNavigatorVersion)
 

diff --git a/.../src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/CoreRerouteTest.kt b/.../src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/CoreRerouteTest.kt
diff --git a/...s/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/RefreshTtlTest.kt b/...s/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/RefreshTtlTest.kt
@@ -310,7 +310,7 @@ class RefreshTtlTest : BaseCoreNoCleanUpTest() {
         mapboxNavigation.registerRoutesInvalidatedObserver { invalidatedResults.add(it) }
         stayOnPosition(coordinates[0].latitude(), coordinates[0].longitude(), 190f) {
             val routes = mapboxNavigation.requestRoutes(routeOptions)
-                .getSuccessfulResultOrThrowException().routes
+                .getSuccessfulResultOrThrowException().routes.take(1)
             mockWebServerRule.requestHandlers.clear()
             mockWebServerRule.requestHandlers.add(
                 MockDirectionsRequestHandler(

diff --git a/...oidTest/java/com/mapbox/navigation/instrumentation_tests/utils/location/LocationUpdate.kt b/...oidTest/java/com/mapbox/navigation/instrumentation_tests/utils/location/LocationUpdate.kt
@@ -1,6 +1,7 @@
 package com.mapbox.navigation.instrumentation_tests.utils.location
 
 import android.location.Location
+import com.mapbox.geojson.Point
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.internal.extensions.flowLocationMatcherResult
 import com.mapbox.navigation.testing.ui.BaseCoreNoCleanUpTest
@@ -52,6 +53,21 @@ suspend fun BaseCoreNoCleanUpTest.stayOnPosition(
     )
 }
 
+suspend fun BaseCoreNoCleanUpTest.stayOnPosition(
+    point: Point,
+    bearing: Float,
+    frequencyHz: Int = 1,
+    block: suspend () -> Unit
+) {
+    stayOnPosition(
+        latitude = point.latitude(),
+        longitude = point.longitude(),
+        bearing = bearing,
+        frequencyHz = frequencyHz,
+        block = block,
+    )
+}
+
 suspend fun BaseCoreNoCleanUpTest.stayOnPositionAndWaitForUpdate(
     mapboxNavigation: MapboxNavigation,
     latitude: Double,

diff --git a/...t/java/com/mapbox/navigation/instrumentation_tests/utils/location/MockLocationReplayer.kt b/...t/java/com/mapbox/navigation/instrumentation_tests/utils/location/MockLocationReplayer.kt
@@ -47,8 +47,12 @@ class MockLocationReplayerRule(mockLocationUpdatesRule: MockLocationUpdatesRule)
         mapboxReplayer = null
     }
 
-    fun playRoute(directionsRoute: DirectionsRoute) {
+    fun playRoute(
+        directionsRoute: DirectionsRoute,
+        eventsToDrop: Int = 0
+    ) {
         val replayEvents = mapper.mapDirectionsRouteGeometry(directionsRoute)
+            .drop(eventsToDrop)
         mapboxReplayer?.clearEvents()
         mapboxReplayer?.pushEvents(replayEvents)
         mapboxReplayer?.seekTo(replayEvents.first())

diff --git a/...droidTest/java/com/mapbox/navigation/instrumentation_tests/utils/routes/RoutesProvider.kt b/...droidTest/java/com/mapbox/navigation/instrumentation_tests/utils/routes/RoutesProvider.kt
@@ -99,6 +99,30 @@ object RoutesProvider {
         )
     }
 
+    fun dc_short_with_alternative_same_beginning(context: Context): MockRoute {
+        val jsonResponse = readRawFileText(
+            context,
+            R.raw.route_response_dc_short_with_alternative_same_begining
+        )
+        val coordinates = listOf(
+            Point.fromLngLat(-77.02821219854371,38.887758247504166),
+            Point.fromLngLat(-77.03002,38.895453)
+        )
+        return MockRoute(
+            jsonResponse,
+            DirectionsResponse.fromJson(jsonResponse),
+            listOf(
+                MockDirectionsRequestHandler(
+                    profile = DirectionsCriteria.PROFILE_DRIVING_TRAFFIC,
+                    jsonResponse = jsonResponse,
+                    expectedCoordinates = coordinates
+                )
+            ),
+            coordinates,
+            emptyList()
+        )
+    }
+
     fun dc_short_two_legs_with_alternative(context: Context): MockRoute {
         val jsonResponse = readRawFileText(context, R.raw.route_response_dc_very_short_two_legs_alternative)
         val coordinates = listOf(
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Fixed an issue when navigation could switch between alternative routes in cycle when a user moves backward.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Seamless switch to a route alternative doesn't always work for multi legs routes, regular reroute happens instead.