a5998dc59b
The existing conditional would always be false, since it was comparing a url that begins with "mapbox://". In fact no conditional is necessary; the secure TileJSON resource should always be requested.
71 lines
2.2 KiB
C++
71 lines
2.2 KiB
C++
#include <mbgl/util/mapbox.hpp>
|
|
|
|
#include <stdexcept>
|
|
|
|
namespace mbgl {
|
|
namespace util {
|
|
namespace mapbox {
|
|
|
|
const std::string mapbox = "mapbox://";
|
|
|
|
std::string normalizeURL(const std::string& url, const std::string& accessToken) {
|
|
if (accessToken.empty())
|
|
throw std::runtime_error("You must provide a Mapbox API access token for Mapbox tile sources");
|
|
|
|
return std::string("https://api.tiles.mapbox.com/v4/")
|
|
+ url.substr(mapbox.length())
|
|
+ "?access_token="
|
|
+ accessToken;
|
|
}
|
|
|
|
std::string normalizeSourceURL(const std::string& url, const std::string& accessToken) {
|
|
if (url.compare(0, mapbox.length(), mapbox) != 0)
|
|
return url;
|
|
|
|
std::string result = normalizeURL(url + ".json", accessToken);
|
|
|
|
// TileJSON requests need a secure flag appended to their URLs so
|
|
// that the server knows to send SSL-ified resource references.
|
|
result += "&secure";
|
|
|
|
return result;
|
|
}
|
|
|
|
std::string normalizeGlyphsURL(const std::string& url, const std::string& accessToken) {
|
|
if (url.compare(0, mapbox.length(), mapbox) != 0)
|
|
return url;
|
|
|
|
return normalizeURL(url, accessToken);
|
|
}
|
|
|
|
std::string normalizeTileURL(const std::string& url, const std::string& sourceURL, SourceType sourceType) {
|
|
if (sourceURL.empty() || sourceURL.compare(0, mapbox.length(), mapbox) != 0 ||
|
|
sourceType != SourceType::Raster) {
|
|
return url;
|
|
}
|
|
|
|
std::string::size_type queryIdx = url.rfind("?");
|
|
// Trim off the right end but never touch anything before the extension dot.
|
|
std::string urlSansParams((queryIdx == std::string::npos) ? url : url.substr(0, queryIdx));
|
|
|
|
while (!urlSansParams.empty() && isdigit(urlSansParams.back())) {
|
|
urlSansParams.pop_back();
|
|
}
|
|
|
|
std::string::size_type basenameIdx = url.rfind("/", queryIdx);
|
|
std::string::size_type extensionIdx = url.rfind(".", queryIdx);
|
|
if (basenameIdx == std::string::npos || extensionIdx == std::string::npos ||
|
|
basenameIdx > extensionIdx) {
|
|
// No file extension: probably not a file name we can tack a ratio onto.
|
|
return url;
|
|
}
|
|
|
|
std::string normalizedURL(url);
|
|
normalizedURL.insert(extensionIdx, "{ratio}");
|
|
return normalizedURL;
|
|
}
|
|
|
|
}
|
|
}
|
|
}
|