summaryrefslogtreecommitdiff
path: root/src/mbgl/style/source.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-06-13 15:00:57 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-06-14 11:25:45 -0700
commit755cc80edfc53a680030a88a661afe1d9edd1f75 (patch)
tree2edaf1b7a0b717102c2be73a74d4520925501cb5 /src/mbgl/style/source.cpp
parent6eab895bc0683881f793a3a751fa7470603ae9a0 (diff)
downloadqtlocation-mapboxgl-755cc80edfc53a680030a88a661afe1d9edd1f75.tar.gz
[core] Add virtual Source::getZoomRange()
Diffstat (limited to 'src/mbgl/style/source.cpp')
-rw-r--r--src/mbgl/style/source.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mbgl/style/source.cpp b/src/mbgl/style/source.cpp
index 56063188a0..086e0b745c 100644
--- a/src/mbgl/style/source.cpp
+++ b/src/mbgl/style/source.cpp
@@ -100,13 +100,15 @@ bool Source::update(const UpdateParameters& parameters) {
return allTilesUpdated;
}
+ const Range<uint8_t> zoomRange = getZoomRange();
+
// Determine the overzooming/underzooming amounts and required tiles.
int32_t overscaledZoom = util::coveringZoomLevel(parameters.transformState.getZoom(), type, tileSize);
int32_t dataTileZoom = overscaledZoom;
std::vector<UnwrappedTileID> idealTiles;
- if (overscaledZoom >= tileset->zoomRange.min) {
- int32_t idealZoom = std::min<int32_t>(tileset->zoomRange.max, overscaledZoom);
+ if (overscaledZoom >= zoomRange.min) {
+ int32_t idealZoom = std::min<int32_t>(zoomRange.max, overscaledZoom);
// Make sure we're not reparsing overzoomed raster tiles.
if (type == SourceType::Raster) {
@@ -150,7 +152,7 @@ bool Source::update(const UpdateParameters& parameters) {
renderTiles.clear();
algorithm::updateRenderables(getTileFn, createTileFn, retainTileFn, renderTileFn,
- idealTiles, tileset->zoomRange, dataTileZoom);
+ idealTiles, zoomRange, dataTileZoom);
if (type != SourceType::Raster && type != SourceType::Annotations && cache.getSize() == 0) {
size_t conservativeCacheSize =