diff options
author | Ansis Brammanis <ansis.brammanis@gmail.com> | 2018-01-08 12:57:03 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-08 12:57:03 -0500 |
commit | feab36a9fbc5162150de8c3e26df8585b1430318 (patch) | |
tree | 3cb44b5fc7b1679ce5cfa502413db1540c4cccdb /src/mbgl/text/cross_tile_symbol_index.hpp | |
parent | f86c1b7d0f440b7cf0da72a3c0940715f97d709e (diff) | |
download | qtlocation-mapboxgl-feab36a9fbc5162150de8c3e26df8585b1430318.tar.gz |
[core] port minor collision changes from -js (#10764)
Diffstat (limited to 'src/mbgl/text/cross_tile_symbol_index.hpp')
-rw-r--r-- | src/mbgl/text/cross_tile_symbol_index.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/text/cross_tile_symbol_index.hpp b/src/mbgl/text/cross_tile_symbol_index.hpp index c67cd37e00..995e0061b9 100644 --- a/src/mbgl/text/cross_tile_symbol_index.hpp +++ b/src/mbgl/text/cross_tile_symbol_index.hpp @@ -42,11 +42,10 @@ public: class CrossTileSymbolLayerIndex { public: CrossTileSymbolLayerIndex(); - void addBucket(const OverscaledTileID&, SymbolBucket&, uint32_t& maxCrossTileID); + bool addBucket(const OverscaledTileID&, SymbolBucket&, uint32_t& maxCrossTileID); bool removeStaleBuckets(const std::unordered_set<uint32_t>& currentIDs); private: std::map<uint8_t,std::map<OverscaledTileID,TileLayerIndex>> indexes; - uint32_t maxBucketInstanceId = 0; }; class CrossTileSymbolIndex { @@ -59,6 +58,7 @@ public: private: std::map<std::string, CrossTileSymbolLayerIndex> layerIndexes; uint32_t maxCrossTileID = 0; + uint32_t maxBucketInstanceId = 0; }; } // namespace mbgl |