Move Placement's CollisionIndex behind a const getter, to ensure it's only used for queries, not insertions.upstream/start-collision

3 files changed, 7 insertions, 4 deletions

diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp
index af0c491e15..cc81f3181b 100644
--- a/src/mbgl/renderer/renderer_impl.cpp
+++ b/src/mbgl/renderer/renderer_impl.cpp
@@ -654,7 +654,7 @@ std::vector<Feature> Renderer::Impl::queryRenderedFeatures(const ScreenLineStrin
     std::unordered_map<std::string, std::vector<Feature>> resultsByLayer;
     for (const auto& sourceID : sourceIDs) {
         if (RenderSource* renderSource = getRenderSource(sourceID)) {
-            auto sourceResults = renderSource->queryRenderedFeatures(geometry, transformState, layers, options, placement->collisionIndex);
+            auto sourceResults = renderSource->queryRenderedFeatures(geometry, transformState, layers, options, placement->getCollisionIndex());
             std::move(sourceResults.begin(), sourceResults.end(), std::inserter(resultsByLayer, resultsByLayer.begin()));
         }
     }
diff --git a/src/mbgl/text/placement.cpp b/src/mbgl/text/placement.cpp
index b3fa9430a0..ac8c15aae9 100644
--- a/src/mbgl/text/placement.cpp
+++ b/src/mbgl/text/placement.cpp
@@ -300,6 +300,8 @@ void Placement::setStale() {
     stale = true;
 }
 
-
+const CollisionIndex& Placement::getCollisionIndex() const {
+    return collisionIndex;
+}
 
 } // namespace mbgl
diff --git a/src/mbgl/text/placement.hpp b/src/mbgl/text/placement.hpp
index fd36ad25e9..a50fc47125 100644
--- a/src/mbgl/text/placement.hpp
+++ b/src/mbgl/text/placement.hpp
@@ -47,8 +47,7 @@ namespace mbgl {
             float symbolFadeChange(TimePoint now) const;
             bool hasTransitions(TimePoint now) const;
 
-            // TODO: public for queryRenderedFeatures
-            CollisionIndex collisionIndex;
+            const CollisionIndex& getCollisionIndex() const;
         
             bool stillRecent(TimePoint now) const;
             void setRecent(TimePoint now);
@@ -66,6 +65,8 @@ namespace mbgl {
                     std::unordered_set<uint32_t>& seenCrossTileIDs);
 
             void updateBucketOpacities(SymbolBucket&, std::unordered_set<uint32_t>&);
+        
+            CollisionIndex collisionIndex;
 
             TransformState state;
             MapMode mapMode;