From eb926994876965e3e2ac2011e5bc45d23765969d Mon Sep 17 00:00:00 2001
From: Bruno Raimbault <bruno@dhis2.org>
Date: Thu, 21 May 2026 16:18:40 +0200
Subject: [PATCH 1/2] fix: prevent crash when timeline thematic layer fails to
 load [DHIS2-19063]

---
 src/loaders/thematicLoader.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/loaders/thematicLoader.js b/src/loaders/thematicLoader.js
index 860570a70..df7628b56 100644
--- a/src/loaders/thematicLoader.js
+++ b/src/loaders/thematicLoader.js
@@ -97,6 +97,7 @@ const thematicLoader = async ({
                 : {}),
             name: dataItem ? dataItem.name : i18n.t('Thematic layer'),
             data: [],
+            periods: [],
             legend: null,
             isLoaded: true,
             isLoading: false,

From f9f2a42e6ca83efa9c27f858e2957d7ae6fa5fce Mon Sep 17 00:00:00 2001
From: Bruno Raimbault <bruno@dhis2.org>
Date: Thu, 21 May 2026 17:26:27 +0200
Subject: [PATCH 2/2] fix: timeline period not updated after drilling up/down
 [DHIS2-21113]

---
 src/components/map/Map.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/map/Map.jsx b/src/components/map/Map.jsx
index c8d0435d1..15f398ef4 100644
--- a/src/components/map/Map.jsx
+++ b/src/components/map/Map.jsx
@@ -222,9 +222,9 @@ class Map extends Component {
                                     setFeatureProfile={setFeatureProfile}
                                     engine={engine}
                                     nameProperty={nameProperty}
-                                    externalPeriod={period}
                                     resizeCount={resizeCount}
                                     {...config}
+                                    externalPeriod={period}
                                 />
                             )
                         })}