Skip to content

Commit

Permalink
simplify endpoint determination
Browse files Browse the repository at this point in the history
  • Loading branch information
incanus committed Aug 14, 2015
1 parent 2f31917 commit 61833be
Showing 1 changed file with 6 additions and 15 deletions.
21 changes: 6 additions & 15 deletions MapboxDirections.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 61833be

Please sign in to comment.