From 429d614e2bb0b41dd88acd0c32f693db3fc72494 Mon Sep 17 00:00:00 2001 From: Samuel Deuter Date: Mon, 24 Oct 2022 15:55:25 -0700 Subject: [PATCH] Don't conflate coordinates and waypoints --- .../navigation/core/trip/session/MapboxTripSession.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/MapboxTripSession.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/MapboxTripSession.kt index 58094b0bbf8..0a03094376a 100644 --- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/MapboxTripSession.kt +++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/MapboxTripSession.kt @@ -379,9 +379,9 @@ internal class MapboxTripSession( } private fun calculateRemainingWaypoints(tripStatus: TripStatus): Int { - val routeCoordinates = tripStatus.route?.routeOptions?.coordinatesList() - return if (routeCoordinates != null) { - val waypointsCount = routeCoordinates.size + val routeWaypoints = tripStatus.route?.directionsResponse?.waypoints() + return if (routeWaypoints != null) { + val waypointsCount = routeWaypoints.size val nextWaypointIndex = normalizeNextWaypointIndex( tripStatus.navigationStatus.nextWaypointIndex )