[core] Replace remaining dynamic_cast with static_cast

5 files changed, 20 insertions, 5 deletions

diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index d686d8440b..90d4d07895 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -44,7 +44,7 @@ using namespace style;
 GeometryTile::GeometryTile(const OverscaledTileID& id_,
                            std::string sourceID_,
                            const TileParameters& parameters)
-    : Tile(id_),
+    : Tile(Kind::Geometry, id_),
       sourceID(std::move(sourceID_)),
       mailbox(std::make_shared<Mailbox>(*Scheduler::GetCurrent())),
       worker(parameters.workerScheduler,
diff --git a/src/mbgl/tile/raster_dem_tile.cpp b/src/mbgl/tile/raster_dem_tile.cpp
index f29861ee71..751f69bad9 100644
--- a/src/mbgl/tile/raster_dem_tile.cpp
+++ b/src/mbgl/tile/raster_dem_tile.cpp
@@ -15,7 +15,7 @@ namespace mbgl {
 RasterDEMTile::RasterDEMTile(const OverscaledTileID& id_,
                        const TileParameters& parameters,
                        const Tileset& tileset)
-    : Tile(id_),
+    : Tile(Kind::RasterDEM, id_),
       loader(*this, id_, parameters, tileset),
       mailbox(std::make_shared<Mailbox>(*Scheduler::GetCurrent())),
       worker(parameters.workerScheduler,
diff --git a/src/mbgl/tile/raster_tile.cpp b/src/mbgl/tile/raster_tile.cpp
index cc71c04ba1..1346f87ae5 100644
--- a/src/mbgl/tile/raster_tile.cpp
+++ b/src/mbgl/tile/raster_tile.cpp
@@ -15,7 +15,7 @@ namespace mbgl {
 RasterTile::RasterTile(const OverscaledTileID& id_,
                        const TileParameters& parameters,
                        const Tileset& tileset)
-    : Tile(id_),
+    : Tile(Kind::Raster, id_),
       loader(*this, id_, parameters, tileset),
       mailbox(std::make_shared<Mailbox>(*Scheduler::GetCurrent())),
       worker(parameters.workerScheduler,
diff --git a/src/mbgl/tile/tile.cpp b/src/mbgl/tile/tile.cpp
index b95944f10e..5a69df5b43 100644
--- a/src/mbgl/tile/tile.cpp
+++ b/src/mbgl/tile/tile.cpp
@@ -9,7 +9,7 @@ namespace mbgl {
 
 static TileObserver nullObserver;
 
-Tile::Tile(OverscaledTileID id_) : id(std::move(id_)), observer(&nullObserver) {
+Tile::Tile(Kind kind_, OverscaledTileID id_) : kind(kind_), id(std::move(id_)), observer(&nullObserver) {
 }
 
 Tile::~Tile() = default;
@@ -27,6 +27,14 @@ void Tile::setTriedCache() {
 }
 
 void Tile::dumpDebugLogs() const {
+    std::string kindString;
+    switch (kind) {
+    case Kind::Geometry: kindString = "Geometry"; break;
+    case Kind::Raster: kindString = "Raster"; break;
+    case Kind::RasterDEM: kindString = "RasterDEM"; break;
+    default: kindString = "Unknown"; break;
+    }
+    Log::Info(Event::General, "Tile::Kind: %s", kindString.c_str());
     Log::Info(Event::General, "Tile::id: %s", util::toString(id).c_str());
     Log::Info(Event::General, "Tile::renderable: %s", isRenderable() ? "yes" : "no");
     Log::Info(Event::General, "Tile::complete: %s", isComplete() ? "yes" : "no");
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;