[core] include leading slash in URL.path

2 files changed, 5 insertions, 10 deletions

diff --git a/src/mbgl/util/mapbox.cpp b/src/mbgl/util/mapbox.cpp
index 642945ba07..c03cc2a8e7 100644
--- a/src/mbgl/util/mapbox.cpp
+++ b/src/mbgl/util/mapbox.cpp
@@ -56,7 +56,7 @@ std::string normalizeStyleURL(const std::string& baseURL,
         return str;
     }
 
-    const auto tpl = baseURL + "/styles/v1/{path}?access_token=" + accessToken;
+    const auto tpl = baseURL + "/styles/v1{path}?access_token=" + accessToken;
     return transformURL(tpl, str, url);
 }
 
@@ -74,7 +74,7 @@ std::string normalizeSpriteURL(const std::string& baseURL,
     }
 
     const auto tpl =
-        baseURL + "/styles/v1/{directory}{filename}/sprite{extension}?access_token=" + accessToken;
+        baseURL + "/styles/v1{directory}{filename}/sprite{extension}?access_token=" + accessToken;
     return transformURL(tpl, str, url);
 }
 
@@ -91,7 +91,7 @@ std::string normalizeGlyphsURL(const std::string& baseURL,
         return str;
     }
 
-    const auto tpl = baseURL + "/fonts/v1/{path}?access_token=" + accessToken;
+    const auto tpl = baseURL + "/fonts/v1{path}?access_token=" + accessToken;
     return transformURL(tpl, str, url);
 }
 
@@ -108,13 +108,13 @@ std::string normalizeTileURL(const std::string& baseURL,
         return str;
     }
 
-    const auto tpl = baseURL + "/v4/{path}?access_token=" + accessToken;
+    const auto tpl = baseURL + "/v4{path}?access_token=" + accessToken;
     return transformURL(tpl, str, url);
 }
 
 std::string
 canonicalizeTileURL(const std::string& str, const SourceType type, const uint16_t tileSize) {
-    const char* version = "v4/";
+    const char* version = "/v4/";
     const size_t versionLen = strlen(version);
 
     const URL url(str);
diff --git a/src/mbgl/util/url.cpp b/src/mbgl/util/url.cpp
index f070135213..0a7d096ec0 100644
--- a/src/mbgl/util/url.cpp
+++ b/src/mbgl/util/url.cpp
@@ -107,11 +107,6 @@ URL::URL(const std::string& str)
           if (isData) {
               // Skip comma
               pathPos++;
-          } else {
-              // Skip optional leading slash
-              while (pathPos < query.first && (str[pathPos] == '/')) {
-                  ++pathPos;
-              }
           }
           return { pathPos, query.first - pathPos };
       }()) {