From c62f0be266715f9055cbebdce06367b920977a14 Mon Sep 17 00:00:00 2001 From: Kevin Kreiser Date: Thu, 18 Oct 2018 17:55:36 -0400 Subject: [PATCH 1/2] grab newest native navigator and make use of fixed duration for non tracking statuses. fixes #1404 --- gradle/dependencies.gradle | 2 +- .../navigation/v5/navigation/NavigationRouteProcessor.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 96f2a7d222c..2f8c1dc472c 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -11,7 +11,7 @@ ext { mapboxMapSdk : '6.6.1', mapboxSdkServices : '4.0.0', mapboxEvents : '3.4.0', - mapboxNavigator : '3.1.5', + mapboxNavigator : '3.2.0', locationLayerPlugin: '0.10.0', autoValue : '1.5.4', autoValueParcel : '0.2.5', diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessor.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessor.java index ca17e9ca2d1..0d407192a0a 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessor.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessor.java @@ -27,7 +27,7 @@ class NavigationRouteProcessor { private static final int ONE_INDEX = 1; - private static final long ONE_SECOND_IN_MILLISECONDS = 1000L; + private static final double ONE_SECOND_IN_MILLISECONDS = 1000.0; private RouteProgress previousRouteProgress; private DirectionsRoute route; private RouteLeg currentLeg; @@ -71,8 +71,7 @@ private RouteProgress buildRouteProgressFrom(NavigationStatus status) { double routeDistanceRemaining = routeDistanceRemaining(legDistanceRemaining, legIndex, route); double stepDistanceRemaining = status.getRemainingStepDistance(); double stepDistanceTraveled = currentStep.distance() - stepDistanceRemaining; - double legDurationRemaining = status.getRouteState() == RouteState.TRACKING - ? status.getRemainingLegDuration() / ONE_SECOND_IN_MILLISECONDS : route.duration(); + double legDurationRemaining = status.getRemainingLegDuration() / ONE_SECOND_IN_MILLISECONDS; currentLegAnnotation = createCurrentAnnotation(currentLegAnnotation, currentLeg, legDistanceRemaining); StepIntersection currentIntersection = findCurrentIntersection( From 8fa82683d1a5e1633794d78bd351cea25451ba56 Mon Sep 17 00:00:00 2001 From: Kevin Kreiser Date: Thu, 18 Oct 2018 17:59:09 -0400 Subject: [PATCH 2/2] lint --- .../navigation/v5/navigation/NavigationRouteProcessor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessor.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessor.java index 0d407192a0a..362a02e1dcd 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessor.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessor.java @@ -9,7 +9,6 @@ import com.mapbox.api.directions.v5.models.StepIntersection; import com.mapbox.geojson.Point; import com.mapbox.navigator.NavigationStatus; -import com.mapbox.navigator.RouteState; import com.mapbox.navigator.VoiceInstruction; import com.mapbox.services.android.navigation.v5.routeprogress.CurrentLegAnnotation; import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress;