diff --git a/linux/main.cpp b/linux/main.cpp index e2965a8ea..245cb527f 100644 --- a/linux/main.cpp +++ b/linux/main.cpp @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) { // Load style if (style.empty()) - style = std::string("asset://") + std::string("styles/bright-v6.json"); + style = std::string("asset://") + std::string("styles/bright-v7.json"); map.setStyleURL(style); diff --git a/macosx/main.mm b/macosx/main.mm index 39ddde10d..277f8c44d 100644 --- a/macosx/main.mm +++ b/macosx/main.mm @@ -102,7 +102,7 @@ int main() { if (accessToken) fileSource.setAccessToken([accessToken cStringUsingEncoding:[NSString defaultCStringEncoding]]); // Load style - map.setStyleURL("asset://styles/bright-v6.json"); + map.setStyleURL("asset://styles/bright-v7.json"); int ret = view.run(); diff --git a/styles b/styles index 225f78f42..e8f361870 160000 --- a/styles +++ b/styles @@ -1 +1 @@ -Subproject commit 225f78f4281dbb315c030b1ba288e51193282cf7 +Subproject commit e8f361870c51aacbabb88aa0523703aaaa41ec4e diff --git a/test/headless.cpp b/test/headless.cpp index 3ec66dbd6..e9fd2c61b 100644 --- a/test/headless.cpp +++ b/test/headless.cpp @@ -161,6 +161,10 @@ TEST_P(HeadlessTest, render) { }; const rapidjson::Value& value = it->value; ASSERT_TRUE(value.IsObject()); + + if (value.HasMember("native") && !value["native"].GetBool()) + continue; + if (value.HasMember("center")) ASSERT_TRUE(value["center"].IsArray()); const std::string actual_image = base_directory + "tests/" + base + "/" + name + "/actual.png"; diff --git a/test/suite b/test/suite index 2892e261e..dba0f2b1f 160000 --- a/test/suite +++ b/test/suite @@ -1 +1 @@ -Subproject commit 2892e261eb6dd8ce42f304e009ef7b2ff5e1a9c8 +Subproject commit dba0f2b1fa749691435d06a251d733173d41e3f5