[core] PlacedSymbolData contains layer id

2 files changed, 6 insertions, 2 deletions

diff --git a/src/mbgl/text/placement.cpp b/src/mbgl/text/placement.cpp
index 87c505f2d8..9618e5471a 100644
--- a/src/mbgl/text/placement.cpp
+++ b/src/mbgl/text/placement.cpp
@@ -608,7 +608,7 @@ void Placement::placeSymbol(const SymbolInstance& symbolInstance,
         JointPlacement(
             placeText || ctx.alwaysShowText, placeIcon || ctx.alwaysShowIcon, offscreen || bucket.justReloaded));
     assert(pair.second);
-    newSymbolPlaced(symbolInstance, pair.first->second, ctx.placementType, textBoxes, iconBoxes);
+    newSymbolPlaced(symbolInstance, ctx, pair.first->second, ctx.placementType, textBoxes, iconBoxes);
     seenCrossTileIDs.insert(symbolInstance.crossTileID);
 }
 
@@ -1268,6 +1268,7 @@ private:
                                   const mat4& posMatrix,
                                   float textPixelRatio) override;
     void newSymbolPlaced(const SymbolInstance&,
+                         const PlacementContext&,
                          const JointPlacement&,
                          style::SymbolPlacementType,
                          const std::vector<ProjectedCollisionBox>&,
@@ -1476,6 +1477,7 @@ bool TilePlacement::canPlaceAtVariableAnchor(const CollisionBox& box,
 }
 
 void TilePlacement::newSymbolPlaced(const SymbolInstance& symbol,
+                                    const PlacementContext& ctx,
                                     const JointPlacement& placement,
                                     style::SymbolPlacementType placementType,
                                     const std::vector<ProjectedCollisionBox>& textCollisionBoxes,
@@ -1502,7 +1504,8 @@ void TilePlacement::newSymbolPlaced(const SymbolInstance& symbol,
                                 placement.text,
                                 placement.icon,
                                 !placement.skipFade && populateIntersections,
-                                collisionIndex.getViewportPadding()};
+                                collisionIndex.getViewportPadding(),
+                                ctx.getBucket().bucketLeaderID};
     placedSymbolsData.emplace_back(std::move(symbolData));
 }
 
diff --git a/src/mbgl/text/placement.hpp b/src/mbgl/text/placement.hpp
index e62d2bdf3d..6daa09180e 100644
--- a/src/mbgl/text/placement.hpp
+++ b/src/mbgl/text/placement.hpp
@@ -148,6 +148,7 @@ protected:
     void placeLayer(const RenderLayer&, std::set<uint32_t>&);
     virtual void commit();
     virtual void newSymbolPlaced(const SymbolInstance&,
+                                 const PlacementContext&,
                                  const JointPlacement&,
                                  style::SymbolPlacementType,
                                  const std::vector<ProjectedCollisionBox>& /*textBoxes*/,