Skip to content

Commit 5dff4d5

Browse files
1ec51ec5
committed
v2.0.0-rc.2
1 parent f4a6806 commit 5dff4d5

File tree

7 files changed

+42
-42
lines changed

7 files changed

+42
-42
lines changed

‎DocsCode/NavigationTutorial/NavigationTutorialViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class ViewController: UIViewController {
154154
// Customize the route line color and width
155155
var lineLayer = LineLayer(id: "routeLayer")
156156
lineLayer.source = sourceIdentifier
157-
lineLayer.lineColor = .constant(.init(color: UIColor(red: 0.1897518039, green: 0.3010634184, blue: 0.7994888425, alpha: 1.0)))
157+
lineLayer.lineColor = .constant(.init(UIColor(red: 0.1897518039, green: 0.3010634184, blue: 0.7994888425, alpha: 1.0)))
158158
lineLayer.lineWidth = .constant(3)
159159

160160
// Add the style layer of the route line to the map

‎Navigation-Examples/Examples/Custom-Waypoints.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@ class CustomWaypointsViewController: UIViewController {
140140
0.5
141141
1
142142
}
143-
circleLayer.circleColor = .constant(.init(color: UIColor(red: 0.9, green: 0.9, blue: 0.9, alpha: 1.0)))
143+
circleLayer.circleColor = .constant(.init(UIColor(red: 0.9, green: 0.9, blue: 0.9, alpha: 1.0)))
144144
circleLayer.circleOpacity = .expression(opacity)
145145
circleLayer.circleRadius = .constant(.init(10))
146-
circleLayer.circleStrokeColor = .constant(.init(color: UIColor.black))
146+
circleLayer.circleStrokeColor = .constant(.init(UIColor.black))
147147
circleLayer.circleStrokeWidth = .constant(.init(1))
148148
circleLayer.circleStrokeOpacity = .expression(opacity)
149149
return circleLayer
@@ -168,7 +168,7 @@ class CustomWaypointsViewController: UIViewController {
168168
1
169169
})
170170
symbolLayer.textHaloWidth = .constant(.init(0.25))
171-
symbolLayer.textHaloColor = .constant(.init(color: UIColor.black))
171+
symbolLayer.textHaloColor = .constant(.init(UIColor.black))
172172
return symbolLayer
173173
}
174174

