[iOS] Update dependencies for v3.11.0-beta.1 (#9639)

Author: ArtemStepuk

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## 3.11.0-beta.1
 
+### Packaging
+
+* MapboxNavigationCore now requires [MapboxMaps v11.14.0-beta.1](https://github.com/mapbox/mapbox-maps-ios/releases/tag/11.14.0-beta.1)
+* MapboxNavigationCore now requires [MapboxNavigationNative v324.14.0-beta.1](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/v324.14.0-beta.1)
+
 ### Map
 
 * Added experimental custom route callouts API accessible when importing MapboxNavigationCore with `@_spi(ExperimentalMapboxAPI) import MapboxNavigationCore`. Enable it by setting `NavigationMapView.apiRouteCalloutViewProviderEnabled` to `true`, then configure using `NavigationMapView.routeCalloutViewProvider` property. New `NavigationMapView.showRoutes(_:)` and `NavigationMapView.showcaseRoutes(_:routesPresentationStyle:animated:duration:)` methods are available without `routeAnnotationKinds` parameter but original methods `NavigationMapView.show(_:routeAnnotationKinds:)` and `NavigationMapView.showcase(_:routesPresentationStyle:routeAnnotationKinds:animated:duration:)` also work and their `routeAnnotationKinds` parameter is ignored when `NavigationMapView.apiRouteCalloutViewProviderEnabled` is set to `true`.
@@ -11,6 +16,8 @@
 ### Routing
 
 * Added the ability to disable the server-side control on refreshed route expiration.
+* Dead Reckoning is improved - more robust models for GNSS trust, road calibration, and wheel speed trust.
+* Improved main thread utilization by removing unintended locks (visible on systems with the overloaded CPU).
 
 ### Other changes
 

Package.swift

@@ -3,8 +3,8 @@
 
 import PackageDescription
 
-let (navNativeVersion, navNativeChecksum, navNativeRevision) = ("324.14.0-alpha.1", "b1767c0e0bd354c56007aae75843aca409e7ab0bb21384947e03d390a14366fc", "4b34fea46345862730d6e35709d693d1c3d36c50")
-let mapsVersion: Version = "11.14.0-alpha.1"
+let (navNativeVersion, navNativeChecksum, navNativeRevision) = ("324.14.0-beta.1", "25c77f16d18523bbe7482dfbf081f9dd6f21f67d957d60e414b2250cd68b4bed", "0cd10e12467d3bbc3744bc28554b7694d591cd78")
+let mapsVersion: Version = "11.14.0-beta.1"
 
 let package = Package(
     name: "MapboxNavigation",

Sources/MapboxNavigationCore/Navigator/Internals/CoreNavigator/CoreNavigator.swift

@@ -297,17 +297,18 @@ final class NativeNavigator: CoreNavigator, @unchecked Sendable {
         }
 
         let refreshObserver = NavigatorRouteRefreshObserver(
-            refreshCallback: { [weak self] routeIdPrefix, routeIndex, _ in
+            refreshCallback: { [weak self] routeId in
                 guard let self else { return nil }
 
                 guard let primaryRoute = navigator.native.getPrimaryRoute() else { return nil }
                 let alternativeRoutes = navigator.native.getAlternativeRoutes()
 
-                if primaryRoute.matching(routeIdPrefix: routeIdPrefix, routeIndex: routeIndex) {
+                if primaryRoute.getRouteId() == routeId {
                     return .mainRoute(primaryRoute)
                 }
+
                 if let refreshedAlternative = alternativeRoutes.first(where: {
-                    $0.route.matching(routeIdPrefix: routeIdPrefix, routeIndex: routeIndex)
+                    $0.route.getRouteId() == routeId
                 }) {
                     return .alternativeRoute(alternative: refreshedAlternative)
                 }
@@ -522,10 +523,3 @@ enum NativeNavigatorError: Swift.Error {
     case failedToUpdateRoutes(reason: String)
     case failedToUpdateAlternativeRoutes(reason: String)
 }
-
-extension RouteInterface {
-    fileprivate func matching(routeIdPrefix: String, routeIndex: UInt32) -> Bool {
-        // TODO: (NN-3674) use full routeId instead of just prefix.
-        getRouteId().starts(with: routeIdPrefix) && getRouteIndex() == routeIndex
-    }
-}

Sources/MapboxNavigationCore/Navigator/Internals/CoreNavigator/NavigatorRouteRefreshObserver.swift

@@ -8,21 +8,22 @@ enum RouteRefreshResult: @unchecked Sendable {
 }
 
 class NavigatorRouteRefreshObserver: RouteRefreshObserver, @unchecked Sendable {
-    typealias RefreshCallback = (String, UInt32, UInt32) -> RouteRefreshResult?
+    typealias RefreshCallback = (String) -> RouteRefreshResult?
     private var refreshCallback: RefreshCallback
 
     init(refreshCallback: @escaping RefreshCallback) {
         self.refreshCallback = refreshCallback
     }
 
     func onRouteRefreshAnnotationsUpdated(
-        forRouteId routeId: String,
+        for routeIdentifier: RouteIdentifier,
         routeRefreshResponse: String,
-        routeIndex: UInt32,
         legIndex: UInt32,
         routeGeometryIndex: UInt32
     ) {
-        guard let routeRefreshResult = refreshCallback(routeId, routeIndex, legIndex) else {
+        let routeId = routeIdentifier.getRouteId()
+        let routeIndex = routeIdentifier.index
+        guard let routeRefreshResult = refreshCallback(routeId) else {
             return
         }
 
@@ -41,19 +42,19 @@ class NavigatorRouteRefreshObserver: RouteRefreshObserver, @unchecked Sendable {
         }
     }
 
-    func onRouteRefreshCancelled(forRouteId routeId: String) {
+    func onRouteRefreshCancelled(for routeIdentifier: RouteIdentifier) {
         let userInfo: [NativeNavigator.NotificationUserInfoKey: any Sendable] = [
-            .refreshRequestIdKey: routeId,
+            .refreshRequestIdKey: routeIdentifier.getRouteId(),
         ]
         onMainAsync {
             NotificationCenter.default.post(name: .routeRefreshDidCancelRefresh, object: nil, userInfo: userInfo)
         }
     }
 
-    func onRouteRefreshFailed(forRouteId routeId: String, error: RouteRefreshError) {
+    func onRouteRefreshFailed(for routeIdentifier: RouteIdentifier, error: RouteRefreshError) {
         let userInfo: [NativeNavigator.NotificationUserInfoKey: any Sendable] = [
             .refreshRequestErrorKey: error,
-            .refreshRequestIdKey: routeId,
+            .refreshRequestIdKey: routeIdentifier.getRouteId(),
         ]
         onMainAsync {
             NotificationCenter.default.post(name: .routeRefreshDidFailRefresh, object: nil, userInfo: userInfo)

Sources/MapboxNavigationCore/Version.swift

@@ -1,6 +1,6 @@
 import Foundation
 
 extension Bundle {
-    public static let mapboxNavigationVersion: String = "3.11.0-alpha.1"
+    public static let mapboxNavigationVersion: String = "3.11.0-beta.1"
     public static let mapboxNavigationUXBundleIdentifier: String = "com.mapbox.navigationUX"
 }