diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index ae34b81ac..5e7473820 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -804,6 +804,9 @@ void Map::prepare() { } if (u & static_cast(Update::RenderStill)) { + // Triggers a view resize. + view.discard(); + // Whenever we trigger an image render, we are unrefing all async handles so the loop will // eventually terminate. However, it'll stay alive as long as there are pending requests // (like work requests or HTTP requests). diff --git a/test/api/repeated_render.cpp b/test/api/repeated_render.cpp new file mode 100644 index 000000000..16688ec36 --- /dev/null +++ b/test/api/repeated_render.cpp @@ -0,0 +1,63 @@ +#include "../fixtures/util.hpp" +#include "../fixtures/fixture_log_observer.hpp" + +#include +#include +#include +#include +#include +#include +#include + +#include + +TEST(API, RepeatedRender) { + using namespace mbgl; + + const auto style = util::read_file("test/fixtures/api/water.json"); + + auto display = std::make_shared(); + HeadlessView view(display); + DefaultFileSource fileSource(nullptr); + + Log::setObserver(util::make_unique()); + + Map map(view, fileSource); + + map.start(Map::Mode::Static); + + { + view.resize(128, 512, 1); + map.setStyleJSON(style, "test/suite"); + std::promise> promise; + map.renderStill([&promise](std::unique_ptr image) { + promise.set_value(std::move(image)); + }); + auto result = promise.get_future().get(); + ASSERT_EQ(128, result->width); + ASSERT_EQ(512, result->height); + const std::string png = util::compress_png(result->width, result->height, result->pixels.get()); + util::write_file("test/fixtures/api/1.png", png); + } + + { + view.resize(512, 512, 2); + map.setStyleJSON(style, "TEST_DATA/suite"); + std::promise> promise; + map.renderStill([&promise](std::unique_ptr image) { + promise.set_value(std::move(image)); + }); + auto result = promise.get_future().get(); + ASSERT_EQ(1024, result->width); + ASSERT_EQ(1024, result->height); + const std::string png = util::compress_png(result->width, result->height, result->pixels.get()); + util::write_file("test/fixtures/api/2.png", png); + } + + map.stop(); + + auto observer = Log::removeObserver(); + auto flo = dynamic_cast(observer.get()); + auto unchecked = flo->unchecked(); + EXPECT_TRUE(unchecked.empty()) << unchecked; +} diff --git a/test/fixtures/api/1.png b/test/fixtures/api/1.png new file mode 100644 index 000000000..69e3c8ca9 Binary files /dev/null and b/test/fixtures/api/1.png differ diff --git a/test/fixtures/api/2.png b/test/fixtures/api/2.png new file mode 100644 index 000000000..2a28c639a Binary files /dev/null and b/test/fixtures/api/2.png differ diff --git a/test/fixtures/api/water.json b/test/fixtures/api/water.json new file mode 100644 index 000000000..2bcce1199 --- /dev/null +++ b/test/fixtures/api/water.json @@ -0,0 +1,25 @@ +{ + "version": 7, + "name": "Water", + "sources": { + "mapbox": { + "type": "vector", + "url": "asset://TEST_DATA/fixtures/tiles/streets.json" + } + }, + "layers": [{ + "id": "background", + "type": "background", + "paint": { + "background-color": "red" + } + }, { + "id": "water", + "type": "fill", + "source": "mapbox", + "source-layer": "water", + "paint": { + "fill-color": "blue" + } + }] +} diff --git a/test/fixtures/tiles/streets.json b/test/fixtures/tiles/streets.json new file mode 100644 index 000000000..a848a1bf7 --- /dev/null +++ b/test/fixtures/tiles/streets.json @@ -0,0 +1,14 @@ +{ + "bounds": [ -180, -85.0511, 180, 85.0511 ], + "center": [ 0, 0, 0 ], + "description": "", + "format": "pbf", + "id": "streets", + "maskLevel": 8, + "maxzoom": 15, + "minzoom": 0, + "name": "Streets", + "scheme": "xyz", + "tilejson": "2.0.0", + "tiles": [ "asset://TEST_DATA/fixtures/tiles/streets/{z}-{x}-{y}.vector.pbf" ] +} diff --git a/test/fixtures/tiles/streets/0-0-0.vector.pbf b/test/fixtures/tiles/streets/0-0-0.vector.pbf new file mode 100644 index 000000000..a0f049ad4 Binary files /dev/null and b/test/fixtures/tiles/streets/0-0-0.vector.pbf differ diff --git a/test/test.gyp b/test/test.gyp index 2f14a4477..2e89db58b 100644 --- a/test/test.gyp +++ b/test/test.gyp @@ -36,6 +36,7 @@ 'fixtures/fixture_log_observer.cpp', 'api/set_style.cpp', + 'api/repeated_render.cpp', 'headless/headless.cpp',