diff options
| author | Chris Loer <chris.loer@gmail.com> | 2018-04-18 16:33:37 -0700 |
|---|---|---|
| committer | Chris Loer <chris.loer@mapbox.com> | 2018-04-25 14:39:03 -0700 |
| commit | a62745edf9ee2da1f6ebda07acfd8260f3696e50 (patch) | |
| tree | 3a756eecca1f9bbd03d588f3926425df43333dc7 /src/mbgl/layout/symbol_layout.hpp | |
| parent | eb39c80604935deb666907f90ddc31f50865f828 (diff) | |
| download | qtlocation-mapboxgl-a62745edf9ee2da1f6ebda07acfd8260f3696e50.tar.gz | |
Port global symbol query from GL JS:
- Symbol querying is now global instead of per-tile
- Symbols that bleed over tile boundaries no longer missed in queries
- Symbol results now sorted based on rendering order (ie overlapping symbols change their sort order when a bearing change causes their render order to change)
- Placement::retainedQueryData now responsible for maintaining symbol querying data for buckets that may no longer be in the TilePyramid.
Diffstat (limited to 'src/mbgl/layout/symbol_layout.hpp')
| -rw-r--r-- | src/mbgl/layout/symbol_layout.hpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mbgl/layout/symbol_layout.hpp b/src/mbgl/layout/symbol_layout.hpp index 6951c29ada..c93d8f4106 100644 --- a/src/mbgl/layout/symbol_layout.hpp +++ b/src/mbgl/layout/symbol_layout.hpp @@ -34,8 +34,7 @@ public: GlyphDependencies&); void prepare(const GlyphMap&, const GlyphPositions&, - const ImageMap&, const ImagePositions&, - const OverscaledTileID&, const std::string&); + const ImageMap&, const ImagePositions&); std::unique_ptr<SymbolBucket> place(const bool showCollisionBoxes); @@ -52,9 +51,7 @@ private: const SymbolFeature&, const std::pair<Shaping, Shaping>& shapedTextOrientations, optional<PositionedIcon> shapedIcon, - const GlyphPositionMap&, - const OverscaledTileID&, - const std::string&); + const GlyphPositionMap&); bool anchorIsTooClose(const std::u16string& text, const float repeatDistance, const Anchor&); std::map<std::u16string, std::vector<Anchor>> compareText; |