Merge branch 'master' into chore/new-gh-workflows

dhis2 · Jul 9, 2024 · 0b15c74 · 0b15c74
2 parents 93623fb + 1b6434a
commit 0b15c74
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [100.5.7](https://github.com/dhis2/maps-app/compare/v100.5.6...v100.5.7) (2024-07-04)
+
+
+### Bug Fixes
+
+* enable hidding basemap in dashboard ([#3275](https://github.com/dhis2/maps-app/issues/3275)) ([eee5805](https://github.com/dhis2/maps-app/commit/eee580515634ef43722d4c9b6d23b0abce656eed))
+
 ## [100.5.6](https://github.com/dhis2/maps-app/compare/v100.5.5...v100.5.6) (2024-06-26)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "maps-app",
-    "version": "100.5.6",
+    "version": "100.5.7",
     "description": "DHIS2 Maps",
     "license": "BSD-3-Clause",
     "author": "Bjørn Sandvik",

diff --git a/src/components/plugin/MapContainer.js b/src/components/plugin/MapContainer.js
@@ -44,6 +44,7 @@ const MapContainer = ({ visualization }) => {
 
             const { basemap } = await getBasemapConfig({
                 basemapId: initialConfig.basemap?.id,
+                basemapVisible: initialConfig.basemap?.isVisible,
                 keyDefaultBaseMap,
                 keyBingMapsApiKey,
                 engine,

diff --git a/src/components/plugin/getBasemapConfig.js b/src/components/plugin/getBasemapConfig.js
@@ -30,6 +30,7 @@ async function getBasemaps(basemapId, defaultBasemapId, engine) {
 
 async function getBasemapConfig({
     basemapId,
+    basemapVisible,
     keyDefaultBaseMap,
     keyBingMapsApiKey,
     engine,
@@ -44,6 +45,9 @@ async function getBasemapConfig({
     if (basemap.id.substring(0, 4) === 'bing') {
         basemap.config.apiKey = keyBingMapsApiKey
     }
+    if (typeof basemapVisible === 'boolean') {
+        basemap.isVisible = basemapVisible
+    }
     return {
         basemap,
     }