diff options
Diffstat (limited to 'test/storage')
| -rw-r--r-- | test/storage/offline.cpp | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/test/storage/offline.cpp b/test/storage/offline.cpp index 06789cd828..0faaabc298 100644 --- a/test/storage/offline.cpp +++ b/test/storage/offline.cpp @@ -1,5 +1,4 @@ #include <mbgl/storage/offline.hpp> -#include <mbgl/util/tileset.hpp> #include <mbgl/tile/tile_id.hpp> #include <gtest/gtest.h> @@ -14,49 +13,42 @@ static const LatLngBounds sanFranciscoWrapped = TEST(OfflineTilePyramidRegionDefinition, TileCoverEmpty) { OfflineTilePyramidRegionDefinition region("", LatLngBounds::empty(), 0, 20, 1.0); - Tileset tileset; - EXPECT_EQ((std::vector<CanonicalTileID>{}), region.tileCover(SourceType::Vector, 512, tileset)); + EXPECT_EQ((std::vector<CanonicalTileID>{}), region.tileCover(SourceType::Vector, 512, { 0, 22 })); } TEST(OfflineTilePyramidRegionDefinition, TileCoverZoomIntersection) { OfflineTilePyramidRegionDefinition region("", sanFrancisco, 2, 2, 1.0); - Tileset tileset; - tileset.minZoom = 0; EXPECT_EQ((std::vector<CanonicalTileID>{ { 2, 0, 1 } }), - region.tileCover(SourceType::Vector, 512, tileset)); + region.tileCover(SourceType::Vector, 512, { 0, 22 })); - tileset.minZoom = 3; - EXPECT_EQ((std::vector<CanonicalTileID>{}), region.tileCover(SourceType::Vector, 512, tileset)); + EXPECT_EQ((std::vector<CanonicalTileID>{}), region.tileCover(SourceType::Vector, 512, { 3, 22 })); } TEST(OfflineTilePyramidRegionDefinition, TileCoverTileSize) { OfflineTilePyramidRegionDefinition region("", LatLngBounds::world(), 0, 0, 1.0); - Tileset tileset; EXPECT_EQ((std::vector<CanonicalTileID>{ { 0, 0, 0 } }), - region.tileCover(SourceType::Vector, 512, tileset)); + region.tileCover(SourceType::Vector, 512, { 0, 22 })); EXPECT_EQ((std::vector<CanonicalTileID>{ { 1, 0, 0 }, { 1, 0, 1 }, { 1, 1, 0 }, { 1, 1, 1 } }), - region.tileCover(SourceType::Vector, 256, tileset)); + region.tileCover(SourceType::Vector, 256, { 0, 22 })); } TEST(OfflineTilePyramidRegionDefinition, TileCoverZoomRounding) { OfflineTilePyramidRegionDefinition region("", sanFrancisco, 0.6, 0.7, 1.0); - Tileset tileset; EXPECT_EQ((std::vector<CanonicalTileID>{ { 0, 0, 0 } }), - region.tileCover(SourceType::Vector, 512, tileset)); + region.tileCover(SourceType::Vector, 512, { 0, 22 })); EXPECT_EQ((std::vector<CanonicalTileID>{ { 1, 0, 0 } }), - region.tileCover(SourceType::Raster, 512, tileset)); + region.tileCover(SourceType::Raster, 512, { 0, 22 })); } TEST(OfflineTilePyramidRegionDefinition, TileCoverWrapped) { OfflineTilePyramidRegionDefinition region("", sanFranciscoWrapped, 0, 0, 1.0); - Tileset tileset; EXPECT_EQ((std::vector<CanonicalTileID>{ { 0, 0, 0 } }), - region.tileCover(SourceType::Vector, 512, tileset)); + region.tileCover(SourceType::Vector, 512, { 0, 22 })); } |