diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-05-10 11:47:54 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-05-10 14:50:56 +0200 |
commit | ec70125e41e4e9db5f1d0941c0129d80f5792896 (patch) | |
tree | 639654a3dfda72cf0c1c1a2a0a353fe0b484e45e /src/mbgl/tile/vector_tile.cpp | |
parent | bdcbceff8002d6a0ec2ce6c1d2518b03c007ddf6 (diff) | |
download | qtlocation-mapboxgl-ec70125e41e4e9db5f1d0941c0129d80f5792896.tar.gz |
[core] move TileData and dependents to new *TileID classes
Diffstat (limited to 'src/mbgl/tile/vector_tile.cpp')
-rw-r--r-- | src/mbgl/tile/vector_tile.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mbgl/tile/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp index 25314c114c..27edd85324 100644 --- a/src/mbgl/tile/vector_tile.cpp +++ b/src/mbgl/tile/vector_tile.cpp @@ -217,7 +217,8 @@ std::string VectorTileLayer::getName() const { return name; } -VectorTileMonitor::VectorTileMonitor(const TileID& tileID_, float pixelRatio_, const std::string& urlTemplate_, FileSource& fileSource_) +VectorTileMonitor::VectorTileMonitor(const OverscaledTileID& tileID_, float pixelRatio_, + const std::string& urlTemplate_, FileSource& fileSource_) : tileID(tileID_), pixelRatio(pixelRatio_), urlTemplate(urlTemplate_), @@ -225,7 +226,8 @@ VectorTileMonitor::VectorTileMonitor(const TileID& tileID_, float pixelRatio_, c } std::unique_ptr<AsyncRequest> VectorTileMonitor::monitorTile(const GeometryTileMonitor::Callback& callback) { - const Resource resource = Resource::tile(urlTemplate, pixelRatio, tileID.x, tileID.y, tileID.sourceZ); + const Resource resource = Resource::tile(urlTemplate, pixelRatio, tileID.canonical.x, + tileID.canonical.y, tileID.canonical.z); return fileSource.request(resource, [callback, this](Response res) { if (res.error) { callback(std::make_exception_ptr(std::runtime_error(res.error->message)), nullptr, res.modified, res.expires); |