diff options
| author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-12-21 14:14:03 +0200 |
|---|---|---|
| committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-01-04 11:51:33 +0200 |
| commit | c621b8100d8f75a77789371d8c33a7f5dff18651 (patch) | |
| tree | c9b1290a8496d28f0f55f91ae79d58da0ed945e6 /src/mbgl/tile/geometry_tile.cpp | |
| parent | 4e86bca5abecdaa6dcdc361421fe73655e7e1b69 (diff) | |
| download | qtlocation-mapboxgl-c621b8100d8f75a77789371d8c33a7f5dff18651.tar.gz | |
[core] Drop LayerType
Drop LayerType and its remaining usages.
The generic code should be layer type agnostic.
Diffstat (limited to 'src/mbgl/tile/geometry_tile.cpp')
| -rw-r--r-- | src/mbgl/tile/geometry_tile.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp index c85f9ef713..977744248d 100644 --- a/src/mbgl/tile/geometry_tile.cpp +++ b/src/mbgl/tile/geometry_tile.cpp @@ -200,9 +200,10 @@ Bucket* GeometryTile::getBucket(const Layer::Impl& layer) const { if (it == buckets.end()) { return nullptr; } - - assert(it->second); - return it->second.get(); + Bucket* result = it->second.get(); + assert(result); + // Bucket might be outdated, see issue #12432. + return result->supportsLayer(layer) ? result : nullptr; } float GeometryTile::getQueryPadding(const std::vector<const RenderLayer*>& layers) { |