summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnsis Brammanis <ansis@mapbox.com>2017-11-13 14:20:04 -0500
committerChris Loer <chris.loer@gmail.com>2017-11-17 08:40:07 -0800
commit2519b296a32d8813737b126df41abfbbb626ee17 (patch)
tree01c6c4cd85f92aa871fcd143e0816aaa8a78dfc8
parent6505b2042d9e7ab4d9e850d5cfa209f8c84043a2 (diff)
downloadqtlocation-mapboxgl-2519b296a32d8813737b126df41abfbbb626ee17.tar.gz
[core] Sort child symbol tiles before parent symbol tiles
This is necessary so that when there are mixed zoom levels, child symbols get placed before parent symbols.
-rw-r--r--src/mbgl/renderer/renderer_impl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp
index 5d0ffed65f..c73cef8bb8 100644
--- a/src/mbgl/renderer/renderer_impl.cpp
+++ b/src/mbgl/renderer/renderer_impl.cpp
@@ -336,7 +336,7 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {
auto par = util::rotate(pa, parameters.state.getAngle());
auto pbr = util::rotate(pb, parameters.state.getAngle());
- return std::tie(par.y, par.x) < std::tie(pbr.y, pbr.x);
+ return std::tie(b.id.canonical.z, par.y, par.x) < std::tie(a.id.canonical.z, pbr.y, pbr.x);
});
} else {
std::sort(sortedTiles.begin(), sortedTiles.end(),