From c1bbc3300c6f02a64774f63845f0506b88b457cd Mon Sep 17 00:00:00 2001
From: Bruno Raimbault <bruno@dhis2.org>
Date: Thu, 17 Sep 2026 15:58:32 +0200
Subject: [PATCH 1/2] fix: pass basemaps field through in dashboard embed
 config [DHIS2-22110] (#3772)

---
 src/components/plugin/MapContainer.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/plugin/MapContainer.jsx b/src/components/plugin/MapContainer.jsx
index af9ef298ac..e32149a988 100644
--- a/src/components/plugin/MapContainer.jsx
+++ b/src/components/plugin/MapContainer.jsx
@@ -18,6 +18,7 @@ const MapContainer = ({ visualization }) => {
     useEffect(() => {
         const {
             basemap: visBasemap,
+            basemaps: visBasemaps,
             mapViews,
             id,
             ...otherMapProps
@@ -41,7 +42,7 @@ const MapContainer = ({ visualization }) => {
                 )
             } else {
                 initialConfig = getMigratedMapConfig(
-                    { basemap: visBasemap, mapViews },
+                    { basemap: visBasemap, basemaps: visBasemaps, mapViews },
                     keyDefaultBaseMap
                 )
             }

From 36f7f8d9cd4889adf2c9e9d541592f197bc8e571 Mon Sep 17 00:00:00 2001
From: Bruno Raimbault <bruno@dhis2.org>
Date: Thu, 17 Sep 2026 16:14:32 +0200
Subject: [PATCH 2/2] fix: use policy-compliant tile URL for OSM Detailed
 basemap [DHIS2-22122] (#3773)

---
 src/constants/basemaps.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/constants/basemaps.js b/src/constants/basemaps.js
index 6bd0934b13..26469b930d 100644
--- a/src/constants/basemaps.js
+++ b/src/constants/basemaps.js
@@ -55,7 +55,7 @@ export const defaultBasemaps = () =>
             img: 'images/osm.png',
             config: {
                 type: TILE_LAYER,
-                url: '//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                url: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                 attribution:
                     '&copy; <a target="_blank" rel="noreferrer" href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>',
             },