Update NavNative to 124.0

NavNative breaking changes in RoadName structure required adaptation
on SDK side. As part of this: RoadName and Shield was updated to match
native side.

Author: S2Ler

Example/ViewController+FreeDrive.swift

@@ -158,14 +158,7 @@ extension ViewController {
         guard let metadata = passiveLocationManager?.roadGraph.edgeMetadata(edgeIdentifier: identifier) else {
             return []
         }
-        let names = metadata.names.map { name -> String in
-            switch name {
-            case .name(let name):
-                return name
-            case .code(let code):
-                return "(\(code))"
-            }
-        }
+        let names = metadata.names.map(\.text)
 
         // If the road is unnamed, fall back to the road class.
         if names.isEmpty {

MapboxNavigation-SPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -24,8 +24,8 @@ let package = Package(
     dependencies: [
         .package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", .exact("2.9.0-rc.2")),
         .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: "123.1.0"),
-        .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.10.1"),
+        .package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "124.0.0"),
+        .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", .exact("10.11.0-beta.1")),
         .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"),
         .package(name: "CwlPreconditionTesting", url: "https://github.com/mattgallagher/CwlPreconditionTesting.git", from: "2.1.0"),

Package.resolved

@@ -160,7 +160,7 @@ extension RoadGraph.Edge {
             self.roadClasses = roadClasses
 
             isBridge = native.isBridge
-            names = native.names.map(RoadName.init)
+            names = native.names.compactMap(RoadName.init)
             laneCount = native.laneCount as? UInt
             altitude = native.meanElevation as? Double
             curvature = UInt(native.curvature)

Package.swift

@@ -1,31 +1,42 @@
 import Foundation
 import MapboxNavigationNative
 
-/**
- A human-readable name or route reference code that identifies a road.
- 
- - note: The Mapbox Electronic Horizon feature of the Mapbox Navigation SDK is in public beta and is subject to changes, including its pricing. Use of the feature is subject to the beta product restrictions in the Mapbox Terms of Service. Mapbox reserves the right to eliminate any free tier or free evaluation offers at any time and require customers to place an order to purchase the Mapbox Electronic Horizon feature, regardless of the level of use of the feature.
- */
-public enum RoadName {
-    /**
-     A road name.
-     
-     If you display a name to the user, you may need to abbreviate common words like “East” or “Boulevard” to ensure that it fits in the allotted space.
-     */
-    case name(_ name: String)
-    
-    /**
-     A route reference code assigned to a road.
-     
-     A route reference code commonly consists of an alphabetic network code, a space or hyphen, and a route number. You should not assume that the network code is globally unique: for example, a network code of “NH” may indicate a “National Highway” or “New Hampshire”. Moreover, a route number may not even uniquely identify a route within a given network.
-     */
-    case code(_ code: String)
+/// Road information, like Route number, street name, shield information, etc.
+///
+/// - note: The Mapbox Electronic Horizon feature of the Mapbox Navigation SDK is in public beta
+/// and is subject to changes, including its pricing. Use of the feature is subject to the beta product restrictions
+/// in the Mapbox Terms of Service. Mapbox reserves the right to eliminate any free tier or free evaluation offers at
+/// any time and require customers to place an order to purchase the Mapbox Electronic Horizon feature, regardless of
+/// the level of use of the feature.
+public struct RoadName {
+    /// The name of the road.
+    ///
+    /// If you display a name to the user, you may need to abbreviate common words like “East” or “Boulevard” to ensure
+    /// that it fits in the allotted space.
+    public let text: String
 
-    init(_ native: MapboxNavigationNative.RoadName) {
-        if native.isShielded {
-            self = .code(native.name)
-        } else {
-            self = .name(native.name)
-        }
+    /// 2 letters language code or "Unspecified" or empty string
+    public let language: String
+
+    /// Shield information of the road
+    public let shield: RoadShield?
+
+    /// Creates a new `RoadName` instance.
+    /// - Parameters:
+    ///   - text: The name of the road.
+    ///   - language: 2 letters language code or "Unspecified" or empty string
+    ///   - shield: Shield information of the road
+    public init(text: String, language: String, shield: RoadShield? = nil) {
+        self.text = text
+        self.language = language
+        self.shield = shield
+    }
+
+    init?(_ native: MapboxNavigationNative.RoadName) {
+        guard native.text != "/" else { return nil }
+
+        self.shield = native.shield.map(RoadShield.init)
+        self.text = native.text
+        self.language = native.language
     }
 }

Sources/MapboxCoreNavigation/EHorizon/RoadGraphEdgeMetadata.swift

@@ -0,0 +1,42 @@
+import MapboxNavigationNative
+
+/// Describes a road shield information.
+///
+/// - note: The Mapbox Electronic Horizon feature of the Mapbox Navigation SDK is in public beta
+/// and is subject to changes, including its pricing. Use of the feature is subject to the beta product restrictions
+/// in the Mapbox Terms of Service. Mapbox reserves the right to eliminate any free tier or free evaluation offers at
+/// any time and require customers to place an order to purchase the Mapbox Electronic Horizon feature, regardless of
+/// the level of use of the feature.
+public struct RoadShield {
+    /// The base url for a shield image.
+    public let baseUrl: String
+
+    /// The shield display reference.
+    public let displayRef: String
+
+    /// The shield text.
+    public let name: String
+
+    /// The shield text color.
+    public let textColor: String
+
+    /// Creates a new `Shield` instance.
+    /// - Parameters:
+    ///   - baseUrl: The base url for a shield image.
+    ///   - displayRef: The shield display reference.
+    ///   - name: The shield text.
+    ///   - textColor: The shield text color.
+    public init(baseUrl: String, displayRef: String, name: String, textColor: String) {
+        self.baseUrl = baseUrl
+        self.displayRef = displayRef
+        self.name = name
+        self.textColor = textColor
+    }
+
+    init(_ native: MapboxNavigationNative.Shield) {
+        self.baseUrl = native.baseUrl
+        self.name = native.name
+        self.displayRef = native.displayRef
+        self.textColor = native.textColor
+    }
+}

Sources/MapboxCoreNavigation/EHorizon/RoadName.swift

@@ -19,7 +19,7 @@ public final class TestNavigationStatusProvider {
                                               activeGuidanceInfo: ActiveGuidanceInfo? = nil) -> NavigationStatus {
         let fixLocation = FixLocation(location ?? CLLocation(latitude: 37.788443, longitude: -122.4020258))
         let shield = Shield(baseUrl: "shield_url", displayRef: "ref", name: "shield", textColor: "")
-        let road = MapboxNavigationNative.Road(text: "name", imageBaseUrl: "base_image_url", shield: shield)
+        let road = MapboxNavigationNative.RoadName(text: "name", language: "lang", imageBaseUrl: "base_image_url", shield: shield)
         let mapMatch = MapMatch(position: .init(edgeId: 0, percentAlong: 0), proba: 42)
         let mapMatcherOutput = MapMatcherOutput(matches: [mapMatch], isTeleport: false)
         return .init(routeState: routeState,