From 12295ef3355170d1877da5ef183eecfe7ad982be Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Fri, 11 Jan 2019 18:55:56 +0200 Subject: [core] SymbolBucket: use single map for paint properties data Obviates unnecessary lookups, improves readability. --- src/mbgl/layout/symbol_layout.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mbgl/layout') diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp index 4acd0a1ccd..a95c414c82 100644 --- a/src/mbgl/layout/symbol_layout.cpp +++ b/src/mbgl/layout/symbol_layout.cpp @@ -469,9 +469,9 @@ void SymbolLayout::createBucket(const ImagePositions&, std::unique_ptrpaintPropertyBinders) { - pair.second.first.populateVertexVectors(feature, bucket->icon.vertices.vertexSize(), {}, {}); - pair.second.second.populateVertexVectors(feature, bucket->text.vertices.vertexSize(), {}, {}); + for (auto& pair : bucket->paintProperties) { + pair.second.iconBinders.populateVertexVectors(feature, bucket->icon.vertices.vertexSize(), {}, {}); + pair.second.textBinders.populateVertexVectors(feature, bucket->text.vertices.vertexSize(), {}, {}); } } -- cgit v1.2.1