[core] Tweak handling of annotation special case SpriteAtlas

* Simplify SymbolLayout; it never needs to care about more than one SpriteAtlas.
* Move the reference from SymbolLayer::Impl to SymbolBucket. This is a prerequisite for making layer Impls immutable.
This commit is contained in:
John Firebaugh
2017-04-26 12:42:17 -07:00
parent ea0e45b401
commit 1c42daa152
19 changed files with 78 additions and 98 deletions

View File

@@ -1,6 +1,8 @@
#include <mbgl/tile/vector_tile.hpp>
#include <mbgl/tile/tile_loader_impl.hpp>
#include <mbgl/tile/geometry_tile_data.hpp>
#include <mbgl/style/style.hpp>
#include <mbgl/style/update_parameters.hpp>
#include <protozero/pbf_reader.hpp>
@@ -83,7 +85,9 @@ VectorTile::VectorTile(const OverscaledTileID& id_,
std::string sourceID_,
const style::UpdateParameters& parameters,
const Tileset& tileset)
: GeometryTile(id_, sourceID_, parameters),
: GeometryTile(id_, sourceID_, parameters,
*parameters.style.glyphAtlas,
*parameters.style.spriteAtlas),
loader(*this, id_, parameters, tileset) {
}