From c3b588321bf37f1878e6101a1f05174d9a6a2565 Mon Sep 17 00:00:00 2001
From: Taku Fukada <naninunenor@gmail.com>
Date: Fri, 28 Aug 2026 11:48:01 +0900
Subject: [PATCH] Fix `ImageSource` not rendering across world copies (#4508)

---
 CHANGELOG.md                                  |   1 +
 metrics/cache-style.db                        | Bin 39825408 -> 39825408 bytes
 metrics/integration/image/world-wrap.png      | Bin 0 -> 186 bytes
 .../image/world-wrap/expected.png             | Bin 0 -> 548 bytes
 .../render-tests/image/world-wrap/style.json  |  56 ++++++++++++++++++
 .../renderer/sources/render_image_source.cpp  |  18 +++---
 6 files changed, 67 insertions(+), 8 deletions(-)
 create mode 100644 metrics/integration/image/world-wrap.png
 create mode 100644 metrics/integration/render-tests/image/world-wrap/expected.png
 create mode 100644 metrics/integration/render-tests/image/world-wrap/style.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27436f963..e83f6b6e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
 ### 🐞 Bug fixes
 
 - *...Add new stuff here...*
+- [core] Fix `ImageSource` not rendering across world copies ([#4508](https://github.com/maplibre/maplibre-native/issues/4508)).
 - [core] Repaint data-driven symbol paint properties after feature-state updates.
 - [core] Accept alpha values in legacy comma-separated `hsl()` colors ([#4434](https://github.com/maplibre/maplibre-native/issues/4434)).
 - [core] Fix thread-unsafe headless OpenGL display singleton initialization [#4332](https://github.com/maplibre/maplibre-native/pull/4332)
diff --git a/metrics/cache-style.db b/metrics/cache-style.db
index 681f0d9ce3146beb927e27f2b272cce395813c04..71a5adc28e7f1587e353a9f72dbeda978e0ea53d 100644
GIT binary patch
delta 3461
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
IFOn?(0SB&YkpKVy

delta 5714
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
VBf*p4DKH9*22Wd-=ZvxB{U4yc1>XPw

diff --git a/metrics/integration/image/world-wrap.png b/metrics/integration/image/world-wrap.png
new file mode 100644
index 0000000000000000000000000000000000000000..1586b0ecb005fd6d33bd0982aca35557c8768626
GIT binary patch
literal 186
zcmeAS@N?(olHy`uVBq!ia0vp^96-#%!3HEZpRM}<q!^2X+?^QKos)S9<hZ0pc&7RK
zGH3zW91M)@nG7r-B|t0%#0(6~3m6%gfixpXYylHomSX`koDI^!5KuBL7)Ysjx;Tb#
z$R?+7-2XVAk%h^;dFB6K!3V$a)<+whWl{SmFh!ez;qe4EM=M^j1t5K%u6{1-oD!M<
DKxHI;

literal 0
HcmV?d00001

diff --git a/metrics/integration/render-tests/image/world-wrap/expected.png b/metrics/integration/render-tests/image/world-wrap/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8b06cbfc424b31f8622b2a9e5414dbfaa22f9b8
GIT binary patch
literal 548
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58aUX1<dd!2ff9_bJzX3_D(1YsVkpR<AaLYB
zcr$lNf~filMn;YukG4m!&%7e}`BL~=-}ILZh73Fm%m)|@$fP>hI~WrfBpBEl$fO*s
z94K;t0mCE4BuX66z&L?VfPxSJhFn8M0|g-f3b`fBN63nThV#t2e=aa^&)ft|2Mi3J
Lu6{1-oD!M<A6a6r

literal 0
HcmV?d00001

diff --git a/metrics/integration/render-tests/image/world-wrap/style.json b/metrics/integration/render-tests/image/world-wrap/style.json
new file mode 100644
index 000000000..282dd6edb
--- /dev/null
+++ b/metrics/integration/render-tests/image/world-wrap/style.json
@@ -0,0 +1,56 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 256,
+      "height": 128
+    }
+  },
+  "center": [
+    180,
+    0
+  ],
+  "zoom": 1,
+  "sources": {
+    "image": {
+      "type": "image",
+      "coordinates": [
+        [
+          -180,
+          85.05112878
+        ],
+        [
+          180,
+          85.05112878
+        ],
+        [
+          180,
+          -85.05112878
+        ],
+        [
+          -180,
+          -85.05112878
+        ]
+      ],
+      "url": "local://image/world-wrap.png"
+    }
+  },
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "#ff00ff"
+      }
+    },
+    {
+      "id": "image",
+      "type": "raster",
+      "source": "image",
+      "paint": {
+        "raster-fade-duration": 0,
+        "raster-resampling": "nearest"
+      }
+    }
+  ]
+}
diff --git a/src/mln/renderer/sources/render_image_source.cpp b/src/mln/renderer/sources/render_image_source.cpp
index 83986c4a1..f25a0422b 100644
--- a/src/mln/renderer/sources/render_image_source.cpp
+++ b/src/mln/renderer/sources/render_image_source.cpp
@@ -13,6 +13,8 @@
 #include <mln/util/tile_coordinate.hpp>
 #include <mln/util/tile_cover.hpp>
 
+#include <algorithm>
+
 namespace mln {
 
 using namespace style;
@@ -142,15 +144,15 @@ void RenderImageSource::update(Immutable<style::Source::Impl> baseImpl_,
                                       static_cast<uint8_t>(transformState.getZoom()),
                                       zoomRange);
     for (auto tile : idealTiles) {
-        if (tile.wrap != 0 && tileCover[0].canonical.isChildOf(tile.canonical)) {
-            tileIds.emplace_back(tile.wrap, tileCover[0].canonical);
-            hasVisibleTile = true;
-        } else if (!hasVisibleTile) {
-            for (auto coveringTile : tileCover) {
-                if (coveringTile.canonical == tile.canonical || coveringTile.canonical.isChildOf(tile.canonical) ||
-                    tile.canonical.isChildOf(coveringTile.canonical)) {
-                    hasVisibleTile = true;
+        for (auto coveringTile : tileCover) {
+            if (coveringTile.canonical == tile.canonical || coveringTile.canonical.isChildOf(tile.canonical) ||
+                tile.canonical.isChildOf(coveringTile.canonical)) {
+                hasVisibleTile = true;
+                const UnwrappedTileID wrappedTileID(tile.wrap, tileCover[0].canonical);
+                if (tile.wrap != 0 && std::find(tileIds.cbegin(), tileIds.cend(), wrappedTileID) == tileIds.cend()) {
+                    tileIds.push_back(wrappedTileID);
                 }
+                break;
             }
         }
     }