diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-05-20 08:21:29 -0700 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2015-05-26 12:14:10 +0200 |
commit | 87b1da761156ec339ab4ccd159e6ba6997f9e7d0 (patch) | |
tree | a5b9bdedbff7f6d4edd6945d5ca4f29523b87c06 /macosx | |
parent | f11a9f8fd9f4a53195168518f6ef1efe782f1cf8 (diff) | |
download | qtlocation-mapboxgl-87b1da761156ec339ab4ccd159e6ba6997f9e7d0.tar.gz |
DefaultFileSource has responsibility for handling mapbox:// URLs
Diffstat (limited to 'macosx')
-rw-r--r-- | macosx/main.mm | 11 |
1 files changed, 6 insertions, 5 deletions
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); |