diff options
author | Chris Loer <chris.loer@gmail.com> | 2018-04-24 15:24:51 -0700 |
---|---|---|
committer | Chris Loer <chris.loer@mapbox.com> | 2018-04-25 14:39:03 -0700 |
commit | c04cf57a74fb17eb33893fb097a9c7e96bf24bcf (patch) | |
tree | 8fc1c720d02b9702f33975108816b4165d387137 /src | |
parent | 60cce56d46cb52c73fcb14d3917c1c47c328b72e (diff) | |
download | qtlocation-mapboxgl-c04cf57a74fb17eb33893fb097a9c7e96bf24bcf.tar.gz |
Review changes:
- assert symbol layer tiles must be geometry tiles, instead of dynamically checking
- re-use retainedBucketQuery iterator instead of calling find twice.
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/text/placement.cpp | 8 |
1 files 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<uint32_t> seenCrossTileIDs; for (RenderTile& renderTile : symbolLayer.renderTiles) { - if (!renderTile.tile.isRenderable() || !dynamic_cast<GeometryTile*>(&renderTile.tile)) { + if (!renderTile.tile.isRenderable()) { continue; } + assert(dynamic_cast<GeometryTile*>(&renderTile.tile)); GeometryTile& geometryTile = static_cast<GeometryTile&>(renderTile.tile); @@ -314,8 +315,9 @@ void Placement::updateBucketOpacities(SymbolBucket& bucket, std::set<uint32_t>& 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; } } |