From 41c01373d5aef0a240127c47b11ac5d97cb5f138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Thu, 26 Feb 2015 19:45:46 -0800 Subject: [PATCH] =?UTF-8?q?Load=202=C3=97=20raster=20tiles=20on=20HiDPI=20?= =?UTF-8?q?screens?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Based on mapbox.normalizeTileURL() in mapbox/mapbox-gl-js, but insert a “{ratio}” placeholder instead of “@2x” in order to keep the pixelRatio logic in TileData::request(). Fixes #919. --- src/mbgl/map/tile_data.cpp | 3 ++- src/mbgl/util/mapbox.cpp | 9 +++++++++ src/mbgl/util/mapbox.hpp | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/mbgl/map/tile_data.cpp b/src/mbgl/map/tile_data.cpp index 53d36dfe8..b8f317a07 100644 --- a/src/mbgl/map/tile_data.cpp +++ b/src/mbgl/map/tile_data.cpp @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -37,7 +38,7 @@ void TileData::request(uv::worker &worker, float pixelRatio, std::function std::string { + url = util::replaceTokens(util::mapbox::normalizeTileURL(url, source.url), [&](const std::string &token) -> std::string { if (token == "z") return util::toString(id.z); if (token == "x") return util::toString(id.x); if (token == "y") return util::toString(id.y); diff --git a/src/mbgl/util/mapbox.cpp b/src/mbgl/util/mapbox.cpp index 277b647f3..3e8bbc030 100644 --- a/src/mbgl/util/mapbox.cpp +++ b/src/mbgl/util/mapbox.cpp @@ -1,6 +1,7 @@ #include #include +#include namespace mbgl { namespace util { @@ -39,6 +40,14 @@ std::string normalizeGlyphsURL(const std::string& url, const std::string& access return normalizeURL(url, accessToken); } +std::string normalizeTileURL(const std::string& url, const std::string& sourceURL) { + if (sourceURL.empty() || sourceURL.compare(0, mapbox.length(), mapbox) != 0) + return url; + + static std::regex extension_re("\\.((?:png|jpg)\\d*)(?=$|\\?)"); + return std::regex_replace(url, extension_re, std::string("{ratio}.$1")); +} + } } } diff --git a/src/mbgl/util/mapbox.hpp b/src/mbgl/util/mapbox.hpp index 0fbb9a91e..68b821eab 100644 --- a/src/mbgl/util/mapbox.hpp +++ b/src/mbgl/util/mapbox.hpp @@ -9,6 +9,7 @@ namespace mapbox { std::string normalizeSourceURL(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& sourceURL); } }