Update to Mapbox Maps v10.0.0-rc.8, Navigation Native 66.0.0 and Common 18.0.0.

CHANGELOG.md

@@ -11,10 +11,10 @@
 
 * The Mapbox Navigation SDK for iOS license has changed from the ISC License to the Mapbox Terms of Service. ([#2808](https://github.com/mapbox/mapbox-navigation-ios/pull/2808))
 * You can now install MapboxNavigation using Swift Package Manager, but you can no longer install it using Carthage. If you previously installed MapboxNavigation using Carthage, use Swift Package Manager instead. ([#2808](https://github.com/mapbox/mapbox-navigation-ios/pull/2808))
-* MapboxNavigation now depends on [MapboxMaps v10.0.0-rc.7](https://github.com/mapbox/mapbox-maps-ios/). ([#3297](https://github.com/mapbox/mapbox-navigation-ios/pull/3297))
-* MapboxNavigation now depends on MapboxNavigationNative v65.0.1. ([#3320](https://github.com/mapbox/mapbox-navigation-ios/pull/3320))
-* MapboxNavigation now depends on MapboxCommon v17.1.0. ([#3297](https://github.com/mapbox/mapbox-navigation-ios/pull/3297))
 * MapboxNavigation now depends on MapboxMobileEvents v1.0.3. ([#3320](https://github.com/mapbox/mapbox-navigation-ios/pull/3320))
+* MapboxNavigation now depends on [MapboxMaps v10.0.0-rc.8](https://github.com/mapbox/mapbox-maps-ios/). ([#3342](https://github.com/mapbox/mapbox-navigation-ios/pull/3342))
+* MapboxNavigation now depends on MapboxNavigationNative v66.0.0. ([#3342](https://github.com/mapbox/mapbox-navigation-ios/pull/3342))
+* MapboxNavigation now depends on MapboxCommon v18.0.0. ([#3342](https://github.com/mapbox/mapbox-navigation-ios/pull/3342))
 * MapboxCoreNavigation depends on MapboxDirections v2.0.0-rc.1. ([#3325](https://github.com/mapbox/mapbox-navigation-ios/pull/3325))
 * MapboxCoreNavigation no longer depends on MapboxAccounts. ([#2829](https://github.com/mapbox/mapbox-navigation-ios/pull/2829))
 * MapboxNavigation now depends on Turf v2.0.0-rc.1. ([#3248](https://github.com/mapbox/mapbox-navigation-ios/pull/3248))
@@ -178,6 +178,7 @@
 * Feedback categories and subcategories for active navigation were changed. "Incorrect visual" category was renamed to "Looks Incorrect". For the full updated list of supported categories see enum `ActiveNavigationFeedbackType`. ([#3339]((https://github.com/mapbox/mapbox-navigation-ios/pull/3339))
 * Fixed bundle names retrieval in `URLSession.userAgent`. ([#3335]((https://github.com/mapbox/mapbox-navigation-ios/pull/3335))
 * Fixed IndexedRouteResponse handling after rerouting. ([#3344]((https://github.com/mapbox/mapbox-navigation-ios/pull/3344))
+* Renamed the `Router.advanceLegIndex()` method to `Router.advanceLegIndex(completionHandler:)` and the `PassiveLocationDataSource.updateLocation(_:)` method to `PassiveLocationManager.updateLocation(_:completionHandler:)`. These methods are now asynchronous, and their completion handlers indicate whether the operation succeeded. ([#3344](https://github.com/mapbox/mapbox-navigation-ios/pull/3344))
 
 ## v1.4.1
 

Cartfile

@@ -1,5 +1,5 @@
-binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" ~> 17.1.0
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 65.0
+binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" ~> 18.0.0
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 66.0
 github "mapbox/mapbox-directions-swift" "v2.0.0-rc.1"
 github "mapbox/turf-swift" "v2.0.0-rc.1"
 github "mapbox/mapbox-events-ios" ~> 1.0.0

Cartfile.resolved

@@ -1,5 +1,5 @@
-binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "17.1.0"
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "65.0.2"
+binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "18.0.0"
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "66.0.1"
 github "Quick/Nimble" "v9.2.1"
 github "Quick/Quick" "v3.1.2"
 github "Udumft/SwiftCLI" "da19d2a16cd5aa838d8fb7256e28c171bc67dd82"

Example/ViewController+FreeDrive.swift

@@ -104,7 +104,7 @@ extension ViewController {
             var layer = LineLayer(id: styledFeature.layerIdentifier)
             layer.source = styledFeature.sourceIdentifier
             layer.lineWidth = .constant(styledFeature.lineWidth)
-            layer.lineColor = .constant(.init(color: styledFeature.color))
+            layer.lineColor = .constant(.init(styledFeature.color))
             try style.addLayer(layer)
         } catch {
             NSLog("Failed to perform operation with error: \(error.localizedDescription).")

MapboxCoreNavigation.podspec

@@ -40,7 +40,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.module_name = "MapboxCoreNavigation"
 
-  s.dependency "MapboxNavigationNative", "~> 65.0"
+  s.dependency "MapboxNavigationNative", "~> 66.0"
   s.dependency "MapboxDirections-pre", "2.0.0-rc.1"
   s.dependency "MapboxMobileEvents", "~> 1.0.0" # Always specify a patch release if pre-v1.0
   s.dependency "Turf", "2.0.0-rc.1"

MapboxNavigation-Documentation.podspec

@@ -46,9 +46,9 @@ Pod::Spec.new do |s|
   s.frameworks = ['CarPlay']
 
   s.dependency "MapboxDirections-pre", "2.0.0-rc.1"
-  s.dependency "MapboxMaps", "10.0.0-rc.7"
+  s.dependency "MapboxMaps", "10.0.0-rc.8"
   s.dependency "MapboxMobileEvents", "~> 1.0.0"
-  s.dependency "MapboxNavigationNative", "~> 65.0"
+  s.dependency "MapboxNavigationNative", "~> 66.0"
   s.dependency "Solar-dev", "~> 3.0"
   s.dependency "Turf", "2.0.0-rc.1"
   s.dependency "MapboxSpeech-pre", "2.0.0-rc.1"

MapboxNavigation.podspec

@@ -44,7 +44,7 @@ Pod::Spec.new do |s|
   s.module_name = "MapboxNavigation"
 
   s.dependency "MapboxCoreNavigation", "#{s.version.to_s}"
-  s.dependency "MapboxMaps", "10.0.0-rc.7"
+  s.dependency "MapboxMaps", "10.0.0-rc.8"
   s.dependency "Solar-dev", "~> 3.0"
   s.dependency "MapboxSpeech-pre", "2.0.0-rc.1"
   s.dependency "MapboxMobileEvents", "~> 1.0.0" # Always specify a patch release if pre-v1.0

Package.swift

@@ -24,8 +24,8 @@ let package = Package(
     dependencies: [
         .package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", .exact("2.0.0-rc.1")),
         .package(name: "MapboxMobileEvents", url: "https://github.com/mapbox/mapbox-events-ios.git", from: "1.0.0"),
-        .package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "65.0.0"),
-        .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", .exact("10.0.0-rc.7")),
+        .package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "66.0.0"),
+        .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", .exact("10.0.0-rc.8")),
         .package(name: "Solar", url: "https://github.com/ceeK/Solar.git", from: "3.0.0"),
         .package(name: "MapboxSpeech", url: "https://github.com/mapbox/mapbox-speech-swift.git", from: "2.0.0-rc.1"),
         .package(name: "Quick", url: "https://github.com/Quick/Quick.git", from: "3.1.2"),

Sources/MapboxCoreNavigation/CoreNavigationNavigator.swift

@@ -22,7 +22,9 @@ class Navigator {
                                                           cache: cacheHandle,
                                                           historyRecorder: historyRecorder)
     }()
-
+
+    var mostRecentNavigationStatus: NavigationStatus? = nil
+
     private(set) var tileStore: TileStore
 
     /**
@@ -272,5 +274,7 @@ extension Navigator: NavigatorObserver {
             .statusKey: status,
         ]
         NotificationCenter.default.post(name: .navigationStatusDidChange, object: nil, userInfo: userInfo)
+
+        mostRecentNavigationStatus = status
     }
 }

Sources/MapboxCoreNavigation/EHorizon/DistancedRoadObject.swift

@@ -102,31 +102,32 @@ public enum DistancedRoadObject {
     }
 
     init(_ native: MapboxNavigationNative.RoadObjectDistance) {
-        if native.distanceInfo.isPointDistanceInfo() {
+        switch native.distanceInfo.type {
+        case .pointDistanceInfo:
             let info = native.distanceInfo.getPointDistanceInfo()
             self = .point(identifier: native.roadObjectId,
                           kind: RoadObject.Kind(native.type),
                           distance: info.distance)
-        } else if native.distanceInfo.isGantryDistanceInfo() {
+        case .gantryDistanceInfo:
             let info = native.distanceInfo.getGantryDistanceInfo()
             self = .gantry(identifier: native.roadObjectId,
                            kind: RoadObject.Kind(native.type),
                            distance: info.distance)
-        } else if native.distanceInfo.isPolygonDistanceInfo() {
+        case .polygonDistanceInfo:
             let info = native.distanceInfo.getPolygonDistanceInfo()
             self = .polygon(identifier: native.roadObjectId,
                             kind: RoadObject.Kind(native.type),
                             distanceToNearestEntry: info.entrances.first?.distance,
                             distanceToNearestExit: info.exits.first?.distance,
                             isInside: info.isInside)
-        } else if native.distanceInfo.isSubGraphDistanceInfo() {
+        case .subGraphDistanceInfo:
             let info = native.distanceInfo.getSubGraphDistanceInfo()
             self = .subgraph(identifier: native.roadObjectId,
                              kind: RoadObject.Kind(native.type),
                              distanceToNearestEntry: info.entrances.first?.distance,
                              distanceToNearestExit: info.exits.first?.distance,
                              isInside: info.isInside)
-        } else if native.distanceInfo.isLineDistanceInfo() {
+        case .lineDistanceInfo:
             let info = native.distanceInfo.getLineDistanceInfo()
             self = .line(identifier: native.roadObjectId,
                          kind: RoadObject.Kind(native.type),
@@ -135,7 +136,7 @@ public enum DistancedRoadObject {
                          distanceToEnd: info.distanceToEnd,
                          isEntryFromStart: info.isEntryFromStart,
                          length: info.length)
-        } else {
+        @unknown default:
             preconditionFailure("DistancedRoadObject can't be constructed. Unknown type.")
         }
     }

Sources/MapboxCoreNavigation/EHorizon/RoadObjectLocation.swift

@@ -77,45 +77,46 @@ extension RoadObject {
         case routeAlert(shape: Turf.Geometry)
 
         init(_ native: MapboxNavigationNative.MatchedRoadObjectLocation) {
-            if native.isOpenLRLineLocation() {
+            switch native.type {
+            case .openLRLineLocation:
                 let location = native.getOpenLRLineLocation()
                 self = .openLRLine(path: RoadGraph.Path(location.getPath()),
                                    shape: Geometry(location.getShape()))
-            } else if native.isOpenLRPointAlongLineLocation() {
+            case .openLRPointAlongLineLocation:
                 let location = native.getOpenLRPointAlongLineLocation()
                 self = .openLRPoint(position: RoadGraph.Position(location.getPosition()),
                                     sideOfRoad: OpenLRSideOfRoad(location.getSideOfRoad()),
                                     orientation: OpenLROrientation(location.getOrientation()),
                                     coordinate: location.getCoordinate())
-            } else if native.isMatchedPolylineLocation() {
+            case .matchedPolylineLocation:
                 let location = native.getMatchedPolylineLocation()
                 self = .polyline(path: RoadGraph.Path(location.getPath()),
                                  shape: Geometry(location.getShape()))
-            } else if native.isMatchedGantryLocation() {
+            case .matchedGantryLocation:
                 let location = native.getMatchedGantryLocation()
                 self = .gantry(positions: location.getPositions().map(RoadObject.Position.init),
                                shape: Geometry(location.getShape()))
-            } else if native.isMatchedPolygonLocation() {
+            case .matchedPolygonLocation:
                 let location = native.getMatchedPolygonLocation()
                 self = .polygon(entries: location.getEntries().map(RoadObject.Position.init),
                                 exits: location.getExits().map(RoadObject.Position.init),
                                 shape: Geometry(location.getShape()))
-            } else if native.isMatchedPointLocation() {
+            case .matchedPointLocation:
                 let location = native.getMatchedPointLocation()
                 self = .point(position: RoadObject.Position(location.getPosition()))
-            } else if native.isRouteAlert() {
-                let location = native.getRouteAlert()
-                self = .routeAlert(shape: Geometry(location.getShape()))
-            } else if native.isMatchedSubgraphLocation() {
+            case .matchedSubgraphLocation:
                 let location = native.getMatchedSubgraphLocation()
                 let edges = location.getEdges()
                     .map { (id, edge) in (UInt(truncating: id), RoadGraph.SubgraphEdge(edge)) }
                 self = .subgraph(enters: location.getEnters().map(RoadObject.Position.init),
                                  exits: location.getExits().map(RoadObject.Position.init),
                                  shape: Geometry(location.getShape()),
                                  edges: .init(uniqueKeysWithValues: edges))
-            } else {
-                preconditionFailure("RoadObject.Location can't be constructed. Unknown type.")
+            case .routeAlertLocation:
+                let routeAlertLocation = native.getRouteAlert()
+                self = .routeAlert(shape: Geometry(routeAlertLocation.getShape()))
+            @unknown default:
+                preconditionFailure("RoadObjectLocation can't be constructed. Unknown type.")
             }
         }
     }

Sources/MapboxCoreNavigation/EHorizon/RoadObjectStore.swift

@@ -89,7 +89,9 @@ public final class RoadObjectStore {
     }
 
     deinit {
-        native.setObserverForOptions(nil)
+        if native.hasObservers() {
+            native.removeObserver(for: self)
+        }
     }
 
     var native: MapboxNavigationNative.RoadObjectsStore {
@@ -100,9 +102,11 @@ public final class RoadObjectStore {
 
     private func updateObserver() {
         if delegate != nil {
-            native.setObserverForOptions(self)
+            native.addObserver(for: self)
         } else {
-            native.setObserverForOptions(nil)
+            if native.hasObservers() {
+                native.removeObserver(for: self)
+            }
         }
     }
 }

Sources/MapboxCoreNavigation/LegacyRouteController.swift

@@ -219,7 +219,7 @@ open class LegacyRouteController: NSObject, Router, InternalRouter, CLLocationMa
         return isCloseToCurrentStep
     }
 
-    public func advanceLegIndex() {
+    public func advanceLegIndex(completionHandler: AdvanceLegCompletionHandler? = nil) {
         precondition(!routeProgress.isFinalLeg, "Can not increment leg index beyond final leg.")
         routeProgress.legIndex += 1
     }