From 61833be5ea4755add3f291c0b167e70ed14cc02c Mon Sep 17 00:00:00 2001 From: "Justin R. Miller" Date: Thu, 13 Aug 2015 18:11:22 -0700 Subject: [PATCH] simplify endpoint determination --- MapboxDirections.swift | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/MapboxDirections.swift b/MapboxDirections.swift index 9b78282d6..c076edcf3 100644 --- a/MapboxDirections.swift +++ b/MapboxDirections.swift @@ -167,11 +167,11 @@ public class MBRoute { public class MBDirectionsRequest { - public enum MBDirectionsTransportType: Int { - case Automobile - case Walking - case Cycling - case Any + public enum MBDirectionsTransportType: String { + case Automobile = "driving" + case Walking = "walking" + case Cycling = "cycling" + case Any = "" } public let sourceCoordinate: CLLocationCoordinate2D @@ -229,16 +229,7 @@ public class MBDirections: NSObject { var endpoint: String - switch request.transportType { - case .Walking: - endpoint = "walking" - case .Cycling: - endpoint = "cycling" - default: - endpoint = "driving" - } - - var serverRequestString = "http://api.tiles.mapbox.com/v4/directions/mapbox.\(endpoint)/\(self.request.sourceCoordinate.longitude),\(self.request.sourceCoordinate.latitude);\(self.request.destinationCoordinate.longitude),\(self.request.destinationCoordinate.latitude).json?access_token=\(self.accessToken)" + var serverRequestString = "http://api.tiles.mapbox.com/v4/directions/mapbox.\(request.transportType.rawValue)/\(self.request.sourceCoordinate.longitude),\(self.request.sourceCoordinate.latitude);\(self.request.destinationCoordinate.longitude),\(self.request.destinationCoordinate.latitude).json?access_token=\(self.accessToken)" if (self.request.requestsAlternateRoutes) { serverRequestString += "&alternatives=true"