Fix not hidden passed alternative

Author: kried

CHANGELOG.md

@@ -7,6 +7,10 @@
 * MapboxNavigationCore now requires [MapboxMaps v11.19.0-rc.1](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v11.19.0-rc.1)
 * MapboxNavigationCore now requires [MapboxNavigationNative v324.19.0-rc.1](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/v324.19.0-rc.1)
 
+### Routing
+
+* Fixed an issue where the passed alternative route was not hidden immediately after the deviation fork was passed.
+
 ## 3.19.0-beta.1
 
 ### Packaging

Sources/MapboxNavigationCore/Navigator/MapboxNavigator.swift

@@ -1654,7 +1654,7 @@ extension NavigationRoutes {
     mutating func updateForkPointPassed(with status: NavigationStatus) -> Bool {
         let newPassedForkPointRouteIds = Set(
             status.alternativeRouteIndices
-                .compactMap { $0.isForkPointPassed ? $0.routeId.uuid : nil }
+                .compactMap { $0.isForkPointPassed ? $0.routeId.toRouteIdString() : nil }
         )
         let oldPassedForkPointRouteIds = Set(
             allAlternativeRoutesWithIgnored

Sources/_MapboxNavigationTestHelpers/Core/AlternativeRouteMock.swift

@@ -9,9 +9,10 @@ extension AlternativeRoute {
         mainRoute: Route = .mock(),
         alternativeRoute: Route = .mock(shape: .mock(delta: (0.01, -0.01))),
         nativeRouteAlternative: RouteAlternative? = nil,
-        requestOptions: ResponseOptions? = nil
+        requestOptions: ResponseOptions? = nil,
+        routeIndex: Int = 0
     ) -> Self {
-        let nativeAlternative = nativeRouteAlternative ?? .mock(route: alternativeRoute)
+        let nativeAlternative = nativeRouteAlternative ?? .mock(route: alternativeRoute, routeIndex: routeIndex)
         let urlString = nativeAlternative.route.getRequestUri()
         let requestOptions = requestOptions ?? .mock(routeOptions: .mock(string: urlString))
         return self.init(

Sources/_MapboxNavigationTestHelpers/NavNative/RouteInterfaceMock.swift

@@ -43,7 +43,7 @@ public final class RouteInterfaceMock: RouteInterface {
 
     public convenience init(
         route: Route,
-        routeId: String = UUID().uuidString,
+        routeId: String? = nil,
         routeIndex: Int = 0
     ) {
         let json = RouteInterfaceMock.makeRoutesJson(with: [route])
@@ -57,7 +57,7 @@ public final class RouteInterfaceMock: RouteInterface {
     }
 
     public init(
-        routeId: String = UUID().uuidString,
+        routeId: String? = nil,
         responseUuid: String = UUID().uuidString,
         routeIndex: UInt32 = 0,
         responseJsonRef: DataRef = .init(data: RouteInterfaceMock.realRouteJson.data(using: .utf8)!),
@@ -71,7 +71,7 @@ public final class RouteInterfaceMock: RouteInterface {
         mapboxApi: MapboxAPI = .directions,
         directionsRouteContextRef: DataRef = DataRef(data: Data())
     ) {
-        self.routeId = routeId
+        self.routeId = routeId ?? "\(responseUuid)#\(routeIndex)"
         self.responseUuid = responseUuid
         self.routeIndex = routeIndex
         self.responseJsonRef = responseJsonRef