From 87edff4047ddaf5a49b31c060bfae55d74d6c0cb Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 14 Jun 2016 12:36:46 -0700
Subject: [core] Use variant<std::string, Tileset> in TileSource

A tile source can either specify a URL to TileJSON, or inline TileJSON.
---
 src/mbgl/style/sources/raster_source.hpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/mbgl/style/sources/raster_source.hpp')

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;
-- 
cgit v1.2.1