diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-14 12:36:46 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-15 11:28:34 -0700 |
| commit | 87edff4047ddaf5a49b31c060bfae55d74d6c0cb (patch) | |
| tree | 099ec42890a4449b538dfd70666e3f27044a0a40 /src/mbgl/style/sources/raster_source.hpp | |
| parent | a56f65a4d81b2ee7e1b76816b125c3a7516ceb2a (diff) | |
| download | qtlocation-mapboxgl-87edff4047ddaf5a49b31c060bfae55d74d6c0cb.tar.gz | |
[core] Use variant<std::string, Tileset> in TileSource
A tile source can either specify a URL to TileJSON, or inline TileJSON.
Diffstat (limited to 'src/mbgl/style/sources/raster_source.hpp')
| -rw-r--r-- | src/mbgl/style/sources/raster_source.hpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mbgl/style/sources/raster_source.hpp b/src/mbgl/style/sources/raster_source.hpp index 4702052b77..27b2276df5 100644 --- a/src/mbgl/style/sources/raster_source.hpp +++ b/src/mbgl/style/sources/raster_source.hpp @@ -7,10 +7,9 @@ namespace style { class RasterSource : public TileSource { public: - RasterSource(std::string id, - std::string url, - uint16_t tileSize, - std::unique_ptr<Tileset>&&); + static std::unique_ptr<RasterSource> parse(std::string id, const JSValue&); + + RasterSource(std::string id, variant<std::string, Tileset>, uint16_t tileSize); private: std::unique_ptr<Tile> createTile(const OverscaledTileID&, const UpdateParameters&) final; |