cleanup / self-review

visgl · May 6, 2024 · 173c2a4 · 173c2a4
1 parent e65fb12
commit 173c2a4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/docs/api-reference/carto/fetch-map.md b/docs/api-reference/carto/fetch-map.md
@@ -98,12 +98,6 @@ Properties:
  * `style` **(string or object)** - URL of basemap style or style object if custom basemap is configured
  * `attribution` **(string)** - custom attribution HTML for this basemap
 
-#### `mapStyle` (string) {#mapstyle}
-
-_(**deprecated**, use `basemap.styleUrl`)_
-
-An identifier describing the CARTO [basemap](../../api-reference/carto/basemap.md#supported-basemaps) configured in CARTO Builder.
-
 #### `layers` (Layer[]) {#layers}
 
 A collection of deck.gl [layers](../core/layer.md).

diff --git a/modules/carto/src/api/basemap.ts b/modules/carto/src/api/basemap.ts
@@ -1,7 +1,7 @@
+import {cartoBasemapsBaseUrl} from '../basemap';
 import {KeplerMapConfig} from './types';
 
 const DEFAULT_CARTO_STYLE = 'positron';
-const CARTO_MAP_BASEURL = 'https://basemaps.cartocdn.com/gl/';
 const CARTO_MAP_STYLES = ['positron', 'dark-matter', 'voyager'];
 const CARTO_MAP_ATRRIBUTION = `© <a href="https://carto.com/about-carto/" target="_blank" rel="noopener noreferrer">CARTO</a>, ©
 <a href="http://www.openstreetmap.org/copyright" target="_blank" rel="noopener noreferrer">OpenStreetMap</a> contributors`;
@@ -21,7 +21,7 @@ export function getBasemapSettings(config: KeplerMapConfig) {
   if (CARTO_MAP_STYLES.includes(styleType)) {
     const {label} = mapStyle.visibleLayerGroups;
     const labelSuffix = label ? '' : '-nolabels';
-    const styleUrl = `${CARTO_MAP_BASEURL}${styleType}${labelSuffix}-gl-style/style.json`;
+    const styleUrl = `${cartoBasemapsBaseUrl}${styleType}${labelSuffix}-gl-style/style.json`;
     return {
       style: styleUrl,
       attribution: CARTO_MAP_ATRRIBUTION

diff --git a/modules/carto/src/basemap.ts b/modules/carto/src/basemap.ts
@@ -1,4 +1,6 @@
-const baseUrl = 'https://basemaps.cartocdn.com/gl/{basemap}-gl-style/style.json';
+export const cartoBasemapsBaseUrl = 'https://basemaps.cartocdn.com/gl';
+
+const baseUrl = `${cartoBasemapsBaseUrl}/{basemap}-gl-style/style.json`;
 
 export default {
   VOYAGER: baseUrl.replace('{basemap}', 'voyager'),