From 699e78d4e672ef33f6c8d7d5b72dc199f564098e Mon Sep 17 00:00:00 2001 From: Chris Loer Date: Tue, 24 Apr 2018 15:24:51 -0700 Subject: Review changes: - assert symbol layer tiles must be geometry tiles, instead of dynamically checking - re-use retainedBucketQuery iterator instead of calling find twice. --- src/mbgl/text/placement.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mbgl/text/placement.cpp b/src/mbgl/text/placement.cpp index daf996356e..43e8ff4f93 100644 --- a/src/mbgl/text/placement.cpp +++ b/src/mbgl/text/placement.cpp @@ -46,9 +46,10 @@ void Placement::placeLayer(RenderSymbolLayer& symbolLayer, const mat4& projMatri std::unordered_set seenCrossTileIDs; for (RenderTile& renderTile : symbolLayer.renderTiles) { - if (!renderTile.tile.isRenderable() || !dynamic_cast(&renderTile.tile)) { + if (!renderTile.tile.isRenderable()) { continue; } + assert(dynamic_cast(&renderTile.tile)); GeometryTile& geometryTile = static_cast(renderTile.tile); @@ -314,8 +315,9 @@ void Placement::updateBucketOpacities(SymbolBucket& bucket, std::set& bucket.updateOpacity(); bucket.sortFeatures(state.getAngle()); - if (retainedQueryData.find(bucket.bucketInstanceId) != retainedQueryData.end()) { - retainedQueryData.find(bucket.bucketInstanceId)->second.featureSortOrder = bucket.featureSortOrder; + auto retainedData = retainedQueryData.find(bucket.bucketInstanceId); + if (retainedData != retainedQueryData.end()) { + retainedData->second.featureSortOrder = bucket.featureSortOrder; } } -- cgit v1.2.1