diff options
| author | Chris Loer <chris.loer@gmail.com> | 2017-11-07 12:17:34 -0800 |
|---|---|---|
| committer | Chris Loer <chris.loer@gmail.com> | 2017-11-07 12:18:22 -0800 |
| commit | 0bbc80f5e81b6f1a2ed0bf12074bcde95a755f89 (patch) | |
| tree | 390d532ff66a10a4ec8ee0a52680b921ddfc44c5 | |
| parent | d4c8395b236b94427239c71cc053bb37da2b6f98 (diff) | |
| download | qtlocation-mapboxgl-0bbc80f5e81b6f1a2ed0bf12074bcde95a755f89.tar.gz | |
Remove unused `SymbolPlacementType` for icons.
| -rw-r--r-- | src/mbgl/layout/symbol_instance.cpp | 1 | ||||
| -rw-r--r-- | src/mbgl/layout/symbol_instance.hpp | 1 | ||||
| -rw-r--r-- | src/mbgl/layout/symbol_layout.cpp | 6 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/mbgl/layout/symbol_instance.cpp b/src/mbgl/layout/symbol_instance.cpp index baaafe9ca3..d0398fcd30 100644 --- a/src/mbgl/layout/symbol_instance.cpp +++ b/src/mbgl/layout/symbol_instance.cpp @@ -18,7 +18,6 @@ SymbolInstance::SymbolInstance(Anchor& anchor_, const std::array<float, 2> textOffset_, const float iconBoxScale, const float iconPadding, - const SymbolPlacementType, // TODO: vestigial? const std::array<float, 2> iconOffset_, const GlyphPositionMap& positions, const IndexedSubfeature& indexedFeature, diff --git a/src/mbgl/layout/symbol_instance.hpp b/src/mbgl/layout/symbol_instance.hpp index c6c02c2e38..827a5dbbdb 100644 --- a/src/mbgl/layout/symbol_instance.hpp +++ b/src/mbgl/layout/symbol_instance.hpp @@ -26,7 +26,6 @@ public: const std::array<float, 2> textOffset, const float iconBoxScale, const float iconPadding, - style::SymbolPlacementType iconPlacement, const std::array<float, 2> iconOffset, const GlyphPositionMap&, const IndexedSubfeature&, diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp index f048c0cd6e..6aed6bbead 100644 --- a/src/mbgl/layout/symbol_layout.cpp +++ b/src/mbgl/layout/symbol_layout.cpp @@ -290,9 +290,7 @@ void SymbolLayout::addFeature(const std::size_t index, const SymbolPlacementType textPlacement = layout.get<TextRotationAlignment>() != AlignmentType::Map ? SymbolPlacementType::Point : layout.get<SymbolPlacement>(); - const SymbolPlacementType iconPlacement = layout.get<IconRotationAlignment>() != AlignmentType::Map - ? SymbolPlacementType::Point - : layout.get<SymbolPlacement>(); + const float textRepeatDistance = symbolSpacing / 2; IndexedSubfeature indexedFeature = { feature.index, sourceID, sourceLayer->getName(), bucketName, symbolInstances.size(), tileID.canonical.z, tileID.canonical.x, tileID.canonical.y }; @@ -323,7 +321,7 @@ void SymbolLayout::addFeature(const std::size_t index, layout.evaluate(zoom, feature), layoutTextSize, symbolInstances.size(), textBoxScale, textPadding, textPlacement, textOffset, - iconBoxScale, iconPadding, iconPlacement, iconOffset, + iconBoxScale, iconPadding, iconOffset, glyphPositionMap, indexedFeature, index, feature.text ? *feature.text : std::u16string{}, overscaling); } }; |