diff options
Diffstat (limited to 'src/mbgl/text/placement.cpp')
| -rw-r--r-- | src/mbgl/text/placement.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/mbgl/text/placement.cpp b/src/mbgl/text/placement.cpp index fd0710d959..96c1873e33 100644 --- a/src/mbgl/text/placement.cpp +++ b/src/mbgl/text/placement.cpp @@ -50,12 +50,13 @@ void Placement::placeLayer(RenderSymbolLayer& symbolLayer, const mat4& projMatri } assert(dynamic_cast<GeometryTile*>(&renderTile.tile)); GeometryTile& geometryTile = static_cast<GeometryTile&>(renderTile.tile); - - - auto bucket = geometryTile.getBucket(*symbolLayer.baseImpl); - assert(dynamic_cast<SymbolBucket*>(bucket)); - SymbolBucket& symbolBucket = *reinterpret_cast<SymbolBucket*>(bucket); - + + auto bucket = dynamic_cast<SymbolBucket*>(geometryTile.getBucket(*symbolLayer.baseImpl)); + if (!bucket) { + continue; + } + SymbolBucket& symbolBucket = *bucket; + if (symbolBucket.bucketLeaderID != symbolLayer.getID()) { // Only place this layer if it's the "group leader" for the bucket continue; @@ -231,9 +232,12 @@ void Placement::updateLayerOpacities(RenderSymbolLayer& symbolLayer) { continue; } - auto bucket = renderTile.tile.getBucket(*symbolLayer.baseImpl); - assert(dynamic_cast<SymbolBucket*>(bucket)); - SymbolBucket& symbolBucket = *reinterpret_cast<SymbolBucket*>(bucket); + auto bucket = dynamic_cast<SymbolBucket*>(renderTile.tile.getBucket(*symbolLayer.baseImpl)); + if (!bucket) { + continue; + } + SymbolBucket& symbolBucket = *bucket; + if (symbolBucket.bucketLeaderID != symbolLayer.getID()) { // Only update opacities this layer if it's the "group leader" for the bucket continue; |