From ba3714dc039199e81bde80da2af604a6de674661 Mon Sep 17 00:00:00 2001
From: Simao Rodrigues <arodrigues.simao@gmail.com>
Date: Tue, 19 Sep 2023 15:33:24 +0100
Subject: [PATCH] Fix issue with basemap layers sticking when switching them

---
 components/map/components/layer-manager/component.jsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/components/map/components/layer-manager/component.jsx b/components/map/components/layer-manager/component.jsx
index 893477a3c2..e684e53f0c 100644
--- a/components/map/components/layer-manager/component.jsx
+++ b/components/map/components/layer-manager/component.jsx
@@ -32,7 +32,7 @@ class LayerManagerComponent extends PureComponent {
           }
         : null;
 
-    const allLayers = layers.filter((l) => l);
+    const allLayers = [basemapLayer, ...layers].filter((l) => l);
 
     return (
       <LayerManager
@@ -69,9 +69,6 @@ class LayerManagerComponent extends PureComponent {
           },
         }}
       >
-        {basemapLayer && (
-          <Layer key="basemap" {...basemapLayer} {...basemapLayer?.config} />
-        )}
         {allLayers &&
           allLayers.map((l) => {
             const config = l.config ? l.config : l.layerConfig;