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

[core] Include pixelRatio property in MapOptions

Browse Source 
Move pixelRatio property from Map constructor to MapOptions.
This commit is contained in:
Sudarsana Babu Nagineni
2019-03-27 19:17:04 +02:00
parent f5064e7108
commit 7af00a404f
28 changed files with 107 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/api/annotations.test.cpp
View File

@@ -29,11 +29,10 @@ class AnnotationTest {
public:
util::RunLoop loop;
ThreadPool threadPool { 4 };
float pixelRatio { 1 };
HeadlessFrontend frontend { pixelRatio, threadPool };
HeadlessFrontend frontend { 1, threadPool };
MapAdapter map { frontend, MapObserver::nullObserver(), pixelRatio, std::make_shared<StubFileSource>(),
threadPool, MapOptions().withMapMode(MapMode::Static).withSize(frontend.getSize())};
MapAdapter map { frontend, MapObserver::nullObserver(), std::make_shared<StubFileSource>(), threadPool,
MapOptions().withMapMode(MapMode::Static).withSize(frontend.getSize())};
void checkRendering(const char * name) {
test::checkImage(std::string("test/fixtures/annotations/") + name,

5
test/api/api_misuse.test.cpp
View File

@@ -22,11 +22,10 @@ TEST(API, RenderWithoutCallback) {
util::RunLoop loop;
ThreadPool threadPool(4);
float pixelRatio { 1 };
HeadlessFrontend frontend { pixelRatio, threadPool };
HeadlessFrontend frontend { 1, threadPool };
auto map = std::make_unique<MapAdapter>(frontend, MapObserver::nullObserver(),
pixelRatio, std::make_shared<StubFileSource>(), threadPool,
std::make_shared<StubFileSource>(), threadPool,
MapOptions().withMapMode(MapMode::Static).withSize(frontend.getSize()));
map->renderStill(nullptr);

5
test/api/custom_geometry_source.test.cpp
View File

@@ -21,9 +21,8 @@ TEST(CustomGeometrySource, Grid) {
util::RunLoop loop;
auto threadPool = sharedThreadPool();
float pixelRatio { 1 };
HeadlessFrontend frontend { pixelRatio, *threadPool };
Map map(frontend, MapObserver::nullObserver(), pixelRatio, *threadPool,
HeadlessFrontend frontend { 1, *threadPool };
Map map(frontend, MapObserver::nullObserver(), *threadPool,
MapOptions().withMapMode(MapMode::Static).withSize(frontend.getSize()),
ResourceOptions().withCachePath(":memory:").withAssetPath("test/fixtures/api/assets"));
map.getStyle().loadJSON(util::read_file("test/fixtures/api/water.json"));

5
test/api/custom_layer.test.cpp
View File

@@ -91,9 +91,8 @@ TEST(CustomLayer, Basic) {
util::RunLoop loop;
ThreadPool threadPool(4);
float pixelRatio { 1 };
HeadlessFrontend frontend { pixelRatio, threadPool };
Map map(frontend, MapObserver::nullObserver(), pixelRatio, threadPool,
HeadlessFrontend frontend { 1, threadPool };
Map map(frontend, MapObserver::nullObserver(), threadPool,
MapOptions().withMapMode(MapMode::Static).withSize(frontend.getSize()),
ResourceOptions().withCachePath(":memory:").withAssetPath("test/fixtures/api/assets"));
map.getStyle().loadJSON(util::read_file("test/fixtures/api/water.json"));

7
test/api/query.test.cpp
View File

@@ -36,10 +36,9 @@ public:
util::RunLoop loop;
std::shared_ptr<StubFileSource> fileSource = std::make_shared<StubFileSource>();
ThreadPool threadPool { 4 };
float pixelRatio { 1 };
HeadlessFrontend frontend { pixelRatio, threadPool };
MapAdapter map { frontend, MapObserver::nullObserver(), pixelRatio, fileSource,
threadPool, MapOptions().withMapMode(MapMode::Static).withSize(frontend.getSize())};
HeadlessFrontend frontend { 1, threadPool };
MapAdapter map { frontend, MapObserver::nullObserver(), fileSource, threadPool,
MapOptions().withMapMode(MapMode::Static).withSize(frontend.getSize())};
};
std::vector<Feature> getTopClusterFeature(QueryTest& test) {

5
test/api/recycle_map.cpp
View File

@@ -24,11 +24,10 @@ TEST(API, RecycleMapUpdateImages) {
util::RunLoop loop;
ThreadPool threadPool(4);
float pixelRatio { 1 };
HeadlessFrontend frontend { pixelRatio, threadPool };
HeadlessFrontend frontend { 1, threadPool };
auto map = std::make_unique<MapAdapter>(frontend, MapObserver::nullObserver(),
pixelRatio, std::make_shared<StubFileSource>(), threadPool,
std::make_shared<StubFileSource>(), threadPool,
MapOptions().withMapMode(MapMode::Static).withSize(frontend.getSize()));
EXPECT_TRUE(map);