[core] retain tiles differently and remove old TileID class

2 files changed, 6 insertions, 7 deletions

diff --git a/platform/default/mbgl/storage/offline.cpp b/platform/default/mbgl/storage/offline.cpp
index 931e079771..b13aa05039 100644
--- a/platform/default/mbgl/storage/offline.cpp
+++ b/platform/default/mbgl/storage/offline.cpp
@@ -23,20 +23,20 @@ OfflineTilePyramidRegionDefinition::OfflineTilePyramidRegionDefinition(
     }
 }
 
-std::vector<TileID> OfflineTilePyramidRegionDefinition::tileCover(SourceType type, uint16_t tileSize, const SourceInfo& info) const {
-    double minZ = std::max<double>(coveringZoomLevel(minZoom, type, tileSize), info.minZoom);
-    double maxZ = std::min<double>(coveringZoomLevel(maxZoom, type, tileSize), info.maxZoom);
+std::vector<CanonicalTileID> OfflineTilePyramidRegionDefinition::tileCover(SourceType type, uint16_t tileSize, const SourceInfo& info) const {
+    double minZ = std::max<double>(util::coveringZoomLevel(minZoom, type, tileSize), info.minZoom);
+    double maxZ = std::min<double>(util::coveringZoomLevel(maxZoom, type, tileSize), info.maxZoom);
 
     assert(minZ >= 0);
     assert(maxZ >= 0);
     assert(minZ < std::numeric_limits<uint8_t>::max());
     assert(maxZ < std::numeric_limits<uint8_t>::max());
 
-    std::vector<TileID> result;
+    std::vector<CanonicalTileID> result;
 
     for (uint8_t z = minZ; z <= maxZ; z++) {
-        for (const auto& tile : mbgl::tileCover(bounds, z, z)) {
-            result.push_back(tile.normalized());
+        for (const auto& tile : util::tileCover(bounds, z)) {
+            result.emplace_back(tile.canonical);
         }
     }
 
diff --git a/platform/default/mbgl/storage/offline_database.cpp b/platform/default/mbgl/storage/offline_database.cpp
index 7826d140a1..52ab6504fa 100644
--- a/platform/default/mbgl/storage/offline_database.cpp
+++ b/platform/default/mbgl/storage/offline_database.cpp
@@ -4,7 +4,6 @@
 #include <mbgl/util/io.hpp>
 #include <mbgl/util/string.hpp>
 #include <mbgl/util/chrono.hpp>
-#include <mbgl/map/tile_id.hpp>
 #include <mbgl/platform/log.hpp>
 
 #include "sqlite3.hpp"