wip

Author: RingerJK

CHANGELOG.md

@@ -6,6 +6,8 @@ Mapbox welcomes participation and contributions from everyone.
 #### Features
 #### Bug fixes and improvements
 
+:warning: `RouteProgress#remainingWaypoints` defines the amount of all remaining waypoints, include explicit (requested with `RouteOptions#coorinatesList`) and implicit (added on the fly, like Electric Vehicle waypoints - [see](https://docs.mapbox.com/api/navigation/directions/#electric-vehicle-routing)).
+
 ## Mapbox Navigation SDK 2.9.0-beta.3 - 21 October, 2022
 ### Changelog
 [Changes between v2.9.0-beta.2 and v2.9.0-beta.3](https://github.com/mapbox/mapbox-navigation-android/compare/v2.9.0-beta.2...v2.9.0-beta.3)

libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/extensions/WaypointEx.kt

@@ -1,5 +1,3 @@
-@file:JvmName("WaypointEx")
-
 package com.mapbox.navigation.base.internal.extensions
 
 import com.mapbox.api.directions.v5.models.DirectionsRoute
@@ -12,7 +10,7 @@ import com.mapbox.navigation.base.trip.model.RouteProgress
  */
 fun List<Waypoint>.requestedWaypoints(): List<Waypoint> =
     this.filter {
-        when(it.type) {
+        when (it.type) {
             Waypoint.REGULAR,
             Waypoint.SILENT -> true
             Waypoint.EV_CHARGING -> false
@@ -26,7 +24,7 @@ fun List<Waypoint>.requestedWaypoints(): List<Waypoint> =
  */
 fun List<Waypoint>.legsWaypoints(): List<Waypoint> =
     this.filter {
-        when(it.type) {
+        when (it.type) {
             Waypoint.REGULAR,
             Waypoint.EV_CHARGING -> true
             Waypoint.SILENT -> false

libnavigation-base/src/main/java/com/mapbox/navigation/base/trip/model/RouteProgress.kt

@@ -33,7 +33,9 @@ import com.mapbox.navigation.base.trip.model.roadobject.UpcomingRoadObject
  * @param durationRemaining [Double] seconds time remaining until the route destination is reached.
  * @param fractionTraveled [Float] fraction traveled along the current route. This value is
  * between 0 and 1 and isn't guaranteed to reach 1 before the user reaches the end of the route.
- * @param remainingWaypoints [Int] number of waypoints remaining on the current route.
+ * @param remainingWaypoints [Int] number of waypoints remaining on the current route. The waypoints number can be different
+ * with number of requested coordinates. For instance, [EV routing](https://docs.mapbox.com/api/navigation/directions/#electric-vehicle-routing)
+ * is adding additional waypoints, that are not requested explicitly.
  * @param upcomingRoadObjects list of upcoming road objects.
  * @param stale `true` if there were no location updates for a significant amount which causes
  * a lack of confidence in the progress updates being sent.

libnavigation-core/src/main/java/com/mapbox/navigation/core/routeoptions/RouteOptionsUpdater.kt

@@ -52,7 +52,7 @@ class RouteOptionsUpdater {
         val (nextCoordinateIndex, remainingCoordinates) = indexOfNextRequestedCoordinate(
             routeProgress.navigationRoute.internalWaypoints(),
             routeProgress.remainingWaypoints,
-        ).let { it ->
+        ).let {
             if (it == null) {
                 val msg = "Index of next coordinate is not defined"
                 logE(msg, LOG_CATEGORY)
@@ -93,14 +93,10 @@ class RouteOptionsUpdater {
                         if (radiusesList.isNullOrEmpty()) {
                             return@radiusesList emptyList<Double?>()
                         }
-                        mutableListOf<Double?>().also {
-                            it.addAll(
-                                radiusesList.subList(
-                                    nextCoordinateIndex - 1,
-                                    coordinatesList.size
-                                )
-                            )
-                        }
+                        radiusesList.subList(
+                            nextCoordinateIndex - 1,
+                            coordinatesList.size
+                        )
                     }
                 )
                 .approachesList(

libnavigation-core/src/test/java/com/mapbox/navigation/core/routeoptions/RouteOptionsUpdaterTest.kt

@@ -458,14 +458,14 @@ class RouteOptionsUpdaterTest {
         fun setup() {
             MockKAnnotations.init(this, relaxUnitFun = true, relaxed = true)
             mockLocation()
-            mockkStatic("com.mapbox.navigation.base.internal.extensions.WaypointEx")
+            mockkStatic(::indexOfNextRequestedCoordinate)
 
             routeRefreshAdapter = RouteOptionsUpdater()
         }
 
         @After
         fun cleanup() {
-            unmockkStatic("com.mapbox.navigation.base.internal.extensions.WaypointEx")
+            unmockkStatic(::indexOfNextRequestedCoordinate)
         }
 
         @Test