move accessToken to MapData

2 files changed, 13 insertions, 3 deletions

diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index 4ebd4100b9..c57ed3dfb3 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 972ad34064..29ba227110 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;