diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-26 12:42:17 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-26 16:29:44 -0700 |
| commit | 1c42daa152c1e7302c0997c00e206cf7c4b33d73 (patch) | |
| tree | edc0115651ed5e2931c8362016d2e7da5928f3ea /src/mbgl/tile/geojson_tile.cpp | |
| parent | ea0e45b4019ea18c03718e67a3397202080a644a (diff) | |
| download | qtlocation-mapboxgl-1c42daa152c1e7302c0997c00e206cf7c4b33d73.tar.gz | |
[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.
Diffstat (limited to 'src/mbgl/tile/geojson_tile.cpp')
| -rw-r--r-- | src/mbgl/tile/geojson_tile.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp index 5a2a72f50b..00e10d148a 100644 --- a/src/mbgl/tile/geojson_tile.cpp +++ b/src/mbgl/tile/geojson_tile.cpp @@ -1,6 +1,8 @@ #include <mbgl/tile/geojson_tile.hpp> #include <mbgl/tile/geometry_tile_data.hpp> #include <mbgl/style/query.hpp> +#include <mbgl/style/style.hpp> +#include <mbgl/style/update_parameters.hpp> #include <mapbox/geojsonvt.hpp> #include <supercluster.hpp> @@ -83,7 +85,9 @@ public: GeoJSONTile::GeoJSONTile(const OverscaledTileID& overscaledTileID, std::string sourceID_, const style::UpdateParameters& parameters) - : GeometryTile(overscaledTileID, sourceID_, parameters) { + : GeometryTile(overscaledTileID, sourceID_, parameters, + *parameters.style.glyphAtlas, + *parameters.style.spriteAtlas) { } void GeoJSONTile::updateData(const mapbox::geometry::feature_collection<int16_t>& features) { |