From 18176605f65ce90c973e0b61a1a2b563471b0ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Mon, 15 Aug 2016 18:34:45 +0200 Subject: [core] support "scheme": "tms" in TileJSON files --- src/mbgl/storage/resource.cpp | 4 ++++ src/mbgl/tile/tile_loader_impl.hpp | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/mbgl/storage/resource.cpp b/src/mbgl/storage/resource.cpp index bb587dcc33..20dde1db56 100644 --- a/src/mbgl/storage/resource.cpp +++ b/src/mbgl/storage/resource.cpp @@ -87,8 +87,12 @@ Resource Resource::tile(const std::string& urlTemplate, int32_t x, int32_t y, int8_t z, + Tileset::Scheme scheme, Necessity necessity) { bool supportsRatio = urlTemplate.find("{ratio}") != std::string::npos; + if (scheme == Tileset::Scheme::TMS) { + y = (1 << z) - y - 1; + } return Resource { Resource::Kind::Tile, util::replaceTokens(urlTemplate, [&](const std::string& token) { diff --git a/src/mbgl/tile/tile_loader_impl.hpp b/src/mbgl/tile/tile_loader_impl.hpp index b987d6ec65..9a5b35a7af 100644 --- a/src/mbgl/tile/tile_loader_impl.hpp +++ b/src/mbgl/tile/tile_loader_impl.hpp @@ -21,7 +21,8 @@ TileLoader::TileLoader(T& tile_, parameters.pixelRatio, id.canonical.x, id.canonical.y, - id.canonical.z)), + id.canonical.z, + tileset.scheme)), fileSource(parameters.fileSource) { assert(!request); if (fileSource.supportsOptionalRequests()) { -- cgit v1.2.1