Use skip index

Author: kmadsen

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

@@ -96,19 +96,11 @@ class ReplayPolylineDecodeStream(
     }
 
     /**
-     * Skip the next [minDistance] of the geometry. Similar to decode except that this does not
+     * Skip the next [count] points of the geometry. Similar to decode except that this does not
      * hold any points in memory.
      */
-    fun skip(
-        minDistance: Double,
-        @TurfConstants.TurfUnitCriteria units: String = TurfConstants.UNIT_KILOMETERS
-    ) {
-        var travelled = 0.0
-        current?.let { if (minDistance > 0.0 && hasNext()) next() }
-        while (travelled < minDistance && hasNext()) {
-            val previous = current
-            val next = next()
-            travelled += previous?.let { TurfMeasurement.distance(previous, next, units) } ?: 0.0
-        }
+    fun skip(count: Int) {
+        var skipped = 0
+        while (skipped++ < count && hasNext()) { next() }
     }
 }

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

@@ -19,6 +19,7 @@ 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.*
@@ -156,9 +157,12 @@ class ReplayRouteSession : MapboxNavigationObserver {
             }
             return
         }
-        val distanceTraveled = routeProgress.distanceTraveled.toDouble()
         polylineDecodeStream = ReplayPolylineDecodeStream(geometry, 6)
-        polylineDecodeStream.skip(distanceTraveled, TurfConstants.UNIT_METERS)
+
+        // Skip up to the current geometry index. There is some imprecision here because the
+        // distance traveled is not equal to a route index.
+        polylineDecodeStream.skip(routeProgress.currentRouteGeometryIndex)
+
         pushMorePoints()
     }