From b8654b3b04599988f1f7a519853e98d4ca54cfd0 Mon Sep 17 00:00:00 2001 From: Anand Thakker Date: Mon, 16 Oct 2017 16:10:28 -0400 Subject: [core] Move SourceType to the 'style' namespace --- platform/default/mbgl/storage/offline.cpp | 6 +++--- platform/default/mbgl/storage/offline_download.hpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'platform/default') diff --git a/platform/default/mbgl/storage/offline.cpp b/platform/default/mbgl/storage/offline.cpp index 9ec789f725..7670790be9 100644 --- a/platform/default/mbgl/storage/offline.cpp +++ b/platform/default/mbgl/storage/offline.cpp @@ -24,7 +24,7 @@ OfflineTilePyramidRegionDefinition::OfflineTilePyramidRegionDefinition( } } -std::vector OfflineTilePyramidRegionDefinition::tileCover(SourceType type, uint16_t tileSize, const Range& zoomRange) const { +std::vector OfflineTilePyramidRegionDefinition::tileCover(style::SourceType type, uint16_t tileSize, const Range& zoomRange) const { const Range clampedZoomRange = coveringZoomRange(type, tileSize, zoomRange); std::vector result; @@ -38,7 +38,7 @@ std::vector OfflineTilePyramidRegionDefinition::tileCover(Sourc return result; } -uint64_t OfflineTilePyramidRegionDefinition::tileCount(SourceType type, uint16_t tileSize, const Range& zoomRange) const { +uint64_t OfflineTilePyramidRegionDefinition::tileCount(style::SourceType type, uint16_t tileSize, const Range& zoomRange) const { const Range clampedZoomRange = coveringZoomRange(type, tileSize, zoomRange); unsigned long result = 0;; @@ -49,7 +49,7 @@ uint64_t OfflineTilePyramidRegionDefinition::tileCount(SourceType type, uint16_t return result; } -Range OfflineTilePyramidRegionDefinition::coveringZoomRange(SourceType type, uint16_t tileSize, const Range& zoomRange) const { +Range OfflineTilePyramidRegionDefinition::coveringZoomRange(style::SourceType type, uint16_t tileSize, const Range& zoomRange) const { double minZ = std::max(util::coveringZoomLevel(minZoom, type, tileSize), zoomRange.min); double maxZ = std::min(util::coveringZoomLevel(maxZoom, type, tileSize), zoomRange.max); diff --git a/platform/default/mbgl/storage/offline_download.hpp b/platform/default/mbgl/storage/offline_download.hpp index c978ded931..437f221c11 100644 --- a/platform/default/mbgl/storage/offline_download.hpp +++ b/platform/default/mbgl/storage/offline_download.hpp @@ -60,7 +60,7 @@ private: std::deque resourcesRemaining; void queueResource(Resource); - void queueTiles(SourceType, uint16_t tileSize, const Tileset&); + void queueTiles(style::SourceType, uint16_t tileSize, const Tileset&); }; } // namespace mbgl -- cgit v1.2.1