diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-09-15 22:01:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-15 22:01:09 -0700 |
| commit | 9ef65440b6bfd2c8da17d2613f8c967682cc0ef9 (patch) | |
| tree | 52b5508cae9fe76548b9efee15268d2da1543080 /src/mbgl/util/mapbox.hpp | |
| parent | 217c43d1255f36c7ef2b588a90b6c19ca176dce2 (diff) | |
| download | qtlocation-mapboxgl-9ef65440b6bfd2c8da17d2613f8c967682cc0ef9.tar.gz | |
[core] [android] - public api configurable base endpoint (#6309)
add runloop to test
Diffstat (limited to 'src/mbgl/util/mapbox.hpp')
| -rw-r--r-- | src/mbgl/util/mapbox.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/util/mapbox.hpp b/src/mbgl/util/mapbox.hpp index 951cbc5a4b..72f4e0a567 100644 --- a/src/mbgl/util/mapbox.hpp +++ b/src/mbgl/util/mapbox.hpp @@ -9,11 +9,11 @@ namespace mapbox { bool isMapboxURL(const std::string& url); -std::string normalizeSourceURL(const std::string& url, const std::string& accessToken); -std::string normalizeStyleURL(const std::string& url, const std::string& accessToken); -std::string normalizeSpriteURL(const std::string& url, const std::string& accessToken); -std::string normalizeGlyphsURL(const std::string& url, const std::string& accessToken); -std::string normalizeTileURL(const std::string& url, const std::string& accessToken); +std::string normalizeSourceURL(const std::string& baseURL, const std::string& url, const std::string& accessToken); +std::string normalizeStyleURL(const std::string& baseURL, const std::string& url, const std::string& accessToken); +std::string normalizeSpriteURL(const std::string& baseURL, const std::string& url, const std::string& accessToken); +std::string normalizeGlyphsURL(const std::string& baseURL, const std::string& url, const std::string& accessToken); +std::string normalizeTileURL(const std::string& baseURL, const std::string& url, const std::string& accessToken); // Return a "mapbox://tiles/..." URL (suitable for normalizeTileURL) for the given Mapbox tile URL. std::string canonicalizeTileURL(const std::string& url, SourceType, uint16_t tileSize); |