add style cycling to Mac OS X app as well

This commit is contained in:
Konstantin Käfer
2015-05-07 10:16:04 +02:00
parent 769364c117
commit b7fa1d7196
2 changed files with 18 additions and 1 deletions

View File

@@ -1,4 +1,5 @@
#include <mbgl/platform/log.hpp>
#include "../platform/default/default_styles.hpp"
#include <mbgl/platform/platform.hpp>
#include <mbgl/platform/darwin/settings_nsuserdefaults.hpp>
#include <mbgl/platform/darwin/Reachability.h>
@@ -125,13 +126,27 @@ int main() {
map.setBearing(settings.bearing);
map.setDebug(settings.debug);
view.setChangeStyleCallback([&map] () {
static uint8_t currentStyleIndex;
if (++currentStyleIndex == mbgl::util::defaultStyles.size()) {
currentStyleIndex = 0;
}
const auto& newStyle = mbgl::util::defaultStyles[currentStyleIndex];
map.setStyleURL(newStyle.first);
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
map.setStyleURL("asset://styles/bright-v7.json");
const auto& newStyle = mbgl::util::defaultStyles.front();
map.setStyleURL(newStyle.first);
view.run();

View File

@@ -28,6 +28,8 @@
'../platform/darwin/reachability.m',
'../platform/default/glfw_view.hpp',
'../platform/default/glfw_view.cpp',
'../platform/default/default_styles.hpp',
'../platform/default/default_styles.cpp',
],
'variables' : {