diff options
author | Ansis Brammanis <ansis@mapbox.com> | 2017-11-10 11:32:37 -0500 |
---|---|---|
committer | Chris Loer <chris.loer@mapbox.com> | 2017-11-17 10:05:15 -0800 |
commit | 22c07596a0c1e2cca12df730be4448bbe79be13d (patch) | |
tree | 6f50cda446e03660c6e34aae4122177cffd73fe9 /test/map | |
parent | 5bdee52e5c441e6daaae7cf9f320257d0ea3d031 (diff) | |
download | qtlocation-mapboxgl-22c07596a0c1e2cca12df730be4448bbe79be13d.tar.gz |
[core] Split MapMode::Still into Static and Tile
`Tile` makes sure the symbols in the resulting tile are tileable while
symbols in `Still` match rendering in `Continuous` mode.
Diffstat (limited to 'test/map')
-rw-r--r-- | test/map/map.test.cpp | 4 | ||||
-rw-r--r-- | test/map/prefetch.test.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp index 9358175297..9b34ea89b0 100644 --- a/test/map/map.test.cpp +++ b/test/map/map.test.cpp @@ -72,14 +72,14 @@ public: HeadlessFrontend frontend; Map map; - MapTest(float pixelRatio = 1, MapMode mode = MapMode::Still) + MapTest(float pixelRatio = 1, MapMode mode = MapMode::Static) : frontend(pixelRatio, fileSource, threadPool) , map(frontend, observer, frontend.getSize(), pixelRatio, fileSource, threadPool, mode) { } template <typename T = FileSource> MapTest(const std::string& cachePath, const std::string& assetRoot, - float pixelRatio = 1, MapMode mode = MapMode::Still, + float pixelRatio = 1, MapMode mode = MapMode::Static, typename std::enable_if<std::is_same<T, DefaultFileSource>::value>::type* = 0) : fileSource { cachePath, assetRoot } , frontend(pixelRatio, fileSource, threadPool) diff --git a/test/map/prefetch.test.cpp b/test/map/prefetch.test.cpp index 5c9a22d1bf..4c82b2c965 100644 --- a/test/map/prefetch.test.cpp +++ b/test/map/prefetch.test.cpp @@ -23,7 +23,7 @@ TEST(Map, PrefetchTiles) { ThreadPool threadPool(4); StubFileSource fileSource; HeadlessFrontend frontend { { 512, 512 }, 1, fileSource, threadPool }; - Map map(frontend, MapObserver::nullObserver(), frontend.getSize(), 1, fileSource, threadPool, MapMode::Still); + Map map(frontend, MapObserver::nullObserver(), frontend.getSize(), 1, fileSource, threadPool, MapMode::Static); std::vector<int> tiles; |