From 87b1da761156ec339ab4ccd159e6ba6997f9e7d0 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 20 May 2015 08:21:29 -0700 Subject: DefaultFileSource has responsibility for handling mapbox:// URLs --- macosx/main.mm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'macosx') diff --git a/macosx/main.mm b/macosx/main.mm index e5a711753f..04dac27d33 100644 --- a/macosx/main.mm +++ b/macosx/main.mm @@ -106,6 +106,12 @@ int main() { mbgl::SQLiteCache cache(defaultCacheDatabase()); mbgl::DefaultFileSource fileSource(&cache); + + // Set access token if present + NSString *accessToken = [[NSProcessInfo processInfo] environment][@"MAPBOX_ACCESS_TOKEN"]; + if (!accessToken) mbgl::Log::Warning(mbgl::Event::Setup, "No access token set. Mapbox vector tiles won't work."); + if (accessToken) fileSource.setAccessToken([accessToken cStringUsingEncoding:[NSString defaultCStringEncoding]]); + mbgl::Map map(view, fileSource); URLHandler *handler = [[URLHandler alloc] init]; @@ -140,11 +146,6 @@ int main() { mbgl::Log::Info(mbgl::Event::Setup, std::string("Changed style to: ") + newStyle.first); }); - // Set access token if present - NSString *accessToken = [[NSProcessInfo processInfo] environment][@"MAPBOX_ACCESS_TOKEN"]; - if (!accessToken) mbgl::Log::Warning(mbgl::Event::Setup, "No access token set. Mapbox vector tiles won't work."); - if (accessToken) map.setAccessToken([accessToken cStringUsingEncoding:[NSString defaultCStringEncoding]]); - // Load style const auto& newStyle = mbgl::util::defaultStyles.front(); map.setStyleURL(newStyle.first); -- cgit v1.2.1