diff options
author | Chris Loer <chris.loer@gmail.com> | 2018-06-26 15:05:37 -0700 |
---|---|---|
committer | Chris Loer <chris.loer@mapbox.com> | 2018-07-03 15:28:00 -0700 |
commit | d734f670e8127c7600beb6dad7b7f08b1401e7c0 (patch) | |
tree | 0f37564d1c5034639bfdfb259e3f9c3a1f51be52 /src/mbgl/layout/symbol_instance.cpp | |
parent | cfd436c287f4209d0d994042452ccbb552a6bd28 (diff) | |
download | qtlocation-mapboxgl-d734f670e8127c7600beb6dad7b7f08b1401e7c0.tar.gz |
[core] Fix sort order for queryRenderedFeatures when features are filtered.
Fixes issue #12104.
Diffstat (limited to 'src/mbgl/layout/symbol_instance.cpp')
-rw-r--r-- | src/mbgl/layout/symbol_instance.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/layout/symbol_instance.cpp b/src/mbgl/layout/symbol_instance.cpp index 7dfa8edf43..a9b4b929ec 100644 --- a/src/mbgl/layout/symbol_instance.cpp +++ b/src/mbgl/layout/symbol_instance.cpp @@ -11,7 +11,6 @@ SymbolInstance::SymbolInstance(Anchor& anchor_, optional<PositionedIcon> shapedIcon, const SymbolLayoutProperties::Evaluated& layout, const float layoutTextSize, - const uint32_t index_, const float textBoxScale, const float textPadding, const SymbolPlacementType textPlacement, @@ -21,19 +20,20 @@ SymbolInstance::SymbolInstance(Anchor& anchor_, const std::array<float, 2> iconOffset_, const GlyphPositionMap& positions, const IndexedSubfeature& indexedFeature, - const std::size_t featureIndex_, + const std::size_t layoutFeatureIndex_, + const std::size_t dataFeatureIndex_, const std::u16string& key_, const float overscaling) : anchor(anchor_), line(line_), - index(index_), hasText(false), hasIcon(shapedIcon), // Create the collision features that will be used to check whether this symbol instance can be placed textCollisionFeature(line_, anchor, shapedTextOrientations.first, textBoxScale, textPadding, textPlacement, indexedFeature, overscaling), iconCollisionFeature(line_, anchor, shapedIcon, iconBoxScale, iconPadding, indexedFeature), - featureIndex(featureIndex_), + layoutFeatureIndex(layoutFeatureIndex_), + dataFeatureIndex(dataFeatureIndex_), textOffset(textOffset_), iconOffset(iconOffset_), key(key_) { |