fix(carto): Fix fetchMap visibleLayerGroup filtering to include stati…

…c layers (#8915)
visgl · May 22, 2024 · 508649c · 508649c
1 parent 87ae695
commit 508649c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/modules/carto/src/basemap.ts b/modules/carto/src/basemap.ts
@@ -86,15 +86,17 @@ export function applyLayerGroupFilters(
     return style;
   }
 
-  const visibleFilters = STYLE_LAYER_GROUPS.filter(lg => visibleLayerGroups[lg.slug]).map(
+  const removedLayerFilters = STYLE_LAYER_GROUPS.filter(lg => !visibleLayerGroups[lg.slug]).map(
     lg => lg.filter
   );
 
-  const filteredLayers = style.layers.filter(layer => visibleFilters.some(match => match(layer)));
+  const visibleLayers = style.layers.filter(layer =>
+    removedLayerFilters.every(match => !match(layer))
+  );
 
   return {
     ...style,
-    layers: filteredLayers
+    layers: visibleLayers
   };
 }
 

diff --git a/test/modules/carto/api/basemap.spec.ts b/test/modules/carto/api/basemap.spec.ts
@@ -24,7 +24,7 @@ const mockedMapConfig: KeplerMapConfig = {
 };
 const mockedCartoStyle = {
   id: '1234',
-  layers: [{id: 'label'}, {id: 'road'}, {id: 'boundaries'}, {id: 'water'}]
+  layers: [{id: 'background'}, {id: 'label'}, {id: 'road'}, {id: 'boundaries'}, {id: 'water'}]
 };
 async function responseFunc(url: string) {
   if (url === BASEMAP.VOYAGER) {