Merge pull request #297 from mapbox/return-response

Directions response JSON is now included in the `DirectionsResult` object
mapbox · Oct 1, 2018 · 5e81476 · 5e81476
2 parents b6bd5b1 + 649017f
commit 5e81476
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changes to the Mapbox Directions SDK for iOS
 
+## master
+
+* `DirectionsResult` now includes the API response as JSON
+
 ## v0.23.0
 
 * Added `Waypoint.allowsArrivingOnOppositeSide` property for restricting the side of arrival. ([#288](https://github.com/mapbox/MapboxDirections.swift/pull/288))

diff --git a/MapboxDirections/MBDirectionsResult.swift b/MapboxDirections/MBDirectionsResult.swift
@@ -8,7 +8,10 @@ import Polyline
 @objc(MBDirectionsResult)
 open class DirectionsResult: NSObject, NSSecureCoding {
 
-    @objc internal init(legs: [RouteLeg], distance: CLLocationDistance, expectedTravelTime: TimeInterval, coordinates: [CLLocationCoordinate2D]?, speechLocale: Locale?, options: DirectionsOptions) {
+    public var json: [String: Any]?
+
+    @objc internal init(json: [String: Any]? = nil, legs: [RouteLeg], distance: CLLocationDistance, expectedTravelTime: TimeInterval, coordinates: [CLLocationCoordinate2D]?, speechLocale: Locale?, options: DirectionsOptions) {
+        self.json = json
         self.directionsOptions = options
         self.legs = legs
         self.distance = distance

diff --git a/MapboxDirections/MBRoute.swift b/MapboxDirections/MBRoute.swift
@@ -9,8 +9,8 @@ import Polyline
 open class Route: DirectionsResult {
     // MARK: Creating a Route
 
-    @objc internal override init(legs: [RouteLeg], distance: CLLocationDistance, expectedTravelTime: TimeInterval, coordinates: [CLLocationCoordinate2D]?, speechLocale: Locale?, options: DirectionsOptions) {
-        super.init(legs: legs, distance: distance, expectedTravelTime: expectedTravelTime, coordinates: coordinates, speechLocale: speechLocale, options: options)
+    @objc internal override init(json: [String : Any]? = nil, legs: [RouteLeg], distance: CLLocationDistance, expectedTravelTime: TimeInterval, coordinates: [CLLocationCoordinate2D]?, speechLocale: Locale?, options: DirectionsOptions) {
+        super.init(json: json, legs: legs, distance: distance, expectedTravelTime: expectedTravelTime, coordinates: coordinates, speechLocale: speechLocale, options: options)
     }
 
     /**
@@ -40,7 +40,7 @@ open class Route: DirectionsResult {
             speechLocale = Locale(identifier: locale)
         }
 
-        super.init(legs: legs, distance: distance, expectedTravelTime: expectedTravelTime, coordinates: coordinates, speechLocale: speechLocale, options: options)
+        super.init(json: json, legs: legs, distance: distance, expectedTravelTime: expectedTravelTime, coordinates: coordinates, speechLocale: speechLocale, options: options)
     }
 
     public var routeOptions: RouteOptions {