diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-01-22 11:07:08 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-01-22 12:00:26 -0800 |
commit | 9495b686e7e7e8cdfc429168d5b28758ed620a7d (patch) | |
tree | bc5cca5c43f807400667209a3d87a0ba6190f3af | |
parent | 8e23e3a3e844867bdcd8d485cf121a93905db256 (diff) | |
download | qtlocation-mapboxgl-9495b686e7e7e8cdfc429168d5b28758ed620a7d.tar.gz |
Use v7 styles / tests
-rw-r--r-- | linux/main.cpp | 2 | ||||
-rw-r--r-- | macosx/main.mm | 2 | ||||
m--------- | styles | 0 | ||||
-rw-r--r-- | test/headless.cpp | 4 | ||||
m--------- | test/suite | 0 |
5 files changed, 6 insertions, 2 deletions
diff --git a/linux/main.cpp b/linux/main.cpp index e2965a8ea7..245cb527f0 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 39ddde10d0..277f8c44d2 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 -Subproject 225f78f4281dbb315c030b1ba288e51193282cf +Subproject e8f361870c51aacbabb88aa0523703aaaa41ec4 diff --git a/test/headless.cpp b/test/headless.cpp index 3ec66dbd60..e9fd2c61bf 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 -Subproject 2892e261eb6dd8ce42f304e009ef7b2ff5e1a9c +Subproject dba0f2b1fa749691435d06a251d733173d41e3f |