Skip to content

Commit

Permalink
Merge pull request #385 from mapbox/1ec5-token
Browse files Browse the repository at this point in the history 
Keep access token out this repository
  • Loading branch information
@1ec5
1ec5 authored Oct 30, 2019
2 parents 88e52af + b73e30d commit 702ed4e
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 17 deletions.
9 changes: 1 addition & 8 deletions Directions Example/ViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@

#import "ViewController.h"

// A Mapbox access token is required to use the Directions API.
// https://docs.mapbox.com/help/how-mapbox-works/access-tokens/#creating-and-managing-access-tokens
NSString * const MapboxAccessToken = @"<# your Mapbox access token #>";

@interface ViewController ()

@property (nonatomic) MGLMapView *mapView;
Expand All @@ -18,9 +14,6 @@ @implementation ViewController
- (void)viewDidLoad {
[super viewDidLoad];

NSAssert(![MapboxAccessToken isEqualToString:@"<# your Mapbox access token #>"], @"You must set `MapboxAccessToken` to your Mapbox access token.");
[MGLAccountManager setAccessToken:MapboxAccessToken];

self.mapView = [[MGLMapView alloc] initWithFrame:self.view.bounds];
self.mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
[self.view addSubview:self.mapView];
Expand All @@ -36,7 +29,7 @@ - (void)viewDidAppear:(BOOL)animated {
MBRouteOptions *options = [[MBRouteOptions alloc] initWithWaypoints:waypoints profileIdentifier:nil];
options.includesSteps = YES;

[[[MBDirections alloc] initWithAccessToken:MapboxAccessToken] calculateDirectionsWithOptions:options completionHandler:^(NSArray<MBWaypoint *> * _Nullable waypoints, NSArray<MBRoute *> * _Nullable routes, NSError * _Nullable error) {
[[MBDirections sharedDirections] calculateDirectionsWithOptions:options completionHandler:^(NSArray<MBWaypoint *> * _Nullable waypoints, NSArray<MBRoute *> * _Nullable routes, NSError * _Nullable error) {
if (error) {
NSLog(@"Error calculating directions: %@", error);
return;
Expand Down
11 changes: 2 additions & 9 deletions Directions Example/ViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ import CoreLocation
import MapboxDirections
import Mapbox

// A Mapbox access token is required to use the Directions API.
// https://docs.mapbox.com/help/how-mapbox-works/access-tokens/#creating-and-managing-access-tokens
let MapboxAccessToken = "<# your Mapbox access token #>"

class ViewController: UIViewController, MBDrawingViewDelegate {
@IBOutlet var mapView: MGLMapView!
var drawingView: MBDrawingView?
Expand All @@ -17,9 +13,6 @@ class ViewController: UIViewController, MBDrawingViewDelegate {
override func viewDidLoad() {
super.viewDidLoad()

assert(MapboxAccessToken != "<# your Mapbox access token #>", "You must set `MapboxAccessToken` to your Mapbox access token.")
MGLAccountManager.accessToken = MapboxAccessToken

mapView = MGLMapView(frame: view.bounds)
mapView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
mapView.setCenter(ViewController.initialMapCenter, animated: false)
Expand Down Expand Up @@ -77,7 +70,7 @@ class ViewController: UIViewController, MBDrawingViewDelegate {
let options = RouteOptions(waypoints: [wp1, wp2])
options.includesSteps = true

Directions(accessToken: MapboxAccessToken).calculate(options) { (waypoints, routes, error) in
Directions.shared.calculate(options) { (waypoints, routes, error) in
guard error == nil else {
print("Error calculating directions: \(error!)")
return
Expand Down Expand Up @@ -140,7 +133,7 @@ class ViewController: UIViewController, MBDrawingViewDelegate {
func makeMatchRequest(locations: [CLLocationCoordinate2D]) {
let matchOptions = MatchOptions(coordinates: locations)

Directions(accessToken: MapboxAccessToken).calculate(matchOptions) { (matches, error) in
Directions.shared.calculate(matchOptions) { (matches, error) in
if let error = error {
print(error.localizedDescription)
return
Expand Down
40 changes: 40 additions & 0 deletions MapboxDirections.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,7 @@
DADD27B31E5AAAD800D31FAD /* Resources */,
DADD27F51E5ABD6600D31FAD /* Copy Frameworks */,
C5AD867D202E251E00BF47D5 /* Embed Frameworks */,
DA3DFB08236973E9003AE57F /* Apply Mapbox Access Token */,
);
buildRules = (
);
Expand All @@ -1025,6 +1026,7 @@
DADD27CD1E5AAFFD00D31FAD /* Frameworks */,
DADD27CE1E5AAFFD00D31FAD /* Resources */,
DADD27F61E5AC7FA00D31FAD /* Copy Frameworks */,
DA3DFB09236975E5003AE57F /* Apply Mapbox Access Token */,
);
buildRules = (
);
Expand Down Expand Up @@ -1225,6 +1227,44 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
DA3DFB08236973E9003AE57F /* Apply Mapbox Access Token */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"$(TARGET_BUILD_DIR)/$(INFOPLIST_PATH)",
);
name = "Apply Mapbox Access Token";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Look for a global file named 'mapbox' or '.mapbox' within the home directory\ntoken_file=~/.mapbox\ntoken_file2=~/mapbox\ntoken=\"$(cat $token_file 2>/dev/null || cat $token_file2 2>/dev/null)\"\nif [ \"$token\" ]; then\n plutil -replace MGLMapboxAccessToken -string $token \"$TARGET_BUILD_DIR/$INFOPLIST_PATH\"\nelse\n echo 'warning: Missing Mapbox access token'\n open 'https://account.mapbox.com/access-tokens/'\n echo \"warning: Get an access token from <https://account.mapbox.com/access-tokens/>, then create a new file at $token_file or $token_file2 that contains the access token.\"\nfi\n";
};
DA3DFB09236975E5003AE57F /* Apply Mapbox Access Token */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"$(TARGET_BUILD_DIR)/$(INFOPLIST_PATH)",
);
name = "Apply Mapbox Access Token";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Look for a global file named 'mapbox' or '.mapbox' within the home directory\ntoken_file=~/.mapbox\ntoken_file2=~/mapbox\ntoken=\"$(cat $token_file 2>/dev/null || cat $token_file2 2>/dev/null)\"\nif [ \"$token\" ]; then\n plutil -replace MGLMapboxAccessToken -string $token \"$TARGET_BUILD_DIR/$INFOPLIST_PATH\"\nelse\n echo 'warning: Missing Mapbox access token'\n open 'https://account.mapbox.com/access-tokens/'\n echo \"warning: Get an access token from <https://account.mapbox.com/access-tokens/>, then create a new file at $token_file or $token_file2 that contains the access token.\"\nfi\n";
};
DADD27F51E5ABD6600D31FAD /* Copy Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down

0 comments on commit 702ed4e

Please sign in to comment.