Fixed ProfileIdentifier comparison for the custom profile identifiers, so that route refresh is enabled for custom automobileAvoidingTraffic profiles (#4779)

Author: kried

Cartfile.resolved

@@ -1,6 +1,6 @@
 binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.11.4"
 binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "206.1.0"
-github "mapbox/mapbox-directions-swift" "v2.14.0"
+github "mapbox/mapbox-directions-swift" "v2.14.1"
 github "mapbox/turf-swift" "v2.8.0"
 github "mattgallagher/CwlPreconditionTesting" "2.2.2"
 github "pointfreeco/swift-snapshot-testing" "1.9.0"

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

@@ -22,7 +22,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", from: "2.14.0"),
+        .package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", from: "2.14.1"),
         .package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "206.0.1"),
         .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.19.0"),
         .package(name: "Solar", url: "https://github.com/ceeK/Solar.git", from: "3.0.0"),

Package.swift

@@ -272,7 +272,7 @@ open class LegacyRouteController: NSObject, Router, InternalRouter, CLLocationMa
         let options = indexedRouteResponse.validatedRouteOptions
         self.routeProgress = RouteProgress(route: indexedRouteResponse.currentRoute!, options: options)
         self.dataSource = source
-        self.refreshesRoute = options.profileIdentifier == .automobileAvoidingTraffic && options.refreshingEnabled
+        self.refreshesRoute = options.profileIdentifier.isAutomobileAvoidingTraffic && options.refreshingEnabled
         UIDevice.current.isBatteryMonitoringEnabled = true
 
         super.init()

Sources/MapboxCoreNavigation/LegacyRouteController.swift

@@ -468,21 +468,29 @@ public class MapboxRoutingProvider: RoutingProvider {
 }
 
 extension ProfileIdentifier {
-    var nativeProfile: RoutingProfile {
-        var mode: RoutingMode
+    var isCycling: Bool {
+        rawValue.hasSuffix("cycling")
+    }
+
+    var mode: RoutingMode {
         switch self {
-        case .automobile:
-            mode = .driving
-        case .automobileAvoidingTraffic:
-            mode = .drivingTraffic
-        case .cycling:
-            mode = .cycling
-        case .walking:
-            mode = .walking
+        case _ where isAutomobile:
+            return .driving
+        case _ where isAutomobileAvoidingTraffic:
+            return .drivingTraffic
+        case _ where isCycling:
+            return .cycling
+        case _ where isWalking:
+            return .walking
         default:
-            mode = .driving
+            return .driving
         }
-        return RoutingProfile(mode: mode, account: "mapbox")
+    }
+
+    var nativeProfile: RoutingProfile {
+        let accountComponent = rawValue.split(separator: "/").first.map(String.init) ?? ""
+        let account = accountComponent.isEmpty ? "mapbox" : accountComponent
+        return RoutingProfile(mode: mode, account: account)
     }
 }
 

Sources/MapboxCoreNavigation/MapboxRoutingProvider.swift

@@ -26,11 +26,9 @@ open class NavigationRouteOptions: RouteOptions, OptimizedForNavigation {
                    queryItems: queryItems)
         includesAlternativeRoutes = true
         attributeOptions = [.expectedTravelTime, .maximumSpeedLimit]
-        if profileIdentifier == .automobileAvoidingTraffic {
-            attributeOptions.update(with: .numericCongestionLevel)
-        }
         includesExitRoundaboutManeuver = true
-        if profileIdentifier == .automobileAvoidingTraffic {
+        if let profileIdentifier, profileIdentifier.isAutomobileAvoidingTraffic {
+            attributeOptions.update(with: .numericCongestionLevel)
             refreshingEnabled = true
         }
 
@@ -89,11 +87,13 @@ open class NavigationMatchOptions: MatchOptions, OptimizedForNavigation {
                    profileIdentifier: profileIdentifier,
                    queryItems: queryItems)
         attributeOptions = [.expectedTravelTime]
-        if profileIdentifier == .automobileAvoidingTraffic {
-            attributeOptions.update(with: .numericCongestionLevel)
-        }
-        if profileIdentifier == .automobile || profileIdentifier == .automobileAvoidingTraffic {
-            attributeOptions.insert(.maximumSpeedLimit)
+        if let profileIdentifier {
+            if profileIdentifier.isAutomobileAvoidingTraffic {
+                attributeOptions.update(with: .numericCongestionLevel)
+            }
+            if profileIdentifier.isAutomobile || profileIdentifier.isAutomobileAvoidingTraffic {
+                attributeOptions.insert(.maximumSpeedLimit)
+            }
         }
 
         optimizeForNavigation()

Sources/MapboxCoreNavigation/NavigationRouteOptions.swift

@@ -676,7 +676,7 @@ open class RouteController: NSObject {
         let options = indexedRouteResponse.validatedRouteOptions
 
         self.routeProgress = RouteProgress(route: indexedRouteResponse.currentRoute!, options: options)
-        self.refreshesRoute = isRouteOptions && options.profileIdentifier == .automobileAvoidingTraffic && options.refreshingEnabled
+        self.refreshesRoute = isRouteOptions && options.profileIdentifier.isAutomobileAvoidingTraffic && options.refreshingEnabled
 
         super.init()
 

Sources/MapboxCoreNavigation/RouteController.swift

@@ -3,12 +3,10 @@ import MapboxDirections
 
 extension RouteOptions {
     internal var activityType: CLActivityType {
-        switch self.profileIdentifier {
-        case .cycling, .walking:
+        if profileIdentifier.isCycling || profileIdentifier.isWalking {
             return .fitness
-        default:
-            return .otherNavigation
         }
+        return .otherNavigation
     }
 
     /**

Sources/MapboxCoreNavigation/RouteOptions.swift

@@ -501,7 +501,8 @@ extension InternalRouter where Self: Router {
         let options = progress.reroutingOptions(from: origin)
 
         // https://github.com/mapbox/mapbox-navigation-ios/issues/3966
-        if isRerouting && (options.profileIdentifier == .automobile || options.profileIdentifier == .automobileAvoidingTraffic) {
+        let profile = options.profileIdentifier
+        if isRerouting && (profile.isAutomobile || profile.isAutomobileAvoidingTraffic) {
             options.initialManeuverAvoidanceRadius = initialManeuverAvoidanceRadius * origin.speed
         }
 

Sources/MapboxCoreNavigation/Router.swift

@@ -65,4 +65,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: bde8103af0e9b326531ee57cf1fa935cbd5f2e18
 
-COCOAPODS: 1.12.0
+COCOAPODS: 1.15.2