[core] Fix sort order for queryRenderedFeatures when features are filtered.

Fixes issue #12104.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/mbgl/layout/symbol_instance.hpp b/src/mbgl/layout/symbol_instance.hpp
index 827a5dbbdb..ae79311790 100644
--- a/src/mbgl/layout/symbol_instance.hpp
+++ b/src/mbgl/layout/symbol_instance.hpp
@@ -19,7 +19,6 @@ public:
                    optional<PositionedIcon> shapedIcon,
                    const style::SymbolLayoutProperties::Evaluated&,
                    const float layoutTextSize,
-                   const uint32_t index,
                    const float textBoxScale,
                    const float textPadding,
                    style::SymbolPlacementType textPlacement,
@@ -29,13 +28,13 @@ public:
                    const std::array<float, 2> iconOffset,
                    const GlyphPositionMap&,
                    const IndexedSubfeature&,
-                   const std::size_t featureIndex,
+                   const std::size_t layoutFeatureIndex,
+                   const std::size_t dataFeatureIndex,
                    const std::u16string& key,
                    const float overscaling);
 
     Anchor anchor;
     GeometryCoordinates line;
-    uint32_t index;
     bool hasText;
     bool hasIcon;
     SymbolQuads horizontalGlyphQuads;
@@ -44,7 +43,8 @@ public:
     CollisionFeature textCollisionFeature;
     CollisionFeature iconCollisionFeature;
     WritingModeType writingModes;
-    std::size_t featureIndex;
+    std::size_t layoutFeatureIndex; // Index into the set of features included at layout time
+    std::size_t dataFeatureIndex;   // Index into the underlying tile data feature set
     std::array<float, 2> textOffset;
     std::array<float, 2> iconOffset;
     std::u16string key;