diff options
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_) { |