From e2cb46dbe45f8cc2d567e0739e8a9e67c00a4346 Mon Sep 17 00:00:00 2001 From: Dzina Dybouskaya Date: Thu, 26 Jan 2023 14:58:12 +0300 Subject: [PATCH 1/3] bump NN to 123.3.1, Common to 23.2.2, Maps to 10.10.1 --- changelog/unreleased/features/dd.md | 3 +++ gradle/dependencies.gradle | 6 +++--- .../instrumentation_tests/core/UpcomingRouteObjectsTest.kt | 1 - 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 changelog/unreleased/features/dd.md diff --git a/changelog/unreleased/features/dd.md b/changelog/unreleased/features/dd.md new file mode 100644 index 00000000000..e5d286dba9d --- /dev/null +++ b/changelog/unreleased/features/dd.md @@ -0,0 +1,3 @@ +- Added custom header x-mapbox-app-info to requests. +- Fix upcoming route alerts incorrect position. +- Stabilized routes with alternatives refresh / re-route on deviate. \ No newline at end of file diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 0ebb6f47790..2b847a4a972 100644 --- a/gradle/dependencies.gradle +++ b/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 = '123.2.0' + mapboxNavigatorVersion = '123.3.1' } println("Navigation Native version: " + mapboxNavigatorVersion) version = [ - mapboxMapSdk : '10.10.0', + mapboxMapSdk : '10.10.1', mapboxSdkServices : '6.10.0', mapboxNavigator : "${mapboxNavigatorVersion}", - mapboxCommonNative : '23.2.1', + mapboxCommonNative : '23.2.2', mapboxCrashMonitor : '2.0.0', mapboxAnnotationPlugin : '0.8.0', mapboxBaseAndroid : '0.8.0', diff --git a/instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/UpcomingRouteObjectsTest.kt b/instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/UpcomingRouteObjectsTest.kt index 71835a08968..141d9e23c4a 100644 --- a/instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/UpcomingRouteObjectsTest.kt +++ b/instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/UpcomingRouteObjectsTest.kt @@ -55,7 +55,6 @@ class UpcomingRouteObjectsTest : BaseTest(EmptyTestActivity:: } @Test - @Ignore("waiting for the NN fix, see NN-449") fun distanceToIncidentDoesNotChangeAfterAddingNewWaypointOnTheRouteGeometry() = sdkTest { val (oneLegRoute, twoLegsRoute, incidentId) = getRoutesFromTheSameOriginButDifferentWaypointsCount() From 68f6cc737cfc51594e24b3308931bf2a7e769448 Mon Sep 17 00:00:00 2001 From: runner Date: Fri, 27 Jan 2023 09:36:47 +0000 Subject: [PATCH 2/3] Rename changelog files --- changelog/unreleased/features/{dd.md => 6871.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog/unreleased/features/{dd.md => 6871.md} (100%) diff --git a/changelog/unreleased/features/dd.md b/changelog/unreleased/features/6871.md similarity index 100% rename from changelog/unreleased/features/dd.md rename to changelog/unreleased/features/6871.md From 68c9e1cf119ee3be5177c497ed58b4b1f04badf7 Mon Sep 17 00:00:00 2001 From: VysotskiVadim Date: Fri, 27 Jan 2023 11:06:54 +0100 Subject: [PATCH 3/3] clarified distance to start accuracy --- .../instrumentation_tests/core/UpcomingRouteObjectsTest.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/UpcomingRouteObjectsTest.kt b/instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/UpcomingRouteObjectsTest.kt index 141d9e23c4a..71d99367da8 100644 --- a/instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/UpcomingRouteObjectsTest.kt +++ b/instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/UpcomingRouteObjectsTest.kt @@ -21,7 +21,6 @@ import com.mapbox.navigation.testing.ui.utils.runOnMainSync import kotlinx.coroutines.flow.first import org.junit.Assert.assertEquals import org.junit.Before -import org.junit.Ignore import org.junit.Rule import org.junit.Test import java.net.URI @@ -75,8 +74,9 @@ class UpcomingRouteObjectsTest : BaseTest(EmptyTestActivity:: .first { it.roadObject.id == incidentId } assertEquals( - upcomingIncidentForOneLeg.distanceToStart, - upcomingIncidentForTwoLegsRoute.distanceToStart + upcomingIncidentForOneLeg.distanceToStart!!, + upcomingIncidentForTwoLegsRoute.distanceToStart!!, + 0.1 ) }