[core] Ensure that FileSource has access to tile URL, pixelRatio, x, y, z

1 files changed, 22 insertions, 10 deletions

diff --git a/src/mbgl/map/raster_tile_data.cpp b/src/mbgl/map/raster_tile_data.cpp
index 92ffb451b0..fa0bd298b1 100644
--- a/src/mbgl/map/raster_tile_data.cpp
+++ b/src/mbgl/map/raster_tile_data.cpp
@@ -5,27 +5,35 @@
 #include <mbgl/storage/file_source.hpp>
 #include <mbgl/util/worker.hpp>
 #include <mbgl/util/work_request.hpp>
+#include <mbgl/util/url.hpp>
 
 using namespace mbgl;
 
 RasterTileData::RasterTileData(const TileID& id_,
+                               float pixelRatio,
+                               const std::string& urlTemplate,
                                TexturePool &texturePool_,
-                               Worker& worker_)
+                               Worker& worker_,
+                               const std::function<void(std::exception_ptr)>& callback)
     : TileData(id_),
       texturePool(texturePool_),
       worker(worker_) {
-}
+    state = State::loading;
 
-RasterTileData::~RasterTileData() {
-    cancel();
-}
+    Resource resource {
+        Resource::Kind::Tile,
+        util::templateTileURL(urlTemplate, id, pixelRatio)
+    };
 
-void RasterTileData::request(const std::string& url,
-                             const RasterTileData::Callback& callback) {
-    state = State::loading;
+    resource.tileData = Resource::TileData {
+        urlTemplate,
+        pixelRatio,
+        id.x,
+        id.y,
+        id.z
+    };
 
-    FileSource* fs = util::ThreadContext::getFileSource();
-    req = fs->request({ Resource::Kind::Tile, url }, [url, callback, this](Response res) {
+    req = util::ThreadContext::getFileSource()->request(resource, [callback, this](Response res) {
         if (res.error) {
             std::exception_ptr error;
             if (res.error->reason == Response::Error::Reason::NotFound) {
@@ -76,6 +84,10 @@ void RasterTileData::request(const std::string& url,
     });
 }
 
+RasterTileData::~RasterTileData() {
+    cancel();
+}
+
 Bucket* RasterTileData::getBucket(StyleLayer const&) {
     return bucket.get();
 }