diff options
| author | Ansis Brammanis <brammanis@gmail.com> | 2015-04-03 12:04:31 -0700 |
|---|---|---|
| committer | Ansis Brammanis <brammanis@gmail.com> | 2015-04-03 12:04:31 -0700 |
| commit | 148294d3ac01df9eb92e2f572b2e5e743cad8dc8 (patch) | |
| tree | 8596bc4ea1f6d73805aa8372b14bf7e92b766455 /test/miscellaneous | |
| parent | 466febd615a9d58994ec851aa57c794947e09f11 (diff) | |
| parent | 999ebb371e98bb9ee5876cfad336426c5abae7a8 (diff) | |
| download | qtlocation-mapboxgl-148294d3ac01df9eb92e2f572b2e5e743cad8dc8.tar.gz | |
Merge branch 'master' into new-labelling
Conflicts:
src/mbgl/renderer/symbol_bucket.cpp
src/mbgl/renderer/symbol_bucket.hpp
src/mbgl/text/collision.cpp
src/mbgl/text/glyph_store.cpp
src/mbgl/text/placement.cpp
src/mbgl/text/rotation_range.cpp
Diffstat (limited to 'test/miscellaneous')
| -rw-r--r-- | test/miscellaneous/mapbox.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/miscellaneous/mapbox.cpp b/test/miscellaneous/mapbox.cpp index 926c842e22..1aff2494a4 100644 --- a/test/miscellaneous/mapbox.cpp +++ b/test/miscellaneous/mapbox.cpp @@ -18,6 +18,11 @@ TEST(Mapbox, GlyphsURL) { EXPECT_EQ(mbgl::util::mapbox::normalizeGlyphsURL("http://path", "key"), "http://path"); } +TEST(Mapbox, StyleURL) { + EXPECT_EQ(mbgl::util::mapbox::normalizeStyleURL("mapbox://user.style", "key"), "https://api.tiles.mapbox.com/styles/v1/user/user.style?access_token=key"); + EXPECT_EQ(mbgl::util::mapbox::normalizeStyleURL("http://path", "key"), "http://path"); +} + TEST(Mapbox, TileURL) { try { EXPECT_EQ(mbgl::util::mapbox::normalizeTileURL("http://path.png/tile.png", "mapbox://user.map", SourceType::Raster), "http://path.png/tile{ratio}.png"); |