Skip to content

Commit 53d658f

Browse files
authored
New Alternative Routes mechanism (#4110)
* vk-1940-new-alternatives: Bumped NN to v113, Maps to v10.8.0-rc.1; Updated Continuous alternatives mechanism to set routes to Navigator before presenting to users; Deleted AlternativeRoutesCenter; CHANGELOG updated;
1 parent eb5b913 commit 53d658f

File tree

16 files changed

+211
-182
lines changed

16 files changed

+211
-182
lines changed

CHANGELOG.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
### Packaging
66

7-
* MapboxNavigation now requires [MapboxMaps v10.8._x_](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.8.0-beta.1). ([#4085](https://github.com/mapbox/mapbox-navigation-ios/pull/4085))
8-
* MapboxCoreNavigation now requires [MapboxNavigationNative v112._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/112.0.0). ([#4085](https://github.com/mapbox/mapbox-navigation-ios/pull/4085))
7+
* MapboxNavigation now requires [MapboxMaps v10.8._x_](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.8.0-beta.1). ([#4110](https://github.com/mapbox/mapbox-navigation-ios/pull/4110))
8+
* MapboxCoreNavigation now requires [MapboxNavigationNative v113._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/113.0.0). ([#4110](https://github.com/mapbox/mapbox-navigation-ios/pull/4110))
99
* MapboxCoreNavigation now requires [MapboxDirections v2.7.0-beta.1](https://github.com/mapbox/mapbox-directions-swift/releases/tag/v2.7.0-beta.1). ([#4085](https://github.com/mapbox/mapbox-navigation-ios/pull/4085))
1010

1111
### Location Tracking
@@ -44,6 +44,7 @@
4444
* Curvy roads are penalized slightly more consistently. ([#4085](https://github.com/mapbox/mapbox-navigation-ios/pull/4085))
4545
* You can now set `Waypoint.allowsSnappingToStaticallyClosedRoad` to `true` to allow the waypoint to snap to a road that is fully closed for long-term construction. ([#4085](https://github.com/mapbox/mapbox-navigation-ios/pull/4085))
4646
* Added `NavigationSettings.liveIncidentsOptions` to configure how incidents data is fetched. ([#4088](https://github.com/mapbox/mapbox-navigation-ios/pull/4088))
47+
* Fixed incorrect duration calculations and route refreshing when an arrival step’s geometry contained only one coordinate. Normally, an arrival step’s geometry is expected to be a zero-length `LineString`; that is, with two coincident coordinates. ([#4110](https://github.com/mapbox/mapbox-navigation-ios/pull/4110))
4748

4849
### CarPlay
4950

@@ -52,6 +53,8 @@
5253
### Other changes
5354

5455
* When launching the application, any stray files left over from old canceled offline tile downloads are cleaned up automatically to save storage space. ([#4085](https://github.com/mapbox/mapbox-navigation-ios/pull/4085))
56+
* Fixed a “dereference error” when passing certain OpenLR identifiers into the `RoadObjectMatcher.matchOpenLR(location:identifier:)` method. ([#4110](https://github.com/mapbox/mapbox-navigation-ios/pull/4110))
57+
* Fixed an issue where the `RoadObjectMatcher.matchOpenLR(location:identifier:)` method sometimes returned the wrong parallel roadway. ([#4110](https://github.com/mapbox/mapbox-navigation-ios/pull/4110))
5558
* Removed the `Hashable`-conforming extension for `CLLocationCoordinate2D` in `MapboxCoreNavigation` to fix a compiler error in applications that define their own `Hashable` conformance for this type. ([#4109](https://github.com/mapbox/mapbox-navigation-ios/pull/4109))
5659

5760
## v2.7.0

Cartfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.0.0-beta.1
2-
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 112.0
1+
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.0.0-rc.2
2+
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 113.0
33
github "mapbox/mapbox-directions-swift" == 2.7.0-beta.1
44
github "mapbox/mapbox-events-ios" ~> 1.0.0

Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.0.0-beta.1"
2-
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "112.0.0"
1+
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.0.0-rc.2"
2+
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "113.0.0"
33
github "Quick/Nimble" "v9.2.1"
44
github "Quick/Quick" "v3.1.2"
55
github "mapbox/mapbox-directions-swift" "v2.7.0-beta.1"

MapboxCoreNavigation.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Pod::Spec.new do |s|
4040
s.requires_arc = true
4141
s.module_name = "MapboxCoreNavigation"
4242

43-
s.dependency "MapboxNavigationNative", "~> 112.0"
43+
s.dependency "MapboxNavigationNative", "~> 113.0"
4444
s.dependency "MapboxDirections-pre", "2.7.0-beta.1"
4545
s.dependency "MapboxMobileEvents", "~> 1.0"
4646

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

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

MapboxNavigation.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Pod::Spec.new do |s|
4444
s.module_name = "MapboxNavigation"
4545

4646
s.dependency "MapboxCoreNavigation", "#{s.version.to_s}"
47-
s.dependency "MapboxMaps", "10.8.0-beta.1"
47+
s.dependency "MapboxMaps", "10.8.0-rc.1"
4848
s.dependency "Solar-dev", "~> 3.0"
4949
s.dependency "MapboxSpeech", "~> 2.0"
5050
s.dependency "MapboxMobileEvents", "~> 1.0"

MapboxNavigation.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
2BE70189253734A000F46E4E /* TollCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BE7012C2535946300F46E4E /* TollCollection.swift */; };
7575
2BEA240A27D205B500EE05D9 /* RerouteController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BEA240827D205B500EE05D9 /* RerouteController.swift */; };
7676
2BEF16472775C8FD0085E3C6 /* MapMatchingResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BEF16462775C8FD0085E3C6 /* MapMatchingResult.swift */; };
77-
2BF36181283F7B4800C51848 /* AlternativeRoutesCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BF36180283F7B4800C51848 /* AlternativeRoutesCenter.swift */; };
7877
2BF398C1274BDEA8000C9A72 /* Directions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BF398C0274BDEA8000C9A72 /* Directions.swift */; };
7978
2BF398C3274FE99A000C9A72 /* HandlerFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BF398C2274FE99A000C9A72 /* HandlerFactory.swift */; };
8079
2E50E0C0264E35CA009D3848 /* RoadObjectMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E50E0BF264E35CA009D3848 /* RoadObjectMatcher.swift */; };
@@ -646,7 +645,6 @@
646645
2BE7016825371E3400F46E4E /* Incident.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Incident.swift; sourceTree = "<group>"; };
647646
2BEA240827D205B500EE05D9 /* RerouteController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RerouteController.swift; sourceTree = "<group>"; };
648647
2BEF16462775C8FD0085E3C6 /* MapMatchingResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MapMatchingResult.swift; sourceTree = "<group>"; };
649-
2BF36180283F7B4800C51848 /* AlternativeRoutesCenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlternativeRoutesCenter.swift; sourceTree = "<group>"; };
650648
2BF398C0274BDEA8000C9A72 /* Directions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Directions.swift; sourceTree = "<group>"; };
651649
2BF398C2274FE99A000C9A72 /* HandlerFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HandlerFactory.swift; sourceTree = "<group>"; };
652650
2E50E0BF264E35CA009D3848 /* RoadObjectMatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoadObjectMatcher.swift; sourceTree = "<group>"; };
@@ -2012,7 +2010,6 @@
20122010
C53C196A1F38E9C1008DB406 /* Resources */,
20132011
DABA591425E58D5600D0C1DB /* Accounts.swift */,
20142012
2B5A4AC428099FA900170A2B /* AlternativeRoute.swift */,
2015-
2BF36180283F7B4800C51848 /* AlternativeRoutesCenter.swift */,
20162013
2B28AD7C284F68A1001CD1FB /* AlternativeRouteDetectionStrategy.swift */,
20172014
B4843886270F8E1600E161E6 /* SimulationType.swift */,
20182015
2BBED93A267A3AB900F90032 /* BillingHandler.swift */,
@@ -2993,7 +2990,6 @@
29932990
11D1F8A02696048D0053A93F /* Dictionary+DeepMerge.swift in Sources */,
29942991
3A163AE3249901D000D66A0D /* FixLocation.swift in Sources */,
29952992
2E50E0D2264E468B009D3848 /* RoadObjectMatcherError.swift in Sources */,
2996-
2BF36181283F7B4800C51848 /* AlternativeRoutesCenter.swift in Sources */,
29972993
8D2AA745211CDD4000EB7F72 /* NavigationService.swift in Sources */,
29982994
8AC85EA428628E4F003F8FC8 /* UIDevice.swift in Sources */,
29992995
2BEA240A27D205B500EE05D9 /* RerouteController.swift in Sources */,

Package.resolved

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ let package = Package(
2424
dependencies: [
2525
.package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", .exact("2.7.0-beta.1")),
2626
.package(name: "MapboxMobileEvents", url: "https://github.com/mapbox/mapbox-events-ios.git", from: "1.0.0"),
27-
.package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "112.0.0"),
28-
.package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", .exact("10.8.0-beta.1")),
27+
.package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "113.0.0"),
28+
.package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", .exact("10.8.0-rc.1")),
2929
.package(name: "Solar", url: "https://github.com/ceeK/Solar.git", from: "3.0.0"),
3030
.package(name: "MapboxSpeech", url: "https://github.com/mapbox/mapbox-speech-swift.git", from: "2.0.0"),
3131
.package(name: "Quick", url: "https://github.com/Quick/Quick.git", from: "3.1.2"),

Sources/MapboxCoreNavigation/AlternativeRoutesCenter.swift

Lines changed: 0 additions & 92 deletions
This file was deleted.

0 commit comments

Comments
 (0)