@deck.gl/carto 8.7.0-alpha.1 → 8.7.0-alpha.2

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/carto",
   "description": "CARTO official integration with Deck.gl. Build geospatial applications using CARTO and Deck.gl.",
   "license": "MIT",
-  "version": "8.7.0-alpha.1",
+  "version": "8.7.0-alpha.2",
   "publishConfig": {
     "access": "public"
   },
@@ -48,5 +48,5 @@
     "@deck.gl/layers": "^8.0.0",
     "@loaders.gl/core": "^3.0.0"
   },
-  "gitHead": "dbaa3941a41f3ddceecad4d2d2879515d97d2510"
+  "gitHead": "67bc5fe69149ae933a5f203724ad58f58c4a1737"
 }

package/src/api/layer-map.js

@@ -117,7 +117,7 @@ function calculateDomain(data, name, scaleType) {
     // GeoJSON data type
     const values = data.features.map(({properties}) => properties[name]);
     return domainFromValues(values, scaleType);
-  } else if (Array.isArray(data) && data[0][name]) {
+  } else if (Array.isArray(data) && data[0][name] !== undefined) {
     // JSON data type
     const values = data.map(properties => properties[name]);
     return domainFromValues(values, scaleType);
@@ -139,7 +139,7 @@ export function getColorAccessor({name}, scaleType, {colors}, opacity, data) {
   const scale = SCALE_FUNCS[scaleType]();
   scale.domain(calculateDomain(data, name, scaleType));
   scale.range(colors);
-  const alpha = opacity !== undefined ? 255 * Math.pow(opacity, 1 / 2.2) : 255;
+  const alpha = opacity !== undefined ? Math.round(255 * Math.pow(opacity, 1 / 2.2)) : 255;
 
   const accessor = properties => {
     const rgba = rgb(scale(properties[name]));

package/src/api/maps-client.js

@@ -56,7 +56,7 @@ export async function getDataV2({type, source, credentials}) {
 
     default:
       throw new Error(
-        `Invalid maps API version. It shoud be ${API_VERSIONS.V1} or ${API_VERSIONS.V2}`
+        `Invalid maps API version. It should be ${API_VERSIONS.V1} or ${API_VERSIONS.V2}`
       );
   }
 }
@@ -95,15 +95,11 @@ function dealWithError({response, json, credentials}) {
   switch (response.status) {
     case 401:
       throw new Error(
-        `Unauthorized access to Maps API: invalid combination of user ('${
-          credentials.username
-        }') and apiKey ('${credentials.apiKey}')`
+        `Unauthorized access to Maps API: invalid combination of user ('${credentials.username}') and apiKey ('${credentials.apiKey}')`
       );
     case 403:
       throw new Error(
-        `Unauthorized access to dataset: the provided apiKey('${
-          credentials.apiKey
-        }') doesn't provide access to the requested data`
+        `Unauthorized access to dataset: the provided apiKey('${credentials.apiKey}') doesn't provide access to the requested data`
       );
 
     default:

package/src/api/maps-v3-client.js

@@ -239,7 +239,7 @@ export async function getData({type, source, connection, credentials, geoColumn,
   return layerData.data;
 }
 
-/* global setInterval, URLSearchParams */
+/* global clearInterval, setInterval, URLSearchParams */
 async function _fetchMapDataset(dataset, accessToken) {
   // First fetch metadata
   const {connectionName: connection, source, type} = dataset;
@@ -268,10 +268,14 @@ async function fillInMapDatasets({datasets, publicToken}) {
   return await Promise.all(promises);
 }
 
-export async function fetchMap({mapId, credentials, autoRefresh, onNewData}) {
-  const localCreds = {...getDefaultCredentials(), ...credentials};
+export async function fetchMap({cartoMapId, credentials, autoRefresh, onNewData}) {
+  const defaultCredentials = getDefaultCredentials();
+  const localCreds = {
+    ...(defaultCredentials.apiVersion === API_VERSIONS.V3 && defaultCredentials),
+    ...credentials
+  };
 
-  log.assert(mapId, 'Must define map id');
+  log.assert(cartoMapId, `Must define CARTO map id: fetchMap({cartoMapId: 'XXXX-XXXX-XXXX'})`);
 
   log.assert(localCreds.apiVersion === API_VERSIONS.V3, 'Method only available for v3');
   log.assert(localCreds.apiBaseUrl, 'Must define apiBaseUrl');
@@ -285,21 +289,28 @@ export async function fetchMap({mapId, credentials, autoRefresh, onNewData}) {
     log.assert(autoRefresh > 0, '`autoRefresh` must be a positive number');
   }
 
-  const url = `${localCreds.mapsUrl}/public/${mapId}`;
+  const url = `${localCreds.mapsUrl}/public/${cartoMapId}`;
   const map = await request({url});
 
   // Periodically check if the data has changed. Note that this
   // will not update when a map is published.
+  let stopAutoRefresh;
   if (autoRefresh) {
-    setInterval(async () => {
+    const intervalId = setInterval(async () => {
       const changed = await fillInMapDatasets(map);
       if (changed.some(v => v === true)) {
         onNewData(parseMap(map));
       }
     }, autoRefresh * 1000);
+    stopAutoRefresh = () => {
+      clearInterval(intervalId);
+    };
   }
 
   // Mutates map.datasets so that dataset.data contains data
   await fillInMapDatasets(map);
-  return parseMap(map);
+  return {
+    ...parseMap(map),
+    ...{stopAutoRefresh}
+  };
 }

package/src/api/parseMap.js

@@ -20,7 +20,7 @@ export function parseMap(json) {
     description: json.description,
     createdAt: json.createdAt,
     updatedAt: json.updatedAt,
-    mapState,
+    initialViewState: mapState,
     mapStyle,
     layers: extractTextLayers(layers.reverse()).map(({id, type, config, visualChannels}) => {
       log.assert(type in LAYER_MAP, `Unsupported layer type: ${type}`);
@@ -53,17 +53,19 @@ function extractTextLayers(layers) {
         {id, config: configRest, ...rest},
 
         // One layer per valid text label, with full opacity
-        ...textLabel.filter(t => t.field).map(t => {
-          return {
-            id: `id-label-${t.field.name}`,
-            config: {
-              textLabel: t,
-              ...configRest,
-              visConfig: {...configRest.visConfig, opacity: 1}
-            },
-            ...rest
-          };
-        })
+        ...textLabel
+          .filter(t => t.field)
+          .map(t => {
+            return {
+              id: `${id}-label-${t.field.name}`,
+              config: {
+                textLabel: t,
+                ...configRest,
+                visConfig: {...configRest.visConfig, opacity: 1}
+              },
+              ...rest
+            };
+          })
       ];
     })
   );
@@ -98,12 +100,6 @@ function createInteractionProps(interactionConfig) {
 }
 
 function mapProps(source, target, mapping) {
-  if (Array.isArray(source)) {
-    source = source[0];
-  }
-  if (!source) {
-    return;
-  }
   for (const sourceKey in mapping) {
     const sourceValue = source[sourceKey];
     const targetKey = mapping[sourceKey];
@@ -129,14 +125,8 @@ function createStyleProps(config, mapping) {
 
 /* eslint-disable complexity */
 function createChannelProps(visualChannels, type, config, data) {
-  const {
-    colorField,
-    colorScale,
-    sizeField,
-    sizeScale,
-    strokeColorField,
-    strokeColorScale
-  } = visualChannels;
+  const {colorField, colorScale, sizeField, sizeScale, strokeColorField, strokeColorScale} =
+    visualChannels;
   let {heightField, heightScale} = visualChannels;
   if (type === 'hexagonId') {
     heightField = sizeField;

package/src/config.js

@@ -1,60 +1,29 @@
-import {API_VERSIONS, DEFAULT_MAPS_URL_FORMAT} from './api/maps-api-common';
+import {API_VERSIONS} from './api/maps-api-common';
 
 export const defaultClassicCredentials = {
-  username: 'public',
   apiKey: 'default_public',
   region: 'us',
-  mapsUrl: null
+  username: 'public'
 };
 
-const defaultCloudNativeCredentials = {
-  accessToken: null,
-  apiBaseUrl: null,
-  mapsUrl: null
+export const defaultCloudNativeCredentials = {
+  apiBaseUrl: 'https://gcp-us-east1.api.carto.com'
 };
 
 let credentials = {};
 
 setDefaultCredentials({});
 
-export function setDefaultCredentials(opts) {
-  const apiVersion = opts.apiVersion || API_VERSIONS.V2;
+export function setDefaultCredentials({apiVersion, ...rest}) {
+  apiVersion = apiVersion || API_VERSIONS.V3;
 
   switch (apiVersion) {
     case API_VERSIONS.V1:
-      opts.mapsUrl = opts.mapsUrl || DEFAULT_MAPS_URL_FORMAT[apiVersion];
-      credentials = {
-        apiVersion,
-        ...defaultClassicCredentials,
-        ...opts
-      };
-      break;
-
     case API_VERSIONS.V2:
-      opts.mapsUrl = opts.mapsUrl || DEFAULT_MAPS_URL_FORMAT[apiVersion];
-      credentials = {
-        apiVersion,
-        ...defaultClassicCredentials,
-        ...opts
-      };
-
+      credentials = {apiVersion, ...defaultClassicCredentials, ...rest};
       break;
     case API_VERSIONS.V3:
-      if (!opts.apiBaseUrl) {
-        throw new Error(
-          `API version ${
-            API_VERSIONS.V3
-          } requires to define apiBaseUrl at credentials. Go to https://app.carto.com to get your apiBaseUrl.`
-        );
-      }
-
-      const apiBaseUrl = opts.apiBaseUrl || defaultCloudNativeCredentials.apiBaseUrl;
-      opts.mapsUrl = opts.mapsUrl || buildMapsUrlFromBase(apiBaseUrl);
-      credentials = {
-        apiVersion,
-        ...defaultCloudNativeCredentials,
-        ...opts
-      };
+      credentials = {apiVersion, ...defaultCloudNativeCredentials, ...rest};
       break;
     default:
       throw new Error(`Invalid API version ${apiVersion}. Use API_VERSIONS enum.`);

package/src/layers/carto-layer.js

@@ -99,7 +99,9 @@ export default class CartoLayer extends CompositeLayer {
 
       let data;
 
-      if (apiVersion === API_VERSIONS.V3) {
+      if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {
+        data = await getDataV2({type, source, credentials});
+      } else {
         data = await getData({
           type,
           source,
@@ -108,10 +110,6 @@ export default class CartoLayer extends CompositeLayer {
           geoColumn,
           columns
         });
-      } else if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {
-        data = await getDataV2({type, source, credentials});
-      } else {
-        log.assert(`Unknow apiVersion ${apiVersion}. Use API_VERSIONS enum.`);
       }
 
       this.setState({data, apiVersion});

package/src/style/color-bins-style.js

@@ -12,9 +12,7 @@ export default function colorBins({
 
   const palette = typeof colors === 'string' ? getPalette(colors, domain.length) : colors;
 
-  const color = scaleThreshold()
-    .domain(domain)
-    .range(palette);
+  const color = scaleThreshold().domain(domain).range(palette);
 
   return d => {
     const value = getAttrValue(attr, d);

package/src/style/color-continuous-style.js

@@ -11,9 +11,7 @@ export default function colorContinuous({
   assert(Array.isArray(domain), 'Expected "domain" to be an array of numbers');
 
   const palette = typeof colors === 'string' ? getPalette(colors) : colors;
-  const color = scaleLinear()
-    .domain(domain)
-    .range(palette);
+  const color = scaleLinear().domain(domain).range(palette);
 
   return d => {
     const value = getAttrValue(attr, d);