[core] Replace FeatureIndex::collisionTile with a method parameter

This reduces state and simplifies the test added in the prior commit.

1 files changed, 1 insertions, 9 deletions

diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp
index 9732f23b32..e34629bdba 100644
--- a/test/tile/vector_tile.test.cpp
+++ b/test/tile/vector_tile.test.cpp
@@ -62,14 +62,6 @@ TEST(VectorTile, Issue7615) {
     auto symbolBucket = std::make_shared<SymbolBucket>(
         MapMode::Continuous, style::SymbolLayoutProperties::Evaluated(), false, false);
 
-    // First onLayout is required so that a non-null FeatureIndex is available.
-    tile.onLayout(GeometryTile::LayoutResult {
-        {},
-        std::make_unique<FeatureIndex>(),
-        nullptr,
-        0
-    });
-
     // Simulate placement of a symbol layer.
     tile.onPlacement(GeometryTile::PlacementResult {
         {{
@@ -80,7 +72,7 @@ TEST(VectorTile, Issue7615) {
         0
     });
 
-    // Second onLayout should not cause the existing symbol bucket to be discarded.
+    // Subsequent onLayout should not cause the existing symbol bucket to be discarded.
     tile.onLayout(GeometryTile::LayoutResult {
         {},
         nullptr,