MapboxDirections v2.0.0-beta.2

1ec5 · 1ec5 · commit 8cb4a97da5d2 · 2021-04-09T17:22:06.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,7 @@
 * 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-beta.16](https://github.com/mapbox/mapbox-maps-ios/), MapboxNavigationNative v47.0.0, and MapboxCommon v10.0.2. ([#2884](https://github.com/mapbox/mapbox-navigation-ios/pull/2884))
-* MapboxCoreNavigation depends on MapboxDirections v2.0.0-alpha.2 but no longer depends on MapboxAccounts. ([#2808](https://github.com/mapbox/mapbox-navigation-ios/pull/2808), [#2829](https://github.com/mapbox/mapbox-navigation-ios/pull/2829), [#2837](https://github.com/mapbox/mapbox-navigation-ios/pull/2837))
+* MapboxCoreNavigation depends on MapboxDirections v2.0.0-beta.2 but no longer depends on MapboxAccounts. ([#2808](https://github.com/mapbox/mapbox-navigation-ios/pull/2808), [#2829](https://github.com/mapbox/mapbox-navigation-ios/pull/2829), [#2837](https://github.com/mapbox/mapbox-navigation-ios/pull/2837))
 * MapboxNavigation and MapboxCoreNavigation require iOS 11.0 or above to run. iOS 10._x_ is no longer supported. ([#2808](https://github.com/mapbox/mapbox-navigation-ios/pull/2808))
 * Xcode 12.4 or above is now required for building this SDK from source.
 
diff --git a/Cartfile b/Cartfile
@@ -1,5 +1,5 @@
 binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon-ios.json" ~> 10.0.2
 binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.json" ~> 47.0.0
-github "mapbox/mapbox-directions-swift" "v2.0.0-alpha.2"
+github "mapbox/mapbox-directions-swift" "v2.0.0-beta.2"
 github "mapbox/turf-swift" "v2.0.0-alpha.3"
 github "mapbox/mapbox-events-ios" ~> 0.10.2
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -4,7 +4,7 @@ github "Quick/Nimble" "v8.1.2"
 github "Quick/Quick" "v2.2.1"
 github "Udumft/SwiftCLI" "da19d2a16cd5aa838d8fb7256e28c171bc67dd82"
 github "mapbox/MapboxGeocoder.swift" "v0.10.2"
-github "mapbox/mapbox-directions-swift" "v2.0.0-alpha.2"
+github "mapbox/mapbox-directions-swift" "v2.0.0-beta.2"
 github "mapbox/mapbox-events-ios" "v0.10.8"
 github "mapbox/turf-swift" "v2.0.0-alpha.3"
 github "raphaelmor/Polyline" "v5.0.2"
diff --git a/MapboxCoreNavigation.podspec b/MapboxCoreNavigation.podspec
@@ -41,7 +41,7 @@ Pod::Spec.new do |s|
   s.module_name = "MapboxCoreNavigation"
 
   s.dependency "MapboxNavigationNative", "~> 47.0"
-  s.dependency "MapboxDirections-pre", "2.0.0-alpha.2"
+  s.dependency "MapboxDirections-pre", "2.0.0-beta.2"
   s.dependency "MapboxMobileEvents", "~> 0.10.2" # Always specify a patch release if pre-v1.0
   s.dependency "Turf", "2.0.0-alpha.3"
 
diff --git a/MapboxNavigation-Documentation.podspec b/MapboxNavigation-Documentation.podspec
@@ -45,7 +45,7 @@ Pod::Spec.new do |s|
 
   s.frameworks = ['CarPlay']
 
-  s.dependency "MapboxDirections-pre", "2.0.0-alpha.2"
+  s.dependency "MapboxDirections-pre", "2.0.0-beta.2"
   s.dependency "MapboxGeocoder.swift", "~> 0.10.0"
   s.dependency "MapboxMaps", "10.0.0-beta.16"
   s.dependency "MapboxMobileEvents", "~> 0.10.2"
diff --git a/MapboxNavigation.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/MapboxNavigation.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -21,7 +21,7 @@ let package = Package(
             ])
     ],
     dependencies: [
-        .package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", .exact("2.0.0-alpha.2")),
+        .package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", .exact("2.0.0-beta.2")),
         .package(name: "MapboxGeocoder", url: "https://github.com/mapbox/MapboxGeocoder.swift.git", from: "0.14.0"),
         .package(name: "MapboxMobileEvents", url: "https://github.com/mapbox/mapbox-events-ios.git", from: "0.10.8"),
         .package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "47.0.0"),
diff --git a/Sources/MapboxNavigation/InstructionPresenter.swift b/Sources/MapboxNavigation/InstructionPresenter.swift
@@ -133,7 +133,7 @@ class InstructionPresenter {
                 let exitSide: ExitSide = instruction.maneuverDirection == .left ? .left : .right
                 return exitShield(side: exitSide, text: text.text, dataSource: dataSource, cacheKey: component.cacheKey!)
                     ?? NSAttributedString(string: text.text, attributes: defaultAttributes)
-            case .lane(_, _):
+            case .lane(_, _, _):
                 preconditionFailure("Lane component has no attributed string representation.")
             case .guidanceView(_, let alternativeText):
                 return NSAttributedString(string: alternativeText.text, attributes: defaultAttributes)
diff --git a/Sources/MapboxNavigation/LanesView.swift b/Sources/MapboxNavigation/LanesView.swift
@@ -82,7 +82,7 @@ open class LanesView: UIView, NavigationComponent {
         }
         
         let subviews = tertiaryInstruction.components.compactMap { (component) -> LaneView? in
-            if case let .lane(indications: indications, isUsable: isUsable) = component {
+            if case let .lane(indications: indications, isUsable: isUsable, preferredDirection: _) = component {
                 let maneuverDirection = visualInstruction?.primaryInstruction.maneuverDirection ?? ManeuverDirection(rawValue: indications.description)
                 return LaneView(indications: indications, isUsable: isUsable, direction: maneuverDirection)
             } else {
diff --git a/Sources/MapboxNavigation/VisualInstruction.swift b/Sources/MapboxNavigation/VisualInstruction.swift
@@ -6,7 +6,7 @@ import CarPlay
 extension VisualInstruction {
     var laneComponents: [Component] {
         return components.filter { component -> Bool in
-            if case VisualInstruction.Component.lane(indications: _, isUsable: _) = component {
+            if case VisualInstruction.Component.lane(indications: _, isUsable: _, preferredDirection: _) = component {
                 return true
             }
             return false
@@ -51,7 +51,7 @@ extension VisualInstruction {
 
     func lanesImage(side: DrivingSide, direction: ManeuverDirection?, useableColor: UIColor, unuseableColor: UIColor, size: CGSize, scale: CGFloat) -> UIImage? {
         let subimages = components.compactMap { (component) -> UIImage? in
-            if case let .lane(indications: indications, isUsable: isUsable) = component {
+            if case let .lane(indications: indications, isUsable: isUsable, preferredDirection: _) = component {
                 return laneImage(side: side, indication: indications, maneuverDirection: direction, isUsable: isUsable, useableColor: useableColor, unuseableColor: unuseableColor, size: CGSize(width: size.height, height: size.height))
             } else {
                 return nil
diff --git a/Tests/CocoaPodsTest/PodInstall/Podfile.lock b/Tests/CocoaPodsTest/PodInstall/Podfile.lock
@@ -3,11 +3,11 @@ PODS:
   - MapboxCoreMaps (10.0.0-beta.17):
     - MapboxCommon (= 10.0.2)
   - MapboxCoreNavigation (2.0.0-beta.3):
-    - MapboxDirections-pre (= 2.0.0-alpha.2)
+    - MapboxDirections-pre (= 2.0.0-beta.2)
     - MapboxMobileEvents (~> 0.10.2)
     - MapboxNavigationNative (~> 47.0)
     - Turf (= 2.0.0-alpha.3)
-  - MapboxDirections-pre (2.0.0-alpha.2):
+  - MapboxDirections-pre (2.0.0-beta.2):
     - Polyline (~> 5.0)
     - Turf (~> 2.0.0-alpha.3)
   - MapboxMaps (10.0.0-beta.16):
@@ -55,8 +55,8 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   MapboxCommon: f7f4e0040500d221ef7a9b4d81e7debb77d10ce1
   MapboxCoreMaps: fd16bda557bec7a6daebcc2a5ff1e916e1d701ea
-  MapboxCoreNavigation: d0286ee82a6cb06d6c8ed451d2d96c2729e09e40
-  MapboxDirections-pre: 96571d86a2483ebc5c5f9a77a8184a8f10daf545
+  MapboxCoreNavigation: 2e8160f9c00a70c269b166a0bdcdbabc661fe1e8
+  MapboxDirections-pre: f47c12f86b8e0f2875338b51c252f5086c6d8af1
   MapboxMaps: cfb0ac7313208981dc35e69876658cf87209484a
   MapboxMobileEvents: 36ff53b135aac486eed94b61f813c7967a0c2c6f
   MapboxNavigation: 8963ccbec3d32c0b4ab2519398905443c850575c

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ open class LanesView: UIView, NavigationComponent {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`let subviews = tertiaryInstruction.components.compactMap { (component) -> LaneView? in`
`85`		`- if case let .lane(indications: indications, isUsable: isUsable) = component {`
	`85`	`+ if case let .lane(indications: indications, isUsable: isUsable, preferredDirection: _) = component {`
`86`	`86`	`let maneuverDirection = visualInstruction?.primaryInstruction.maneuverDirection ?? ManeuverDirection(rawValue: indications.description)`
`87`	`87`	`return LaneView(indications: indications, isUsable: isUsable, direction: maneuverDirection)`
`88`	`88`	`} else {`