summaryrefslogtreecommitdiff
path: root/test/util/mapbox.test.cpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-12-16 18:46:26 +0100
committerKonstantin Käfer <mail@kkaefer.com>2016-12-21 13:00:32 +0100
commit77db372123920ca6c3233c0b2c7393703db66635 (patch)
tree23342ce785de100e2ce6a451a14720c91997b1cc /test/util/mapbox.test.cpp
parent2b38af877871e234d9afb415dab68aa0543403da (diff)
downloadqtlocation-mapboxgl-77db372123920ca6c3233c0b2c7393703db66635.tar.gz
[core] refactor URL parsing
Diffstat (limited to 'test/util/mapbox.test.cpp')
-rw-r--r--test/util/mapbox.test.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/util/mapbox.test.cpp b/test/util/mapbox.test.cpp
index 70bb8d0700..452106d6e6 100644
--- a/test/util/mapbox.test.cpp
+++ b/test/util/mapbox.test.cpp
@@ -91,7 +91,7 @@ TEST(Mapbox, SpriteURL) {
"https://api.mapbox.com/styles/v1/mapbox/streets-v8/draft/sprite@2x.png?access_token=key",
mbgl::util::mapbox::normalizeSpriteURL(util::API_BASE_URL, "mapbox://sprites/mapbox/streets-v8/draft@2x.png", "key"));
EXPECT_EQ(
- "mapbox://sprites/mapbox/streets-v9?fresh=true.png",
+ "https://api.mapbox.com/styles/v1/mapbox/streets-v9/sprite?access_token=key&fresh=true.png",
mbgl::util::mapbox::normalizeSpriteURL(util::API_BASE_URL,
"mapbox://sprites/mapbox/streets-v9?fresh=true.png",
"key"));
@@ -139,6 +139,9 @@ TEST(Mapbox, CanonicalURL) {
"mapbox://tiles/a.b/{z}/{x}/{y}.vector.pbf",
mbgl::util::mapbox::canonicalizeTileURL("http://api.mapbox.com/v4/a.b/{z}/{x}/{y}.vector.pbf?access_token=key", SourceType::Vector, 512));
EXPECT_EQ(
+ "mapbox://tiles/a.b/{z}/{x}/{y}.vector.pbf",
+ mbgl::util::mapbox::canonicalizeTileURL("https://api.mapbox.cn/v4/a.b/{z}/{x}/{y}.vector.pbf?access_token=key", SourceType::Vector, 512));
+ EXPECT_EQ(
"mapbox://tiles/a.b,c.d/{z}/{x}/{y}.vector.pbf",
mbgl::util::mapbox::canonicalizeTileURL("http://api.mapbox.com/v4/a.b,c.d/{z}/{x}/{y}.vector.pbf?access_token=key", SourceType::Vector, 512));
EXPECT_EQ(