MapboxDirections.swift, iOS SDK v3.4.2

.gitignore

@@ -1,4 +1,4 @@
-MapboxNavigation.xcworkspace
+Example/MapboxNavigation.xcworkspace
 
 .DS_Store
 
@@ -8,7 +8,7 @@ xcuserdata
 *.xcuserstate
 *.xcscmblueprint
 
-Pods/
+Example/Pods/
 
 Carthage/Build
 Carthage/Checkouts

Cartfile

@@ -1 +1 @@
-github "mapbox/MapboxDirections.swift" "swift3"
+github "Mapbox/MapboxDirections.swift" "1e5802b7dc5628b04b54bfc2444ea8e6c882e086"

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "superpeteblaze/Polyline" "19ff9581d8ff7e2d1c57afd6df3999dc1b5414b4"
-github "mapbox/MapboxDirections.swift" "581f246ae4f821a62af6bbe8c4ea1aac67b0cf9b"
+github "Mapbox/MapboxDirections.swift" "1e5802b7dc5628b04b54bfc2444ea8e6c882e086"
+github "raphaelmor/Polyline" "f86f34dac9aae7e027fd9f62c2e01dd77f1ee312"

Example/Example.xcodeproj/project.pbxproj

@@ -710,7 +710,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.navigation.Example-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -724,7 +723,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.navigation.Example-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -764,6 +762,7 @@
 				354620C81E3A543A00BAD0B3 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		354620D41E3A545100BAD0B3 /* Build configuration list for PBXNativeTarget "Example-Objective-C Tests" */ = {
 			isa = XCConfigurationList;
@@ -772,6 +771,7 @@
 				354620D61E3A545100BAD0B3 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		35A7DB691E39FA1F000BAB5C /* Build configuration list for PBXProject "Example" */ = {
 			isa = XCConfigurationList;

Example/Objective-C/ViewController.m

@@ -18,7 +18,6 @@ @interface ViewController () <AVSpeechSynthesizerDelegate>
 
 @implementation ViewController
 
-static NSString *MBXTempProfileIdentifierAutomobileAvoidingTraffic = @"mapbox/driving-traffic";
 static NSString *MapboxAccessToken = @"<#Your Mapbox access token#>";
 
 - (void)viewDidLoad {
@@ -112,7 +111,7 @@ - (void)getRoute {
     NSArray<MBWaypoint *> *waypoints = @[[[MBWaypoint alloc] initWithCoordinate:self.mapView.userLocation.coordinate coordinateAccuracy:-1 name:nil],
                                          [[MBWaypoint alloc] initWithCoordinate:self.destination coordinateAccuracy:-1 name:nil]];
 
-    MBRouteOptions *options = [[MBRouteOptions alloc] initWithWaypoints:waypoints profileIdentifier:MBXTempProfileIdentifierAutomobileAvoidingTraffic];
+    MBRouteOptions *options = [[MBRouteOptions alloc] initWithWaypoints:waypoints profileIdentifier:MBDirectionsProfileIdentifierAutomobileAvoidingTraffic];
     options.includesSteps = YES;
     options.routeShapeResolution = MBRouteShapeResolutionFull;
 

Example/Podfile

@@ -1,9 +1,9 @@
 use_frameworks!
 
 def shared_pods
-  pod 'MapboxDirections.swift', :git => 'https://github.com/mapbox/MapboxDirections.swift.git', :branch => 'swift3'
+  pod 'MapboxDirections.swift', :git => 'https://github.com/mapbox/MapboxDirections.swift.git', :commit => '1e5802b7dc5628b04b54bfc2444ea8e6c882e086'
   pod 'MapboxNavigation.swift', :path => '..'
-  pod 'Mapbox-iOS-SDK-symbols', :podspec => 'https://raw.githubusercontent.com/mapbox/mapbox-gl-native/ios-v3.4.0/platform/ios/Mapbox-iOS-SDK-symbols.podspec'
+  pod 'Mapbox-iOS-SDK', '~> 3.4'
 end
 
 target 'Example-Swift' do

Example/Podfile.lock

@@ -1,36 +1,34 @@
 PODS:
-  - Mapbox-iOS-SDK-symbols (3.4.0-symbols)
-  - MapboxDirections.swift (0.6.0):
-    - Polyline (~> 4.0.0)
+  - Mapbox-iOS-SDK (3.4.1)
+  - MapboxDirections.swift (0.7.0):
+    - Polyline (~> 4.0)
   - MapboxNavigation.swift (0.0.4):
     - MapboxDirections.swift
   - Polyline (4.0.0)
 
 DEPENDENCIES:
-  - Mapbox-iOS-SDK-symbols (from `https://raw.githubusercontent.com/mapbox/mapbox-gl-native/ios-v3.4.0/platform/ios/Mapbox-iOS-SDK-symbols.podspec`)
-  - MapboxDirections.swift (from `https://github.com/mapbox/MapboxDirections.swift.git`, branch `swift3`)
+  - Mapbox-iOS-SDK (~> 3.4)
+  - MapboxDirections.swift (from `https://github.com/mapbox/MapboxDirections.swift.git`, commit `1e5802b7dc5628b04b54bfc2444ea8e6c882e086`)
   - MapboxNavigation.swift (from `..`)
 
 EXTERNAL SOURCES:
-  Mapbox-iOS-SDK-symbols:
-    :podspec: https://raw.githubusercontent.com/mapbox/mapbox-gl-native/ios-v3.4.0/platform/ios/Mapbox-iOS-SDK-symbols.podspec
   MapboxDirections.swift:
-    :branch: swift3
+    :commit: 1e5802b7dc5628b04b54bfc2444ea8e6c882e086
     :git: https://github.com/mapbox/MapboxDirections.swift.git
   MapboxNavigation.swift:
-    :path: ".."
+    :path: ..
 
 CHECKOUT OPTIONS:
   MapboxDirections.swift:
-    :commit: 581f246ae4f821a62af6bbe8c4ea1aac67b0cf9b
+    :commit: 1e5802b7dc5628b04b54bfc2444ea8e6c882e086
     :git: https://github.com/mapbox/MapboxDirections.swift.git
 
 SPEC CHECKSUMS:
-  Mapbox-iOS-SDK-symbols: bd2654585472ca25fe89e9adfc11ef5550020f84
-  MapboxDirections.swift: 4acd753d0079bae4f2fae2b2cbda98922909de09
+  Mapbox-iOS-SDK: 9c0d23e9a3784e6c9e45af4339898e4598b5b09b
+  MapboxDirections.swift: 9dd982fb42be70a284b1ce208a67258478ff3182
   MapboxNavigation.swift: 281f0f3dc01bbd06732aac30c769af0dd2948689
   Polyline: c6de7430bf6ff0bfff1f087343597b83b38fdb69
 
-PODFILE CHECKSUM: 336d579030dc82241d9cafbcddb8b6086a00b04f
+PODFILE CHECKSUM: 7ee94ef26a9bb7e4ae780f07d60011e7c347dfc8
 
-COCOAPODS: 1.2.0.rc.1
+COCOAPODS: 1.2.0

Example/Swift/ViewController.swift

@@ -139,7 +139,7 @@ class ViewController: UIViewController, MGLMapViewDelegate, AVSpeechSynthesizerD
         let options = RouteOptions(coordinates: [mapView.userLocation!.coordinate, destination!])
         options.includesSteps = true
         options.routeShapeResolution = .full
-        options.profileIdentifier = MBDirectionsProfileIdentifierAutomobileAvoidingTraffic
+        options.profileIdentifier = .automobileAvoidingTraffic
 
         _ = directions.calculate(options) { [weak self] (waypoints, routes, error) in
             guard error == nil else {

MapboxNavigationTests/MapboxNavigationTests.swift

@@ -14,7 +14,7 @@ let response = Fixture.JSONFromFileNamed(name: "route")
 let jsonRoute = (response["routes"] as! [AnyObject]).first as! [String : Any]
 let waypoint1 = Waypoint(coordinate: CLLocationCoordinate2D(latitude: 37.795042, longitude: -122.413165))
 let waypoint2 = Waypoint(coordinate: CLLocationCoordinate2D(latitude: 37.7727, longitude: -122.433378))
-let route = Route(json: jsonRoute, waypoints: [waypoint1, waypoint2], profileIdentifier: MBDirectionsProfileIdentifierAutomobile)
+let route = Route(json: jsonRoute, waypoints: [waypoint1, waypoint2], profileIdentifier: .automobile)
 
 let waitForInterval: TimeInterval = 5
 

readme.md

@@ -27,7 +27,7 @@ You'll need to install two pods, `MapboxNavigation.swift` and `MapboxDirections.
 Add the following lines to your Podfile:
 
 ```ruby
-pod 'MapboxDirections.swift', :git => 'https://github.com/mapbox/MapboxDirections.swift.git', :commit => 'ceaf58b780fc17ea44a9150041b602d017c1e567'
+pod 'MapboxDirections.swift', :git => 'https://github.com/mapbox/MapboxDirections.swift.git', :commit => '1e5802b7dc5628b04b54bfc2444ea8e6c882e086'
 pod 'MapboxNavigation.swift', :git => 'https://github.com/mapbox/MapboxNavigation.swift.git', :tag => 'v0.0.4'
 ```