diff options
author | Chris Loer <chris.loer@gmail.com> | 2018-11-29 12:50:10 -0800 |
---|---|---|
committer | Chris Loer <chris.loer@gmail.com> | 2018-11-29 12:50:10 -0800 |
commit | 2cfbf57d04de592e36995e1146a078fbadffd413 (patch) | |
tree | 7a6d0da48cd4e0609b89863a3cb1891f69aceba6 /include/mbgl/tile/tile_id.hpp | |
parent | 8bc362e3a2836cfa96ef14a41a0e882a1d08e881 (diff) | |
download | qtlocation-mapboxgl-2cfbf57d04de592e36995e1146a078fbadffd413.tar.gz |
[core] OverscaledTileID::isChildOf should check wrap values.upstream/fix-tile-is-child
Fixes issue #13478
Diffstat (limited to 'include/mbgl/tile/tile_id.hpp')
-rw-r--r-- | include/mbgl/tile/tile_id.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
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)); } |