diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-13 10:59:33 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-13 10:59:33 -0700 |
| commit | 5c7dfd948ffd52f2b60dcfe052176da788f17893 (patch) | |
| tree | 596d02b0e28d6e7649f9527af2834c90c3c3b056 /test | |
| parent | 3ab7c1cca3aa4658b40af1d7d591850e005d011e (diff) | |
| download | qtlocation-mapboxgl-5c7dfd948ffd52f2b60dcfe052176da788f17893.tar.gz | |
[core] *Tile ↔ *TileData
Tile is now the main base class; RasterTile, VectorTile, etc are its subclasses. GeometryTileData and its subclasses form the piece that's passed to the worker.
Diffstat (limited to 'test')
| -rw-r--r-- | test/style/filter.cpp | 2 | ||||
| -rw-r--r-- | test/test.gypi | 2 | ||||
| -rw-r--r-- | test/tile/geometry_tile_data.cpp (renamed from test/tile/geometry_tile.cpp) | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/test/style/filter.cpp b/test/style/filter.cpp index c013c36cd1..f8f56d9316 100644 --- a/test/style/filter.cpp +++ b/test/style/filter.cpp @@ -3,7 +3,7 @@ #include <mbgl/style/filter.hpp> #include <mbgl/style/filter_evaluator.hpp> #include <mbgl/style/parser.hpp> -#include <mbgl/tile/geometry_tile.hpp> +#include <mbgl/tile/geometry_tile_data.hpp> #include <rapidjson/document.h> diff --git a/test/test.gypi b/test/test.gypi index d93ecd1f35..d7023874f0 100644 --- a/test/test.gypi +++ b/test/test.gypi @@ -56,7 +56,7 @@ 'math/minmax.cpp', 'math/clamp.cpp', - 'tile/geometry_tile.cpp', + 'tile/geometry_tile_data.cpp', 'tile/tile_id.cpp', 'storage/offline.cpp', diff --git a/test/tile/geometry_tile.cpp b/test/tile/geometry_tile_data.cpp index 998a7183a7..6e118d6fd5 100644 --- a/test/tile/geometry_tile.cpp +++ b/test/tile/geometry_tile_data.cpp @@ -1,9 +1,9 @@ #include <mbgl/test/util.hpp> -#include <mbgl/tile/geometry_tile.hpp> +#include <mbgl/tile/geometry_tile_data.hpp> using namespace mbgl; -TEST(GeometryTile, classifyRings1) { +TEST(GeometryTileData, classifyRings1) { std::vector<GeometryCollection> polygons = classifyRings({ { {0, 0}, {0, 40}, {40, 40}, {40, 0}, {0, 0} } }); @@ -14,7 +14,7 @@ TEST(GeometryTile, classifyRings1) { ASSERT_EQ(polygons[0].size(), 1u); } -TEST(GeometryTile, classifyRings2) { +TEST(GeometryTileData, classifyRings2) { std::vector<GeometryCollection> polygons = classifyRings({ { {0, 0}, {0, 40}, {40, 40}, {40, 0}, {0, 0} }, { {10, 10}, {20, 10}, {20, 20}, {10, 10} } @@ -26,7 +26,7 @@ TEST(GeometryTile, classifyRings2) { ASSERT_EQ(polygons[0].size(), 2u); } -TEST(GeometryTile, limitHoles1) { +TEST(GeometryTileData, limitHoles1) { GeometryCollection polygon = { { {0, 0}, {0, 40}, {40, 40}, {40, 0}, {0, 0} }, { {30, 30}, {32, 30}, {32, 32}, {30, 30} }, @@ -43,7 +43,7 @@ TEST(GeometryTile, limitHoles1) { ASSERT_EQ(polygon[1][0].x, 10); } -TEST(GeometryTile, limitHoles2) { +TEST(GeometryTileData, limitHoles2) { GeometryCollection polygon = { { {0, 0}, {0, 40}, {40, 40}, {40, 0}, {0, 0} }, { {10, 10}, {20, 10}, {20, 20}, {10, 10} }, |