Use skip by index

Author: kmadsen

libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayPolylineDecodeStream.kt

@@ -96,11 +96,13 @@ class ReplayPolylineDecodeStream(
     }
 
     /**
-     * Skip the next [count] points of the geometry. Similar to decode except that this does not
-     * hold any points in memory.
+     * Skip the next [count] points of the geometry. Less points are skipped if there are less than
+     * [count] points left in the iterator.
+     *
+     * @param count the number of points to skip.
      */
     fun skip(count: Int) {
         var skipped = 0
-        while (skipped++ < count && hasNext()) { next() }
+        while (skipped++ <= count && hasNext()) { next() }
     }
 }

libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayRouteSession.kt

@@ -19,10 +19,8 @@ import com.mapbox.navigation.core.replay.history.ReplayEventBase
 import com.mapbox.navigation.core.replay.history.ReplayEventUpdateLocation
 import com.mapbox.navigation.core.replay.history.ReplayEventsObserver
 import com.mapbox.navigation.core.trip.session.RouteProgressObserver
-import com.mapbox.navigation.utils.internal.logI
 import com.mapbox.navigation.utils.internal.logW
-import com.mapbox.turf.TurfConstants
-import java.util.*
+import java.util.Collections
 
 /**
  * Used to create a replay trip session. Continue to use [MapboxNavigation.setNavigationRoutes] to

libnavigation-core/src/test/java/com/mapbox/navigation/core/replay/route/ReplayRouteSessionTest.kt

@@ -21,8 +21,6 @@ import com.mapbox.navigation.core.replay.history.ReplayEventUpdateLocation
 import com.mapbox.navigation.core.replay.history.ReplayEventsObserver
 import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.testing.LoggingFrontendTestRule
-import com.mapbox.turf.TurfConstants
-import com.mapbox.turf.TurfMeasurement
 import io.mockk.every
 import io.mockk.just
 import io.mockk.mockk
@@ -182,7 +180,7 @@ class ReplayRouteSessionTest {
         )
 
         sut.onAttached(mapboxNavigation)
-        routeProgressObserver.captured.onRouteProgressChanged(mockRouteProgress(0.0))
+        routeProgressObserver.captured.onRouteProgressChanged(mockRouteProgress())
 
         val pushedEvents = slot<List<ReplayEventBase>>()
         verify { replayer.pushEvents(capture(pushedEvents)) }
@@ -200,7 +198,7 @@ class ReplayRouteSessionTest {
             replayEventsObserver.captured.replayEvents(firstArg())
             replayer
         }
-        val routeProgress = mockRouteProgress(0.0)
+        val routeProgress = mockRouteProgress()
 
         sut.setOptions(
             ReplayRouteSessionOptions.Builder()
@@ -301,18 +299,18 @@ class ReplayRouteSessionTest {
         progressObserver.captured.onRouteProgressChanged(
             mockk {
                 every { navigationRoute } returns primaryRoute
-                every { distanceTraveled } returns 100.0f
+                every { currentRouteGeometryIndex } returns 15
             }
         )
         routesObserver.captured.onRoutesChanged(activeRoutes)
 
         val pushedEvents = slot<List<ReplayEventBase>>()
         verify { replayer.pushEvents(capture(pushedEvents)) }
-        verifyDistanceTraveled(pushedEvents.captured, primaryRoute, 100.0)
+        verifySkipToIndex(pushedEvents.captured, primaryRoute, 15)
     }
 
     @Test
-    fun `onAttached - should skip to short routeProgress distanceTraveled`() {
+    fun `onAttached - should skip to short routeProgress currentRouteGeometryIndex`() {
         val progressObserver = slot<RouteProgressObserver>()
         val routesObserver = slot<RoutesObserver>()
         every {
@@ -326,38 +324,37 @@ class ReplayRouteSessionTest {
         progressObserver.captured.onRouteProgressChanged(
             mockk {
                 every { navigationRoute } returns primaryRoute
-                every { distanceTraveled } returns 40.0f
+                every { currentRouteGeometryIndex } returns 12
             }
         )
         routesObserver.captured.onRoutesChanged(activeRoutes)
 
         val pushedEvents = slot<List<ReplayEventBase>>()
         verify { replayer.pushEvents(capture(pushedEvents)) }
-        verifyDistanceTraveled(pushedEvents.captured, primaryRoute, 40.0)
+        verifySkipToIndex(pushedEvents.captured, primaryRoute, 12)
     }
 
-    private fun verifyDistanceTraveled(
+    private fun verifySkipToIndex(
         pushedEvents: List<ReplayEventBase>,
         primaryRoute: NavigationRoute,
-        distanceTraveled: Double
+        currentRouteGeometryIndex: Int
     ) {
         val geometry = primaryRoute.directionsRoute.geometry()!!
         val fullRoute = PolylineUtils.decode(geometry, 6)
-        val expected = TurfMeasurement.along(fullRoute, distanceTraveled, TurfConstants.UNIT_METERS)
+        val expected = fullRoute[currentRouteGeometryIndex]
         val firstReplayLocation = (pushedEvents.first() as ReplayEventUpdateLocation).location
         val firstReplayPoint = Point.fromLngLat(firstReplayLocation.lon, firstReplayLocation.lat)
-        val distanceToPoint = TurfMeasurement.distance(expected, firstReplayPoint)
 
-        assertTrue("1.0 > $distanceToPoint", 1.0 > distanceToPoint)
+        assertEquals(expected, firstReplayPoint)
     }
 
     private fun mockActiveRoutesUpdatedResult(): RoutesUpdatedResult = mockk {
         every { navigationRoutes } returns listOf(mockNavigationRoute())
     }
 
-    private fun mockRouteProgress(traveled: Double): RouteProgress = mockk {
+    private fun mockRouteProgress(): RouteProgress = mockk {
         every { navigationRoute } returns mockNavigationRoute()
-        every { distanceTraveled } returns traveled.toFloat()
+        every { currentRouteGeometryIndex } returns 0
     }
 
     private fun mockNavigationRoute(): NavigationRoute = mockk {