diff options
author | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2018-02-05 19:31:03 -0500 |
---|---|---|
committer | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2018-02-08 12:39:30 -0800 |
commit | 4ab07f5be73f802e1f8f9d88eafa7077dbd5cac8 (patch) | |
tree | 7400d2adf7c8b130689598d90dc491d98373bb92 /src/mbgl/renderer/sources/render_vector_source.cpp | |
parent | 64374711a09f27c41c93eb6b72d0f6a560234083 (diff) | |
download | qtlocation-mapboxgl-4ab07f5be73f802e1f8f9d88eafa7077dbd5cac8.tar.gz |
Reset tileset-based render sources when any tileset properties changed. (#11042)
Diffstat (limited to 'src/mbgl/renderer/sources/render_vector_source.cpp')
-rw-r--r-- | src/mbgl/renderer/sources/render_vector_source.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/mbgl/renderer/sources/render_vector_source.cpp b/src/mbgl/renderer/sources/render_vector_source.cpp index a3da3e7cbd..310dfe68b8 100644 --- a/src/mbgl/renderer/sources/render_vector_source.cpp +++ b/src/mbgl/renderer/sources/render_vector_source.cpp @@ -32,14 +32,10 @@ void RenderVectorSource::update(Immutable<style::Source::Impl> baseImpl_, enabled = needsRendering; - optional<Tileset> tileset = impl().getTileset(); + optional<Tileset> _tileset = impl().getTileset(); - if (!tileset) { - return; - } - - if (tileURLTemplates != tileset->tiles) { - tileURLTemplates = tileset->tiles; + if (tileset != _tileset) { + tileset = _tileset; // TODO: this removes existing buckets, and will cause flickering. // Should instead refresh tile data in place. @@ -47,6 +43,11 @@ void RenderVectorSource::update(Immutable<style::Source::Impl> baseImpl_, tilePyramid.renderTiles.clear(); tilePyramid.cache.clear(); } + // Allow clearing the tile pyramid first, before the early return in case + // the new tileset is not yet available or has an error in loading + if (!_tileset) { + return; + } tilePyramid.update(layers, needsRendering, |