diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-20 17:12:58 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-22 08:04:39 -0700 |
commit | 40e47556214e999c952c1e88e026d673cdd96c72 (patch) | |
tree | e8d15795cbecc07c94908a8ebed31b73def64614 /test/util | |
parent | 1520a56813f82bbe875774fdc2b3df26392278d6 (diff) | |
download | qtlocation-mapboxgl-40e47556214e999c952c1e88e026d673cdd96c72.tar.gz |
[core] Move setStyleJSON/URL to Style; add Map::setStyle
Diffstat (limited to 'test/util')
-rw-r--r-- | test/util/memory.test.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/util/memory.test.cpp b/test/util/memory.test.cpp index 97eabf9cb3..bca538c6c6 100644 --- a/test/util/memory.test.cpp +++ b/test/util/memory.test.cpp @@ -9,6 +9,7 @@ #include <mbgl/util/default_thread_pool.hpp> #include <mbgl/util/io.hpp> #include <mbgl/util/run_loop.hpp> +#include <mbgl/style/style.hpp> #include <algorithm> #include <iostream> @@ -75,7 +76,7 @@ TEST(Memory, Vector) { Map map(test.backend, { 256, 256 }, 2, test.fileSource, test.threadPool, MapMode::Still); map.setZoom(16); // more map features - map.setStyleURL("mapbox://streets"); + map.getStyle().loadURL("mapbox://streets"); test::render(map, test.view); } @@ -84,7 +85,7 @@ TEST(Memory, Raster) { MemoryTest test; Map map(test.backend, { 256, 256 }, 2, test.fileSource, test.threadPool, MapMode::Still); - map.setStyleURL("mapbox://satellite"); + map.getStyle().loadURL("mapbox://satellite"); test::render(map, test.view); } @@ -118,7 +119,7 @@ TEST(Memory, Footprint) { auto renderMap = [&](Map& map, const char* style){ map.setZoom(16); - map.setStyleURL(style); + map.getStyle().loadURL(style); test::render(map, test.view); }; |