cleanup / CR suggestions

visgl · May 7, 2024 · 9291c3f · 9291c3f
1 parent e7350d0
commit 9291c3f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/docs/api-reference/carto/fetch-map.md b/docs/api-reference/carto/fetch-map.md
@@ -24,7 +24,7 @@ fetchMap({cartoMapId}).then(map => new Deck(map));
 ### Integration with CARTO basemaps
 
 ```js
-fetchMap({cartoMapId}).then(({initialViewState, basemap, mapStyle, layers}) => {
+fetchMap({cartoMapId}).then(({initialViewState, basemap, layers}) => {
   const deckgl = new deck.DeckGL({
     container: 'container',
     controller: true,

diff --git a/modules/carto/src/basemap.ts b/modules/carto/src/basemap.ts
@@ -57,11 +57,8 @@ export function applyCartoLayerGroupFilters(style, visibleLayerGroups: Record<st
   };
 }
 
-function someLayersFilteredOut(visibleLayerGroups?: Record<string, boolean>) {
-  return (
-    visibleLayerGroups &&
-    Object.values(visibleLayerGroups).some(filteredOut => filteredOut === false)
-  );
+function someLayerGroupsDisabled(visibleLayerGroups?: Record<string, boolean>) {
+  return visibleLayerGroups && Object.values(visibleLayerGroups).every(Boolean) === false;
 }
 
 export async function getCartoBasemapStyle({
@@ -75,7 +72,7 @@ export async function getCartoBasemapStyle({
   const styleUrl = `${cartoBasemapsBaseUrl}/${styleType}-gl-style/style.json`;
   let style = styleUrl;
 
-  if (visibleLayerGroups && someLayersFilteredOut(visibleLayerGroups)) {
+  if (visibleLayerGroups && someLayerGroupsDisabled(visibleLayerGroups)) {
     try {
       const originalStyle = await fetch(styleUrl, {
         mode: 'cors',
@@ -84,10 +81,7 @@ export async function getCartoBasemapStyle({
       style = applyCartoLayerGroupFilters(originalStyle, visibleLayerGroups);
     } catch (error) {
       // eslint-disable-next-line no-console
-      console.error(
-        'Error fetching CARTO basemap style, falling back to not-filtered style',
-        error
-      );
+      console.error('Error fetching CARTO basemap style, falling back to unfiltered style', error);
     }
   }
   return style;