From 3d2dcbb6efe38bad93edaaae2d2def2274d4942b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Fri, 20 Mar 2015 19:29:10 +0100
Subject: [PATCH] move accessToken to MapData

---
 include/mbgl/map/map.hpp  |  3 +--
 src/mbgl/map/map.cpp      |  6 +++---
 src/mbgl/map/map_data.hpp | 10 ++++++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index e77149a4d..d18df67a0 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -139,7 +139,7 @@ public:
 
     // API
     void setAccessToken(const std::string &token);
-    const std::string &getAccessToken() const;
+    std::string getAccessToken() const;
 
     // Projection
     inline void getWorldBoundsMeters(ProjectedMeters &sw, ProjectedMeters &ne) const { Projection::getWorldBoundsMeters(sw, ne); }
@@ -252,7 +252,6 @@ private:
     const std::unique_ptr<MapData> data;
 
     std::vector<std::string> classes;
-    std::string accessToken;
 
     std::set<util::ptr<StyleSource>> activeSources;
 
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index 4ebd4100b..c57ed3dfb 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -530,11 +530,11 @@ void Map::stopRotating() {
 #pragma mark - Access Token
 
 void Map::setAccessToken(const std::string &token) {
-    accessToken = token;
+    data->setAccessToken(token);
 }
 
-const std::string &Map::getAccessToken() const {
-    return accessToken;
+std::string Map::getAccessToken() const {
+    return data->getAccessToken();
 }
 
 #pragma mark - Annotations
diff --git a/src/mbgl/map/map_data.hpp b/src/mbgl/map/map_data.hpp
index 972ad3406..29ba22711 100644
--- a/src/mbgl/map/map_data.hpp
+++ b/src/mbgl/map/map_data.hpp
@@ -32,6 +32,15 @@ public:
         styleInfo = info;
     }
 
+    inline std::string getAccessToken() const {
+        Lock lock(mtx);
+        return accessToken;
+    }
+    inline void setAccessToken(const std::string &token) {
+        Lock lock(mtx);
+        accessToken = token;
+    }
+
     inline bool getDebug() const {
         return debug;
     }
@@ -62,6 +71,7 @@ private:
     mutable std::mutex mtx;
 
     StyleInfo styleInfo;
+    std::string accessToken;
     std::atomic<uint8_t> debug { false };
     std::atomic<std::chrono::steady_clock::time_point::duration> animationTime;
     std::atomic<std::chrono::steady_clock::duration> defaultTransitionDuration;