From f87ef3f72a6f2beda88bdc25dfbdeb169332603b Mon Sep 17 00:00:00 2001 From: Chris Loer Date: Thu, 29 Nov 2018 12:50:10 -0800 Subject: [core] OverscaledTileID::isChildOf should check wrap values. Fixes issue #13478 --- include/mbgl/tile/tile_id.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/mbgl/tile/tile_id.hpp b/include/mbgl/tile/tile_id.hpp index dd2fba573d..7371916449 100644 --- a/include/mbgl/tile/tile_id.hpp +++ b/include/mbgl/tile/tile_id.hpp @@ -181,7 +181,8 @@ inline uint32_t OverscaledTileID::overscaleFactor() const { } inline bool OverscaledTileID::isChildOf(const OverscaledTileID& rhs) const { - return overscaledZ > rhs.overscaledZ && + return wrap == rhs.wrap && + overscaledZ > rhs.overscaledZ && (canonical == rhs.canonical || canonical.isChildOf(rhs.canonical)); } -- cgit v1.2.1