Merge branch 'master' of github.com:mapbox/mapbox-gl-native into bwg-vs2017

1 files changed, 8 insertions, 1 deletions

diff --git a/src/mbgl/tile/tile.hpp b/src/mbgl/tile/tile.hpp
index 5cf74abff5..70b2aa0371 100644
--- a/src/mbgl/tile/tile.hpp
+++ b/src/mbgl/tile/tile.hpp
@@ -35,7 +35,13 @@ class Context;
 
 class Tile : private util::noncopyable {
 public:
-    Tile(OverscaledTileID);
+    enum class Kind : uint8_t {
+        Geometry,
+        Raster,
+        RasterDEM
+    };
+
+    Tile(Kind, OverscaledTileID);
     virtual ~Tile();
 
     void setObserver(TileObserver* observer);
@@ -119,6 +125,7 @@ public:
     
     void dumpDebugLogs() const;
 
+    const Kind kind;
     OverscaledTileID id;
     optional<Timestamp> modified;
     optional<Timestamp> expires;