diff options
author | Chris Loer <chris.loer@gmail.com> | 2018-03-31 18:17:16 -0700 |
---|---|---|
committer | Chris Loer <chris.loer@mapbox.com> | 2018-04-02 10:39:22 -0700 |
commit | 11961d5c31e6ec245823b583a4dc5e1b12dd7f5a (patch) | |
tree | bba4df37176aeb92d903794969c296df1e7ad2c6 /src/mbgl/tile/geometry_tile.hpp | |
parent | 7f42e3970ee8c6a57fbb4dba7c564ff17c2eb6bb (diff) | |
download | qtlocation-mapboxgl-11961d5c31e6ec245823b583a4dc5e1b12dd7f5a.tar.gz |
[core] Consolidate GeometryTile symbol/nonSymbolBuckets
Conversion to one-phase tile loading removed any need to track them separately.
Diffstat (limited to 'src/mbgl/tile/geometry_tile.hpp')
-rw-r--r-- | src/mbgl/tile/geometry_tile.hpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index 98b5f0c490..0161e00efd 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -65,23 +65,20 @@ public: class LayoutResult { public: - std::unordered_map<std::string, std::shared_ptr<Bucket>> nonSymbolBuckets; + std::unordered_map<std::string, std::shared_ptr<Bucket>> buckets; std::unique_ptr<FeatureIndex> featureIndex; std::unique_ptr<GeometryTileData> tileData; - std::unordered_map<std::string, std::shared_ptr<Bucket>> symbolBuckets; optional<AlphaImage> glyphAtlasImage; optional<PremultipliedImage> iconAtlasImage; - LayoutResult(std::unordered_map<std::string, std::shared_ptr<Bucket>> nonSymbolBuckets_, + LayoutResult(std::unordered_map<std::string, std::shared_ptr<Bucket>> buckets_, std::unique_ptr<FeatureIndex> featureIndex_, std::unique_ptr<GeometryTileData> tileData_, - std::unordered_map<std::string, std::shared_ptr<Bucket>> symbolBuckets_, optional<AlphaImage> glyphAtlasImage_, optional<PremultipliedImage> iconAtlasImage_) - : nonSymbolBuckets(std::move(nonSymbolBuckets_)), + : buckets(std::move(buckets_)), featureIndex(std::move(featureIndex_)), tileData(std::move(tileData_)), - symbolBuckets(std::move(symbolBuckets_)), glyphAtlasImage(std::move(glyphAtlasImage_)), iconAtlasImage(std::move(iconAtlasImage_)) {} }; @@ -117,8 +114,7 @@ private: uint64_t correlationID = 0; - std::unordered_map<std::string, std::shared_ptr<Bucket>> nonSymbolBuckets; - std::unordered_map<std::string, std::shared_ptr<Bucket>> symbolBuckets; + std::unordered_map<std::string, std::shared_ptr<Bucket>> buckets; optional<std::pair<std::unique_ptr<const GeometryTileData>, std::unique_ptr<FeatureIndex>>> dataPendingCommit; std::unique_ptr<FeatureIndex> featureIndex; |