Fix: Initialize mapsUrl in cloud native (#5868)

visgl · Jun 28, 2021 · 33c1309 · 33c1309
1 parent 3a2c584
commit 33c1309
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/modules/carto/src/api/maps-cloud-native-client.js b/modules/carto/src/api/maps-cloud-native-client.js
@@ -1,7 +1,7 @@
 /**
  * Maps API Client for Carto Cloud Native
  */
-import {getDefaultCredentials} from '../config';
+import {getDefaultCredentials, buildMapsUrlFromBase} from '../config';
 import {API_VERSIONS, encodeParameter, FORMATS, MAP_TYPES} from './maps-api-common';
 import {log} from '@deck.gl/core';
 
@@ -118,6 +118,10 @@ export async function getData({type, source, connection, credentials, format}) {
   log.assert(localCreds.accessToken, 'Must define an accessToken');
   log.assert(localCreds.mapsUrl, 'mapsUrl cannot be undefined');
 
+  if (!localCreds.mapsUrl) {
+    localCreds.mapsUrl = buildMapsUrlFromBase(localCreds.apiBaseUrl);
+  }
+
   const metadata = await mapInstantiation({type, source, connection, credentials: localCreds});
   let url;
   let mapFormat;

diff --git a/modules/carto/src/config.js b/modules/carto/src/config.js
@@ -48,11 +48,8 @@ export function setDefaultCredentials(opts) {
         );
       }
 
-      let apiBaseUrl = opts.apiBaseUrl || defaultCloudNativeCredentials.apiBaseUrl;
-      if (!apiBaseUrl.endsWith('/')) {
-        apiBaseUrl += '/';
-      }
-      opts.mapsUrl = opts.mapsUrl || `${apiBaseUrl}v3/maps`;
+      const apiBaseUrl = opts.apiBaseUrl || defaultCloudNativeCredentials.apiBaseUrl;
+      opts.mapsUrl = opts.mapsUrl || buildMapsUrlFromBase(apiBaseUrl);
       credentials = {
         apiVersion,
         ...defaultCloudNativeCredentials,
@@ -67,3 +64,12 @@ export function setDefaultCredentials(opts) {
 export function getDefaultCredentials() {
   return credentials;
 }
+
+export function buildMapsUrlFromBase(apiBaseUrl) {
+  let suffix = '/v3/maps';
+  if (apiBaseUrl.endsWith('/')) {
+    suffix = suffix.substring(1);
+  }
+
+  return `${apiBaseUrl}${suffix}`;
+}