DefaultFileSource has responsibility for handling mapbox:// URLs

3 files changed, 10 insertions, 8 deletions

diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index a6aac08b3c..d82a1d0364 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -99,10 +99,6 @@ public:
     uint16_t getWidth() const;
     uint16_t getHeight() const;
 
-    // API
-    void setAccessToken(const std::string &token);
-    std::string getAccessToken() const;
-
     // Projection
     void getWorldBoundsMeters(ProjectedMeters &sw, ProjectedMeters &ne) const;
     void getWorldBoundsLatLng(LatLng &sw, LatLng &ne) const;
diff --git a/include/mbgl/storage/default_file_source.hpp b/include/mbgl/storage/default_file_source.hpp
index 405b04a49c..8cfae03a96 100644
--- a/include/mbgl/storage/default_file_source.hpp
+++ b/include/mbgl/storage/default_file_source.hpp
@@ -15,6 +15,9 @@ public:
     DefaultFileSource(FileCache *cache, const std::string &root = "");
     ~DefaultFileSource() override;
 
+    void setAccessToken(const std::string& t) { accessToken = t; }
+    std::string getAccessToken() const { return accessToken; }
+
     // FileSource API
     Request* request(const Resource&, uv_loop_t*, Callback) override;
     void cancel(Request*) override;
@@ -23,6 +26,7 @@ public:
     class Impl;
 private:
     const std::unique_ptr<util::Thread<Impl>> thread;
+    std::string accessToken;
 };
 
 }
diff --git a/include/mbgl/storage/resource.hpp b/include/mbgl/storage/resource.hpp
index cfd52caa75..2fcb3b1b78 100644
--- a/include/mbgl/storage/resource.hpp
+++ b/include/mbgl/storage/resource.hpp
@@ -9,10 +9,12 @@ namespace mbgl {
 struct Resource {
     enum Kind : uint8_t {
         Unknown = 0,
-        Tile = 1,
-        Glyphs = 2,
-        Image = 3,
-        JSON = 4,
+        Style,
+        Source,
+        Tile,
+        Glyphs,
+        JSON,
+        Image
     };
 
     const Kind kind;