diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-14 10:55:58 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-14 11:25:45 -0700 |
commit | 9dfcb95e4fe333922306eadd4df5cbde2f03a6c1 (patch) | |
tree | 61c7fb9d3dede6097bda1fd35806131cb21ab957 /src/mbgl/style/source.hpp | |
parent | 755cc80edfc53a680030a88a661afe1d9edd1f75 (diff) | |
download | qtlocation-mapboxgl-9dfcb95e4fe333922306eadd4df5cbde2f03a6c1.tar.gz |
[core] Push Source::tileset down to TileSource
Diffstat (limited to 'src/mbgl/style/source.hpp')
-rw-r--r-- | src/mbgl/style/source.hpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/mbgl/style/source.hpp b/src/mbgl/style/source.hpp index 862ee52068..36e6570fb5 100644 --- a/src/mbgl/style/source.hpp +++ b/src/mbgl/style/source.hpp @@ -10,9 +10,8 @@ #include <mbgl/util/mat4.hpp> #include <mbgl/util/rapidjson.hpp> #include <mbgl/util/feature.hpp> -#include <mbgl/util/tileset.hpp> +#include <mbgl/util/range.hpp> -#include <forward_list> #include <vector> #include <map> @@ -36,16 +35,13 @@ public: Source(SourceType, std::string id, std::string url, - uint16_t tileSize, - std::unique_ptr<Tileset>&&); + uint16_t tileSize); ~Source() override; bool loaded = false; virtual void load(FileSource&) = 0; bool isLoaded() const; - const Tileset* getTileset() const { return tileset.get(); } - // Request or parse all the tiles relevant for the "TransformState". This method // will return true if all the tiles were scheduled for updating of false if // they were not. shouldReparsePartialTiles must be set to "true" if there is @@ -91,8 +87,6 @@ private: protected: void invalidateTiles(); - std::unique_ptr<const Tileset> tileset; - SourceObserver* observer = nullptr; private: |