diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-13 14:45:22 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-14 11:25:45 -0700 |
| commit | 6eab895bc0683881f793a3a751fa7470603ae9a0 (patch) | |
| tree | 5e1b231702bb1c93e6a0c8823500a6e6980b0970 /src/mbgl/style/source.cpp | |
| parent | 615a6685a47609310930890203f41815a5f19d48 (diff) | |
| download | qtlocation-mapboxgl-6eab895bc0683881f793a3a751fa7470603ae9a0.tar.gz | |
[core] Use Range<uint8_t> instead of full Tileset where possible
Diffstat (limited to 'src/mbgl/style/source.cpp')
| -rw-r--r-- | src/mbgl/style/source.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/style/source.cpp b/src/mbgl/style/source.cpp index 639c563a64..56063188a0 100644 --- a/src/mbgl/style/source.cpp +++ b/src/mbgl/style/source.cpp @@ -105,8 +105,8 @@ bool Source::update(const UpdateParameters& parameters) { int32_t dataTileZoom = overscaledZoom; std::vector<UnwrappedTileID> idealTiles; - if (overscaledZoom >= tileset->minZoom) { - int32_t idealZoom = std::min<int32_t>(tileset->maxZoom, overscaledZoom); + if (overscaledZoom >= tileset->zoomRange.min) { + int32_t idealZoom = std::min<int32_t>(tileset->zoomRange.max, overscaledZoom); // Make sure we're not reparsing overzoomed raster tiles. if (type == SourceType::Raster) { @@ -150,7 +150,7 @@ bool Source::update(const UpdateParameters& parameters) { renderTiles.clear(); algorithm::updateRenderables(getTileFn, createTileFn, retainTileFn, renderTileFn, - idealTiles, *tileset, dataTileZoom); + idealTiles, tileset->zoomRange, dataTileZoom); if (type != SourceType::Raster && type != SourceType::Annotations && cache.getSize() == 0) { size_t conservativeCacheSize = |