NAVAND-777: fix after rebase onto alternatives refresh changes

Author: dzinad

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

@@ -559,7 +559,10 @@ class MapboxNavigation @VisibleForTesting internal constructor(
             evDynamicDataHolder
         )
         routeRefreshController.registerRouteRefreshObserver {
-            internalSetNavigationRoutes(it.routes, SetRoutes.RefreshRoutes(it.routeProgressData))
+            internalSetNavigationRoutes(
+                it.allRoutesProgressData.map { pair -> pair.first },
+                SetRoutes.RefreshRoutes(it.primaryRouteProgressData)
+            )
         }
 
         defaultRerouteController = MapboxRerouteController(

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

@@ -18,6 +18,12 @@ internal class RoutesProgressDataProvider(
     private val alternativeMetadataProvider: AlternativeMetadataProvider,
 ) {
 
+    /**
+     * Retrieved progress data for passed routes.
+     *
+     * @throws IllegalArgumentException if routes re empty
+     */
+    @Throws(IllegalArgumentException::class)
     suspend fun getRoutesProgressData(
         routes: List<NavigationRoute>
     ): RoutesProgressData {

libnavigation-core/src/main/java/com/mapbox/navigation/core/routerefresh/ExpiringDataRemover.kt

@@ -5,19 +5,28 @@ import com.mapbox.api.directions.v5.models.RouteLeg
 import com.mapbox.navigation.base.internal.route.update
 import com.mapbox.navigation.base.internal.time.parseISO8601DateToLocalTimeOrNull
 import com.mapbox.navigation.base.route.NavigationRoute
+import com.mapbox.navigation.core.RoutesProgressData
 import java.util.Date
 
 internal class ExpiringDataRemover(
     private val localDateProvider: () -> Date,
 ) {
 
-    fun removeExpiringDataFromRoutes(
-        routes: List<NavigationRoute>,
-        currentLegIndex: Int,
-    ): List<NavigationRoute> {
-        return routes.map {
-            removeExpiringDataFromRoute(it, currentLegIndex)
+    fun removeExpiringDataFromRoutesProgressData(
+        routesProgressData: RoutesProgressData,
+    ): RoutesProgressData {
+        val primaryRoute = removeExpiringDataFromRoute(
+            routesProgressData.primaryRoute,
+            routesProgressData.primaryRouteProgressData.legIndex
+        )
+        val alternativeRoutesData = routesProgressData.alternativeRoutesProgressData.map {
+            removeExpiringDataFromRoute(it.first, it.second?.legIndex ?: 0) to it.second
         }
+        return RoutesProgressData(
+            primaryRoute,
+            routesProgressData.primaryRouteProgressData,
+            alternativeRoutesData
+        )
     }
 
     private fun removeExpiringDataFromRoute(

libnavigation-core/src/main/java/com/mapbox/navigation/core/routerefresh/ImmediateRouteRefreshController.kt

@@ -26,7 +26,10 @@ internal class ImmediateRouteRefreshController(
         }
     }
 
-    fun requestRoutesRefresh(routes: List<NavigationRoute>, callback: (RouteRefresherResult) -> Unit) {
+    fun requestRoutesRefresh(
+        routes: List<NavigationRoute>,
+        callback: (RouteRefresherResult) -> Unit
+    ) {
         if (routes.isEmpty()) {
             return
         }

libnavigation-core/src/main/java/com/mapbox/navigation/core/routerefresh/RefreshObserversManager.kt

@@ -1,10 +1,11 @@
 package com.mapbox.navigation.core.routerefresh
 
+import com.mapbox.navigation.core.RoutesProgressData
 import java.util.concurrent.CopyOnWriteArraySet
 
 internal fun interface RouteRefreshObserver {
 
-    fun onRoutesRefreshed(routeInfo: RefreshedRouteInfo)
+    fun onRoutesRefreshed(routeInfo: RoutesProgressData)
 }
 
 internal class RefreshObserversManager {
@@ -25,10 +26,7 @@ internal class RefreshObserversManager {
 
     fun onRoutesRefreshed(result: RouteRefresherResult) {
         refreshObservers.forEach { observer ->
-            observer.onRoutesRefreshed(result.toRefreshedRoutesInfo())
+            observer.onRoutesRefreshed(result.refreshedRoutesData)
         }
     }
-
-    private fun RouteRefresherResult.toRefreshedRoutesInfo() =
-        RefreshedRouteInfo(refreshedRoutes, routeProgressData)
 }