From bcf636a91a0d4bd01744cd34a0432a36dcaaff7c Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Wed, 9 Jul 2025 23:04:01 +0200
Subject: [PATCH] Revert "Fix the symbol blink issue by only placing the symbol
 in current level (#3534)" (#3610)

---
 platform/android/CHANGELOG.md | 6 ++++++
 platform/android/VERSION      | 2 +-
 platform/ios/CHANGELOG.md     | 4 ++++
 platform/ios/VERSION          | 2 +-
 src/mbgl/text/placement.cpp   | 6 ------
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md
index b89da0953..d14954d28 100644
--- a/platform/android/CHANGELOG.md
+++ b/platform/android/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog MapLibre Native for Android
 
+## 11.12.1
+
+### 🐞 Bug fixes
+
+- Revert "Fix the symbol blink issue by only placing the symbol in current level", as this was causing regressions ([#3610](https://github.com/maplibre/maplibre-native/pull/3610)).
+
 ## 11.12.0
 
 ### ✨ Features and improvements
diff --git a/platform/android/VERSION b/platform/android/VERSION
index a0980739e..4feb44709 100644
--- a/platform/android/VERSION
+++ b/platform/android/VERSION
@@ -1 +1 @@
-11.12.0
+11.12.1
diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md
index 3e86baf17..78aaa5a4f 100644
--- a/platform/ios/CHANGELOG.md
+++ b/platform/ios/CHANGELOG.md
@@ -4,6 +4,10 @@ MapLibre welcomes participation and contributions from everyone. Please read [`M
 
 ## main
 
+## 6.17.1
+
+- Revert "Fix the symbol blink issue by only placing the symbol in current level", as this was causing regressions ([#3610](https://github.com/maplibre/maplibre-native/pull/3610)).
+
 ## 6.17.0
 
 - Fix render pipeline state bug ([#3598](https://github.com/maplibre/maplibre-native/pull/3598)).
diff --git a/platform/ios/VERSION b/platform/ios/VERSION
index 1980a78f2..369689dd8 100644
--- a/platform/ios/VERSION
+++ b/platform/ios/VERSION
@@ -1 +1 @@
-6.17.0
+6.17.1
diff --git a/src/mbgl/text/placement.cpp b/src/mbgl/text/placement.cpp
index 71c2b92bf..fe774da2e 100644
--- a/src/mbgl/text/placement.cpp
+++ b/src/mbgl/text/placement.cpp
@@ -276,12 +276,6 @@ JointPlacement Placement::placeSymbol(const SymbolInstance& symbolInstance, cons
         // a parent tile that _should_ be placed.
         return kUnplaced;
     }
-
-    // Place the symbol only at the current level to prevent it from blinking during the transition.
-    if (ctx.getOverscaledID().overscaledZ != int(placementZoom)) {
-        return kUnplaced;
-    }
-
     const SymbolBucket& bucket = ctx.getBucket();
     const mat4& posMatrix = ctx.getRenderTile().matrix;
     const auto& collisionGroup = ctx.collisionGroup;