[core] Include bucket name in queryRenderedSymbols duplicate feature filter

 - Port of GL JS PR #5703
 - Fixes issue #10616

1 files changed, 2 insertions, 2 deletions

diff --git a/src/mbgl/text/collision_index.cpp b/src/mbgl/text/collision_index.cpp
index fee28b5873..8014efe6c7 100644
--- a/src/mbgl/text/collision_index.cpp
+++ b/src/mbgl/text/collision_index.cpp
@@ -303,13 +303,13 @@ std::vector<IndexedSubfeature> CollisionIndex::queryRenderedSymbols(const Geomet
         }
     }
 
-    std::unordered_map<std::string, std::unordered_set<std::size_t>> sourceLayerFeatures;
+    std::unordered_map<std::string, std::unordered_map<std::string, std::unordered_set<std::size_t>>> sourceLayerFeatures;
     for (auto& queryResult : thisTileFeatures) {
         auto& feature = queryResult.first;
         auto& bbox = queryResult.second;
 
         // Skip already seen features.
-        auto& seenFeatures = sourceLayerFeatures[feature.sourceLayerName];
+        auto& seenFeatures = sourceLayerFeatures[feature.sourceLayerName][feature.bucketName];
         if (seenFeatures.find(feature.index) != seenFeatures.end())
             continue;