‎Navigation-Examples/Examples/Route-Alerts.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ extension MapboxCoreNavigation.RouteAlert: CustomStringConvertible {
133133
let distance = Int64(self.distanceToStart)
134134
guard distance > 0 && distance < 500 else { return "" }
135135

136-
switch roadObject.type {
136+
switch roadObject.kind {
137137
case .incident(let incident?):
138138
return "\(incident.alertDescription) in \(distance)m."
139139
case .tunnel(let alert?):

‎Navigation-Examples/Examples/Route-Lines-Styling.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ extension RouteLinesStylingViewController: NavigationMapViewDelegate {
213213
// main or alternative, and whether route is casing or not. For example: identifier for
214214
// main route line will look like this: `0x0000600001168000.main.route_line`, and for
215215
// alternative route line casing will look like this: `0x0000600001ddee80.alternative.route_line_casing`.
216-
lineLayer.lineColor = .constant(.init(color: identifier.contains("main") ? #colorLiteral(red: 0.337254902, green: 0.6588235294, blue: 0.9843137255, alpha: 1) : #colorLiteral(red: 0.6, green: 0.6, blue: 0.6, alpha: 1)))
216+
lineLayer.lineColor = .constant(.init(identifier.contains("main") ? #colorLiteral(red: 0.337254902, green: 0.6588235294, blue: 0.9843137255, alpha: 1) : #colorLiteral(red: 0.6, green: 0.6, blue: 0.6, alpha: 1)))
217217
lineLayer.lineWidth = .expression(lineWidthExpression())
218218
lineLayer.lineJoin = .constant(.round)
219219
lineLayer.lineCap = .constant(.round)
@@ -227,7 +227,7 @@ extension RouteLinesStylingViewController: NavigationMapViewDelegate {
227227

228228
// Based on information stored in `identifier` property (whether route line is main or not)
229229
// route line will be colored differently.
230-
lineLayer.lineColor = .constant(.init(color: identifier.contains("main") ? #colorLiteral(red: 0.1843137255, green: 0.4784313725, blue: 0.7764705882, alpha: 1) : #colorLiteral(red: 0.4, green: 0.4, blue: 0.4, alpha: 1)))
230+
lineLayer.lineColor = .constant(.init(identifier.contains("main") ? #colorLiteral(red: 0.1843137255, green: 0.4784313725, blue: 0.7764705882, alpha: 1) : #colorLiteral(red: 0.4, green: 0.4, blue: 0.4, alpha: 1)))
231231
lineLayer.lineWidth = .expression(lineWidthExpression(1.2))
232232
lineLayer.lineJoin = .constant(.round)
233233
lineLayer.lineCap = .constant(.round)
@@ -249,7 +249,7 @@ extension RouteLinesStylingViewController: NavigationViewControllerDelegate {
249249
func navigationViewController(_ navigationViewController: NavigationViewController, routeLineLayerWithIdentifier identifier: String, sourceIdentifier: String) -> LineLayer? {
250250
var lineLayer = LineLayer(id: identifier)
251251
lineLayer.source = sourceIdentifier
252-
lineLayer.lineColor = .constant(.init(color: identifier.contains("main") ? #colorLiteral(red: 0.337254902, green: 0.6588235294, blue: 0.9843137255, alpha: 1) : #colorLiteral(red: 0.6, green: 0.6, blue: 0.6, alpha: 1)))
252+
lineLayer.lineColor = .constant(.init(identifier.contains("main") ? #colorLiteral(red: 0.337254902, green: 0.6588235294, blue: 0.9843137255, alpha: 1) : #colorLiteral(red: 0.6, green: 0.6, blue: 0.6, alpha: 1)))
253253
lineLayer.lineWidth = .expression(lineWidthExpression())
254254
lineLayer.lineJoin = .constant(.round)
255255
lineLayer.lineCap = .constant(.round)
@@ -260,7 +260,7 @@ extension RouteLinesStylingViewController: NavigationViewControllerDelegate {
260260
func navigationViewController(_ navigationViewController: NavigationViewController, routeCasingLineLayerWithIdentifier identifier: String, sourceIdentifier: String) -> LineLayer? {
261261
var lineLayer = LineLayer(id: identifier)
262262
lineLayer.source = sourceIdentifier
263-
lineLayer.lineColor = .constant(.init(color: identifier.contains("main") ? #colorLiteral(red: 0.1843137255, green: 0.4784313725, blue: 0.7764705882, alpha: 1) : #colorLiteral(red: 0.4, green: 0.4, blue: 0.4, alpha: 1)))
263+
lineLayer.lineColor = .constant(.init(identifier.contains("main") ? #colorLiteral(red: 0.1843137255, green: 0.4784313725, blue: 0.7764705882, alpha: 1) : #colorLiteral(red: 0.4, green: 0.4, blue: 0.4, alpha: 1)))
264264
lineLayer.lineWidth = .expression(lineWidthExpression(1.2))
265265
lineLayer.lineJoin = .constant(.round)
266266
lineLayer.lineCap = .constant(.round)

‎Navigation-Examples/Examples/Upcoming-Intersection.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class ElectronicHorizonEventsViewController: UIViewController {
144144
RouteLineWidthByZoomLevel.mapValues { $0 * 0.5 }
145145
}
146146
)
147-
layer.lineColor = .constant(.init(color: UIColor.green.withAlphaComponent(0.9)))
147+
layer.lineColor = .constant(.init(UIColor.green.withAlphaComponent(0.9)))
148148
layer.lineCap = .constant(.round)
149149
layer.lineJoin = .constant(.miter)
150150
layer.minZoom = 9

‎Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
platform :ios, '11.0'
22
use_frameworks!
33

4-
pod 'MapboxCoreNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.0.0-rc.1'
5-
pod 'MapboxNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.0.0-rc.1'
4+
pod 'MapboxCoreNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.0.0-rc.2'
5+
pod 'MapboxNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.0.0-rc.2'
66

77
target 'Navigation-Examples' do
88
end

‎Podfile.lock‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
PODS:
2-
- MapboxCommon (17.1.0)
3-
- MapboxCoreMaps (10.0.0-rc.7.2):
4-
- MapboxCommon (~> 17.1)
5-
- MapboxCoreNavigation (2.0.0-rc.1):
2+
- MapboxCommon (18.0.0)
3+
- MapboxCoreMaps (10.0.0-rc.8):
4+
- MapboxCommon (~> 18.0)
5+
- MapboxCoreNavigation (2.0.0-rc.2):
66
- MapboxDirections-pre (= 2.0.0-rc.1)
77
- MapboxMobileEvents (~> 1.0.0)
8-
- MapboxNavigationNative (~> 65.0)
8+
- MapboxNavigationNative (~> 66.0)
99
- Turf (= 2.0.0-rc.1)
1010
- MapboxDirections-pre (2.0.0-rc.1):
1111
- Polyline (~> 5.0)
1212
- Turf (~> 2.0.0-rc.1)
13-
- MapboxMaps (10.0.0-rc.7):
14-
- MapboxCommon (= 17.1.0)
15-
- MapboxCoreMaps (= 10.0.0-rc.7.2)
16-
- MapboxMobileEvents (= 1.0.2)
13+
- MapboxMaps (10.0.0-rc.8):
14+
- MapboxCommon (= 18.0.0)
15+
- MapboxCoreMaps (= 10.0.0-rc.8)
16+
- MapboxMobileEvents (= 1.0.3)
1717
- Turf (= 2.0.0-rc.1)
18-
- MapboxMobileEvents (1.0.2)
19-
- MapboxNavigation (2.0.0-rc.1):
20-
- MapboxCoreNavigation (= 2.0.0-rc.1)
21-
- MapboxMaps (= 10.0.0-rc.7)
18+
- MapboxMobileEvents (1.0.3)
19+
- MapboxNavigation (2.0.0-rc.2):
20+
- MapboxCoreNavigation (= 2.0.0-rc.2)
21+
- MapboxMaps (= 10.0.0-rc.8)
2222
- MapboxMobileEvents (~> 1.0.0)
2323
- MapboxSpeech-pre (= 2.0.0-rc.1)
2424
- Solar-dev (~> 3.0)
25-
- MapboxNavigationNative (65.0.2):
26-
- MapboxCommon (~> 17.1)
25+
- MapboxNavigationNative (66.0.1):
26+
- MapboxCommon (~> 18.0)
2727
- MapboxSpeech-pre (2.0.0-rc.1)
2828
- Polyline (5.0.2)
2929
- Solar-dev (3.0.1)
3030
- Turf (2.0.0-rc.1)
3131

3232
DEPENDENCIES:
33-
- MapboxCoreNavigation (from `https://github.com/mapbox/mapbox-navigation-ios.git`, tag `v2.0.0-rc.1`)
34-
- MapboxNavigation (from `https://github.com/mapbox/mapbox-navigation-ios.git`, tag `v2.0.0-rc.1`)
33+
- MapboxCoreNavigation (from `https://github.com/mapbox/mapbox-navigation-ios.git`, tag `v2.0.0-rc.2`)
34+
- MapboxNavigation (from `https://github.com/mapbox/mapbox-navigation-ios.git`, tag `v2.0.0-rc.2`)
3535

3636
SPEC REPOS:
3737
trunk:
@@ -49,33 +49,33 @@ SPEC REPOS:
4949
EXTERNAL SOURCES:
5050
MapboxCoreNavigation:
5151
:git: https://github.com/mapbox/mapbox-navigation-ios.git
52-
:tag: v2.0.0-rc.1
52+
:tag: v2.0.0-rc.2
5353
MapboxNavigation:
5454
:git: https://github.com/mapbox/mapbox-navigation-ios.git
55-
:tag: v2.0.0-rc.1
55+
:tag: v2.0.0-rc.2
5656

5757
CHECKOUT OPTIONS:
5858
MapboxCoreNavigation:
5959
:git: https://github.com/mapbox/mapbox-navigation-ios.git
60-
:tag: v2.0.0-rc.1
60+
:tag: v2.0.0-rc.2
6161
MapboxNavigation:
6262
:git: https://github.com/mapbox/mapbox-navigation-ios.git
63-
:tag: v2.0.0-rc.1
63+
:tag: v2.0.0-rc.2
6464

6565
SPEC CHECKSUMS:
66-
MapboxCommon: ea64a4842f40e8397d6270df379a17afb04e941c
67-
MapboxCoreMaps: ebc8bbb2a2f25874835196544448771d7e35a385
68-
MapboxCoreNavigation: 2fb44caf9209150b98c4c54d6b7195c0f0ea0849
66+
MapboxCommon: ea974a60b24bf4ce16314a5c99384512e7d5aa4e
67+
MapboxCoreMaps: 130eab4f9861dbb9b09b5e25b65ce701dec4a91a
68+
MapboxCoreNavigation: 84980abf07a94972634ed1e27a99b403c477061b
6969
MapboxDirections-pre: 25013fec9715dbc17c1c1798da3105e9b3140cd9
70-
MapboxMaps: 8b98ffdaa3fd8ee742d44f86ed7296a72e40649c
71-
MapboxMobileEvents: 9775eb995e06cc3ea10894bf6ab111683c8e73e7
72-
MapboxNavigation: 0f01d8b618ace008d34c937c871e407117b48bd5
73-
MapboxNavigationNative: 09e1b6c86808df5e2e61842e8ad9067e3b587a47
70+
MapboxMaps: 10ffa18d5543a7ac5a2d4973647197f15e624baa
71+
MapboxMobileEvents: 852274da39a3ed9a56dfff3bab64a055d23768c7
72+
MapboxNavigation: 265f6a34546c6258d58f1818d879c99fdd0732e6
73+
MapboxNavigationNative: 9579d1b04221fee5f8bd01c7da33c278145d2c09
7474
MapboxSpeech-pre: c2739e843762ac6b222fb7132ac71903aa750af3
7575
Polyline: fce41d72e1146c41c6d081f7656827226f643dff
7676
Solar-dev: 4612dc9878b9fed2667d23b327f1d4e54e16e8d0
7777
Turf: 4efd14674a1a2f9527b7c0aadde8003a7b73b1be
7878

79-
PODFILE CHECKSUM: 737cd40e86548e1b75a5dfc23d1fcb5feadfa392
79+
PODFILE CHECKSUM: 2918226fb74589594ae7b7bed4c1374cc14c427a
8080

81-
COCOAPODS: 1.11.0
81+
COCOAPODS: 1.11.2

0 commit comments

Comments
 (0)