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/geojson_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/geojson_tile.cpp')
-rw-r--r-- | src/mbgl/tile/geojson_tile.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp index 39cca01728..9162cedf14 100644 --- a/src/mbgl/tile/geojson_tile.cpp +++ b/src/mbgl/tile/geojson_tile.cpp @@ -101,7 +101,8 @@ std::unique_ptr<GeoJSONTile> convertTile(const mapbox::geojsonvt::Tile& tile) { return std::make_unique<GeoJSONTile>(layer); } -GeoJSONTileMonitor::GeoJSONTileMonitor(mapbox::geojsonvt::GeoJSONVT* geojsonvt_, const TileID& id) +GeoJSONTileMonitor::GeoJSONTileMonitor(mapbox::geojsonvt::GeoJSONVT* geojsonvt_, + const OverscaledTileID& id) : tileID(id), geojsonvt(geojsonvt_) { } @@ -119,7 +120,8 @@ void GeoJSONTileMonitor::setGeoJSONVT(mapbox::geojsonvt::GeoJSONVT* vt) { void GeoJSONTileMonitor::update() { if (geojsonvt) { - auto tile = convertTile(geojsonvt->getTile(tileID.sourceZ, tileID.x, tileID.y)); + auto tile = convertTile( + geojsonvt->getTile(tileID.canonical.z, tileID.canonical.x, tileID.canonical.y)); callback(nullptr, std::move(tile), {}, {}); } } |