tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Introduce Renderer::clearData() instead of keepRenderData map options

Browse Source 
`Renderer::clearData()` is a better API than the removed `MapOptions::keepRenderData()`:
- gives more flexibility to the client
- similar to the existing `Renderer::reduceMemoryUse()`
- the `MapOptions::keepRenderData()` API implementation could not handle the raise condition, which
happened if the new still image request had come before all tiles from the previous requests were loaded.

Co-authored-by: Dane Springmeyer <dane@mapbox.com>
This commit is contained in:
Mikhail Pozdnyakov
2020-03-19 17:21:21 +02:00
parent bc45d65c58
commit 2ae96ad687
11 changed files with 28 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
test/map/map.test.cpp
View File

@@ -10,6 +10,7 @@
#include <mbgl/gl/context.hpp>
#include <mbgl/map/map_options.hpp>
#include <mbgl/math/log2.hpp>
#include <mbgl/renderer/renderer.hpp>
#include <mbgl/renderer/update_parameters.hpp>
#include <mbgl/storage/file_source_manager.hpp>
#include <mbgl/storage/main_resource_loader.hpp>
@@ -1362,7 +1363,7 @@ constexpr auto styleJSON = R"STYLE({
}
TEST(Map, KeepRenderData) {
MapTest<> test{std::move(MapOptions().withMapMode(MapMode::Static).withKeepRenderData(true))};
MapTest<> test;
int requestsCount = 0;
test.fileSource->tileResponse = [&](const Resource&) {
++requestsCount;
@@ -1371,30 +1372,19 @@ TEST(Map, KeepRenderData) {
return res;
};
test.map.jumpTo(CameraOptions().withZoom(10));
test.map.getStyle().loadJSON(styleJSON);
test.frontend.render(test.map);
EXPECT_EQ(4, requestsCount);
test.map.getStyle().loadJSON(styleJSON);
test.frontend.render(test.map);
EXPECT_EQ(4, requestsCount);
}
TEST(Map, DontKeepRenderData) {
MapTest<> test{std::move(MapOptions().withMapMode(MapMode::Static).withKeepRenderData(false))};
int requestsCount = 0;
test.fileSource->tileResponse = [&](const Resource&) {
++requestsCount;
Response res;
res.noContent = true;
return res;
};
test.map.jumpTo(CameraOptions().withZoom(10));
test.map.getStyle().loadJSON(styleJSON);
test.frontend.render(test.map);
EXPECT_EQ(4, requestsCount);
test.map.getStyle().loadJSON(styleJSON);
test.frontend.render(test.map);
EXPECT_EQ(8, requestsCount);
const int iterations = 3;
// Keep render data.
for (int i = 1; i <= iterations; ++i) {
test.map.getStyle().loadJSON(styleJSON);
test.frontend.render(test.map);
EXPECT_EQ(4, requestsCount);
}
requestsCount = 0;
// Clear render data.
for (int i = 1; i <= iterations; ++i) {
test.frontend.getRenderer()->clearData();
test.map.getStyle().loadJSON(styleJSON);
test.frontend.render(test.map);
EXPECT_EQ(4 * i, requestsCount);
}
}