@deck.gl/carto 8.10.0-alpha.7 → 9.0.0-alpha.4

package/dist/esm/api/common.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/api/common.ts"],"names":["DEFAULT_API_BASE_URL","DEFAULT_CLIENT","V3_MINOR_VERSION","MAX_GET_LENGTH","DEFAULT_PARAMETERS","client","v","DEFAULT_HEADERS","Accept"],"mappings":"AAAA,OAAO,MAAMA,oBAAoB,GAAG,oCAA7B;AACP,OAAO,MAAMC,cAAc,GAAG,eAAvB;AACP,OAAO,MAAMC,gBAAgB,GAAG,KAAzB;AACP,OAAO,MAAMC,cAAc,GAAG,IAAvB;AAEP,OAAO,MAAMC,kBAAkB,GAAG;AAChCC,EAAAA,MAAM,EAAEJ,cADwB;AAEhCK,EAAAA,CAAC,EAAEJ;AAF6B,CAA3B;AAKP,OAAO,MAAMK,eAAe,GAAG;AAC7BC,EAAAA,MAAM,EAAE,kBADqB;AAE7B,kBAAgB;AAFa,CAAxB","sourcesContent":["export const DEFAULT_API_BASE_URL = 'https://gcp-us-east1.api.carto.com';\nexport const DEFAULT_CLIENT = 'deck-gl-carto';\nexport const V3_MINOR_VERSION = '3.3';\nexport const MAX_GET_LENGTH = 8192;\n\nexport const DEFAULT_PARAMETERS = {\n  client: DEFAULT_CLIENT,\n  v: V3_MINOR_VERSION\n};\n\nexport const DEFAULT_HEADERS = {\n  Accept: 'application/json',\n  'Content-Type': 'application/json'\n};\n"],"file":"common.js"}

package/dist/esm/api/endpoints.js

@@ -0,0 +1,28 @@
+function buildUrlFromBase(apiBaseUrl, endpoint) {
+  let suffix = `/v3/${endpoint}`;
+
+  if (apiBaseUrl.endsWith('/')) {
+    suffix = suffix.substring(1);
+  }
+
+  return `${apiBaseUrl}${suffix}`;
+}
+
+export function buildMapsUrlFromBase(apiBaseUrl) {
+  return buildUrlFromBase(apiBaseUrl, 'maps');
+}
+export function buildStatsUrlFromBase(apiBaseUrl) {
+  return buildUrlFromBase(apiBaseUrl, 'stats');
+}
+export function buildQueryUrlFromBase(apiBaseUrl) {
+  return buildUrlFromBase(apiBaseUrl, 'sql');
+}
+export function buildSourceUrl({
+  apiBaseUrl,
+  connectionName,
+  endpoint,
+  mapsUrl
+}) {
+  return `${mapsUrl || buildMapsUrlFromBase(apiBaseUrl)}/${connectionName}/${endpoint}`;
+}
+//# sourceMappingURL=endpoints.js.map

package/dist/esm/api/endpoints.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/api/endpoints.ts"],"names":["buildUrlFromBase","apiBaseUrl","endpoint","suffix","endsWith","substring","buildMapsUrlFromBase","buildStatsUrlFromBase","buildQueryUrlFromBase","buildSourceUrl","connectionName","mapsUrl"],"mappings":"AAIA,SAASA,gBAAT,CAA0BC,UAA1B,EAA8CC,QAA9C,EAAoE;AAClE,MAAIC,MAAM,GAAI,OAAMD,QAAS,EAA7B;;AACA,MAAID,UAAU,CAACG,QAAX,CAAoB,GAApB,CAAJ,EAA8B;AAC5BD,IAAAA,MAAM,GAAGA,MAAM,CAACE,SAAP,CAAiB,CAAjB,CAAT;AACD;;AAED,SAAQ,GAAEJ,UAAW,GAAEE,MAAO,EAA9B;AACD;;AAED,OAAO,SAASG,oBAAT,CAA8BL,UAA9B,EAA0D;AAC/D,SAAOD,gBAAgB,CAACC,UAAD,EAAa,MAAb,CAAvB;AACD;AAED,OAAO,SAASM,qBAAT,CAA+BN,UAA/B,EAA2D;AAChE,SAAOD,gBAAgB,CAACC,UAAD,EAAa,OAAb,CAAvB;AACD;AAED,OAAO,SAASO,qBAAT,CAA+BP,UAA/B,EAA2D;AAChE,SAAOD,gBAAgB,CAACC,UAAD,EAAa,KAAb,CAAvB;AACD;AAED,OAAO,SAASQ,cAAT,CAAwB;AAC7BR,EAAAA,UAD6B;AAE7BS,EAAAA,cAF6B;AAG7BR,EAAAA,QAH6B;AAI7BS,EAAAA;AAJ6B,CAAxB,EAUI;AACT,SAAQ,GAAEA,OAAO,IAAIL,oBAAoB,CAACL,UAAD,CAAa,IAAGS,cAAe,IAAGR,QAAS,EAApF;AACD","sourcesContent":["import {MapType} from './types';\n\nexport type V3Endpoint = 'maps' | 'stats' | 'sql';\n\nfunction buildUrlFromBase(apiBaseUrl: string, endpoint: V3Endpoint) {\n  let suffix = `/v3/${endpoint}`;\n  if (apiBaseUrl.endsWith('/')) {\n    suffix = suffix.substring(1);\n  }\n\n  return `${apiBaseUrl}${suffix}`;\n}\n\nexport function buildMapsUrlFromBase(apiBaseUrl: string): string {\n  return buildUrlFromBase(apiBaseUrl, 'maps');\n}\n\nexport function buildStatsUrlFromBase(apiBaseUrl: string): string {\n  return buildUrlFromBase(apiBaseUrl, 'stats');\n}\n\nexport function buildQueryUrlFromBase(apiBaseUrl: string): string {\n  return buildUrlFromBase(apiBaseUrl, 'sql');\n}\n\nexport function buildSourceUrl({\n  apiBaseUrl,\n  connectionName,\n  endpoint,\n  mapsUrl\n}: {\n  apiBaseUrl: string;\n  connectionName: string;\n  endpoint: MapType;\n  mapsUrl?: string;\n}): string {\n  return `${mapsUrl || buildMapsUrlFromBase(apiBaseUrl)}/${connectionName}/${endpoint}`;\n}\n"],"file":"endpoints.js"}

package/dist/esm/api/fetch-map.js

@@ -0,0 +1,300 @@
+import { CartoAPIError } from './carto-api-error';
+import { DEFAULT_API_BASE_URL, DEFAULT_CLIENT } from './common';
+import { buildMapsUrlFromBase, buildStatsUrlFromBase } from './endpoints';
+import { h3QuerySource, h3TableSource, quadbinQuerySource, quadbinTableSource, vectorQuerySource, vectorTableSource, vectorTilesetSource } from '../sources';
+import { parseMap } from './parse-map';
+import { requestWithParameters } from './request-with-parameters';
+import { assert } from '../utils';
+
+async function _fetchMapDataset(dataset, accessToken, apiBaseUrl, clientId, headers) {
+  const {
+    aggregationExp,
+    aggregationResLevel,
+    connectionName,
+    columns,
+    format,
+    geoColumn,
+    source,
+    type,
+    queryParameters
+  } = dataset;
+  const cache = {};
+  const globalOptions = {
+    accessToken,
+    apiBaseUrl,
+    cache,
+    clientId,
+    connectionName,
+    format,
+    headers
+  };
+
+  if (type === 'tileset') {
+    dataset.data = await vectorTilesetSource({ ...globalOptions,
+      tableName: source
+    });
+  } else {
+    const [spatialDataType, spatialDataColumn] = geoColumn ? geoColumn.split(':') : ['geom'];
+
+    if (spatialDataType === 'geom') {
+      const options = { ...globalOptions,
+        spatialDataColumn
+      };
+
+      if (type === 'table') {
+        dataset.data = await vectorTableSource({ ...options,
+          columns,
+          tableName: source
+        });
+      } else if (type === 'query') {
+        dataset.data = await vectorQuerySource({ ...options,
+          sqlQuery: source,
+          queryParameters
+        });
+      }
+    } else if (spatialDataType === 'h3') {
+      const options = { ...globalOptions,
+        aggregationExp,
+        aggregationResLevel,
+        spatialDataColumn
+      };
+
+      if (type === 'table') {
+        dataset.data = await h3TableSource({ ...options,
+          columns,
+          tableName: source
+        });
+      } else if (type === 'query') {
+        dataset.data = await h3QuerySource({ ...options,
+          sqlQuery: source,
+          queryParameters
+        });
+      }
+    } else if (spatialDataType === 'quadbin') {
+      const options = { ...globalOptions,
+        aggregationExp,
+        aggregationResLevel,
+        spatialDataColumn
+      };
+
+      if (type === 'table') {
+        dataset.data = await quadbinTableSource({ ...options,
+          columns,
+          tableName: source
+        });
+      } else if (type === 'query') {
+        dataset.data = await quadbinQuerySource({ ...options,
+          sqlQuery: source,
+          queryParameters
+        });
+      }
+    }
+  }
+
+  let cacheChanged = true;
+
+  if (cache.value) {
+    cacheChanged = dataset.cache !== cache.value;
+    dataset.cache = cache.value;
+  }
+
+  return cacheChanged;
+}
+
+async function _fetchTilestats(attribute, dataset, accessToken, apiBaseUrl) {
+  const {
+    connectionName: connection,
+    data,
+    id,
+    source,
+    type,
+    queryParameters
+  } = dataset;
+  const errorContext = {
+    requestType: 'Tile stats',
+    connection,
+    type,
+    source
+  };
+
+  if (!('tilestats' in data)) {
+    throw new CartoAPIError(new Error(`Invalid dataset for tilestats: ${id}`), errorContext);
+  }
+
+  const statsUrl = buildStatsUrlFromBase(apiBaseUrl);
+  let baseUrl = `${statsUrl}/${connection}/`;
+
+  if (type === 'query') {
+    baseUrl += attribute;
+  } else {
+    baseUrl += `${source}/${attribute}`;
+  }
+
+  const headers = {
+    Authorization: `Bearer ${accessToken}`
+  };
+  const parameters = {};
+
+  if (type === 'query') {
+    parameters.q = source;
+
+    if (queryParameters) {
+      parameters.queryParameters = JSON.stringify(queryParameters);
+    }
+  }
+
+  const stats = await requestWithParameters({
+    baseUrl,
+    headers,
+    parameters,
+    errorContext
+  });
+  const {
+    attributes
+  } = data.tilestats.layers[0];
+  const index = attributes.findIndex(d => d.attribute === attribute);
+  attributes[index] = stats;
+  return true;
+}
+
+async function fillInMapDatasets({
+  datasets,
+  token
+}, clientId, apiBaseUrl, headers) {
+  const promises = datasets.map(dataset => _fetchMapDataset(dataset, token, apiBaseUrl, clientId, headers));
+  return await Promise.all(promises);
+}
+
+async function fillInTileStats({
+  datasets,
+  keplerMapConfig,
+  token
+}, apiBaseUrl) {
+  const attributes = [];
+  const {
+    layers
+  } = keplerMapConfig.config.visState;
+
+  for (const layer of layers) {
+    for (const channel of Object.keys(layer.visualChannels)) {
+      var _layer$visualChannels;
+
+      const attribute = (_layer$visualChannels = layer.visualChannels[channel]) === null || _layer$visualChannels === void 0 ? void 0 : _layer$visualChannels.name;
+
+      if (attribute) {
+        const dataset = datasets.find(d => d.id === layer.config.dataId);
+
+        if (dataset && dataset.type !== 'tileset' && dataset.data.tilestats) {
+          attributes.push({
+            attribute,
+            dataset
+          });
+        }
+      }
+    }
+  }
+
+  const filteredAttributes = [];
+
+  for (const a of attributes) {
+    if (!filteredAttributes.find(({
+      attribute,
+      dataset
+    }) => attribute === a.attribute && dataset === a.dataset)) {
+      filteredAttributes.push(a);
+    }
+  }
+
+  const promises = filteredAttributes.map(({
+    attribute,
+    dataset
+  }) => _fetchTilestats(attribute, dataset, token, apiBaseUrl));
+  return await Promise.all(promises);
+}
+
+export async function fetchMap({
+  apiBaseUrl = DEFAULT_API_BASE_URL,
+  cartoMapId,
+  clientId = DEFAULT_CLIENT,
+  headers = {},
+  mapsUrl,
+  autoRefresh,
+  onNewData
+}) {
+  assert(cartoMapId, 'Must define CARTO map id: fetchMap({cartoMapId: "XXXX-XXXX-XXXX"})');
+  assert(apiBaseUrl, 'Must define apiBaseUrl');
+
+  if (autoRefresh || onNewData) {
+    assert(onNewData, 'Must define `onNewData` when using autoRefresh');
+    assert(typeof onNewData === 'function', '`onNewData` must be a function');
+    assert(typeof autoRefresh === 'number' && autoRefresh > 0, '`autoRefresh` must be a positive number');
+  }
+
+  const baseUrl = `${mapsUrl || buildMapsUrlFromBase(apiBaseUrl)}/public/${cartoMapId}`;
+  const errorContext = {
+    requestType: 'Public map',
+    mapId: cartoMapId
+  };
+  const map = await requestWithParameters({
+    baseUrl,
+    headers,
+    errorContext
+  });
+  let stopAutoRefresh;
+
+  if (autoRefresh) {
+    const intervalId = setInterval(async () => {
+      const changed = await fillInMapDatasets(map, clientId, apiBaseUrl, { ...headers,
+        'If-Modified-Since': new Date().toUTCString()
+      });
+
+      if (onNewData && changed.some(v => v === true)) {
+        onNewData(parseMap(map));
+      }
+    }, autoRefresh * 1000);
+
+    stopAutoRefresh = () => {
+      clearInterval(intervalId);
+    };
+  }
+
+  const geojsonLayers = map.keplerMapConfig.config.visState.layers.filter(({
+    type
+  }) => type === 'geojson' || type === 'point');
+  const geojsonDatasetIds = geojsonLayers.map(({
+    config
+  }) => config.dataId);
+  map.datasets.forEach(dataset => {
+    if (geojsonDatasetIds.includes(dataset.id)) {
+      const {
+        config
+      } = geojsonLayers.find(({
+        config
+      }) => config.dataId === dataset.id);
+      dataset.format = 'geojson';
+
+      if (!dataset.geoColumn && config.columns.geojson) {
+        dataset.geoColumn = config.columns.geojson;
+      }
+    }
+  });
+  await fillInMapDatasets(map, clientId, apiBaseUrl, headers);
+  await fillInTileStats(map, apiBaseUrl);
+  const out = { ...parseMap(map),
+    ...{
+      stopAutoRefresh
+    }
+  };
+  const textLayers = out.layers.filter(layer => {
+    const pointType = layer.props.pointType || '';
+    return pointType.includes('text');
+  });
+
+  if (textLayers.length && window.FontFace && !document.fonts.check('12px Inter')) {
+    const font = new FontFace('Inter', 'url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1ZL7W0Q5nw.woff2)');
+    await font.load().then(f => document.fonts.add(f));
+  }
+
+  return out;
+}
+//# sourceMappingURL=fetch-map.js.map

package/dist/esm/api/fetch-map.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/api/fetch-map.ts"],"names":["CartoAPIError","DEFAULT_API_BASE_URL","DEFAULT_CLIENT","buildMapsUrlFromBase","buildStatsUrlFromBase","h3QuerySource","h3TableSource","quadbinQuerySource","quadbinTableSource","vectorQuerySource","vectorTableSource","vectorTilesetSource","parseMap","requestWithParameters","assert","_fetchMapDataset","dataset","accessToken","apiBaseUrl","clientId","headers","aggregationExp","aggregationResLevel","connectionName","columns","format","geoColumn","source","type","queryParameters","cache","globalOptions","data","tableName","spatialDataType","spatialDataColumn","split","options","sqlQuery","cacheChanged","value","_fetchTilestats","attribute","connection","id","errorContext","requestType","Error","statsUrl","baseUrl","Authorization","parameters","q","JSON","stringify","stats","attributes","tilestats","layers","index","findIndex","d","fillInMapDatasets","datasets","token","promises","map","Promise","all","fillInTileStats","keplerMapConfig","config","visState","layer","channel","Object","keys","visualChannels","name","find","dataId","push","filteredAttributes","a","fetchMap","cartoMapId","mapsUrl","autoRefresh","onNewData","mapId","stopAutoRefresh","intervalId","setInterval","changed","Date","toUTCString","some","v","clearInterval","geojsonLayers","filter","geojsonDatasetIds","forEach","includes","geojson","out","textLayers","pointType","props","length","window","FontFace","document","fonts","check","font","load","then","f","add"],"mappings":"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","sourcesContent":["/* eslint-disable camelcase */\n/**\n * Maps API Client for Carto 3\n */\nimport {CartoAPIError} from './carto-api-error';\nimport {DEFAULT_API_BASE_URL, DEFAULT_CLIENT} from './common';\nimport {buildMapsUrlFromBase, buildStatsUrlFromBase} from './endpoints';\nimport {\n  GeojsonResult,\n  JsonResult,\n  TilejsonResult,\n  h3QuerySource,\n  h3TableSource,\n  quadbinQuerySource,\n  quadbinTableSource,\n  vectorQuerySource,\n  vectorTableSource,\n  vectorTilesetSource\n} from '../sources';\nimport {parseMap} from './parse-map';\nimport {requestWithParameters} from './request-with-parameters';\nimport {assert} from '../utils';\nimport type {APIErrorContext, Format, MapType, QueryParameters} from './types';\n\ntype Dataset = {\n  id: string;\n  type: MapType;\n  source: string;\n  cache?: number;\n  connectionName: string;\n  geoColumn: string;\n  data: TilejsonResult | GeojsonResult | JsonResult;\n  columns: string[];\n  format: Format;\n  aggregationExp: string;\n  aggregationResLevel: number;\n  queryParameters: QueryParameters;\n};\n\n/* global clearInterval, setInterval, URL */\n/* eslint-disable complexity, max-statements */\nasync function _fetchMapDataset(\n  dataset: Dataset,\n  accessToken: string,\n  apiBaseUrl: string,\n  clientId?: string,\n  headers?: Record<string, string>\n) {\n  const {\n    aggregationExp,\n    aggregationResLevel,\n    connectionName,\n    columns,\n    format,\n    geoColumn,\n    source,\n    type,\n    queryParameters\n  } = dataset;\n\n  const cache: {value?: number} = {};\n  const globalOptions: any = {\n    accessToken,\n    apiBaseUrl,\n    cache,\n    clientId,\n    connectionName,\n    format,\n    headers\n  };\n\n  if (type === 'tileset') {\n    // TODO do we want a generic tilesetSource?\n    // @ts-ignore\n    dataset.data = await vectorTilesetSource({...globalOptions, tableName: source});\n  } else {\n    const [spatialDataType, spatialDataColumn] = geoColumn ? geoColumn.split(':') : ['geom'];\n    if (spatialDataType === 'geom') {\n      const options = {...globalOptions, spatialDataColumn};\n      if (type === 'table') {\n        dataset.data = await vectorTableSource({...options, columns, tableName: source});\n      } else if (type === 'query') {\n        dataset.data = await vectorQuerySource({...options, sqlQuery: source, queryParameters});\n      }\n    } else if (spatialDataType === 'h3') {\n      const options = {...globalOptions, aggregationExp, aggregationResLevel, spatialDataColumn};\n      if (type === 'table') {\n        dataset.data = await h3TableSource({...options, columns, tableName: source});\n      } else if (type === 'query') {\n        dataset.data = await h3QuerySource({...options, sqlQuery: source, queryParameters});\n      }\n    } else if (spatialDataType === 'quadbin') {\n      const options = {...globalOptions, aggregationExp, aggregationResLevel, spatialDataColumn};\n      if (type === 'table') {\n        dataset.data = await quadbinTableSource({...options, columns, tableName: source});\n      } else if (type === 'query') {\n        dataset.data = await quadbinQuerySource({...options, sqlQuery: source, queryParameters});\n      }\n    }\n  }\n  let cacheChanged = true;\n  if (cache.value) {\n    cacheChanged = dataset.cache !== cache.value;\n    dataset.cache = cache.value;\n  }\n\n  return cacheChanged;\n}\n\nasync function _fetchTilestats(\n  attribute,\n  dataset: Dataset,\n  accessToken: string,\n  apiBaseUrl: string\n) {\n  const {connectionName: connection, data, id, source, type, queryParameters} = dataset;\n  const errorContext: APIErrorContext = {requestType: 'Tile stats', connection, type, source};\n  if (!('tilestats' in data)) {\n    throw new CartoAPIError(new Error(`Invalid dataset for tilestats: ${id}`), errorContext);\n  }\n\n  const statsUrl = buildStatsUrlFromBase(apiBaseUrl);\n  let baseUrl = `${statsUrl}/${connection}/`;\n  if (type === 'query') {\n    baseUrl += attribute;\n  } else {\n    // MAP_TYPE.TABLE\n    baseUrl += `${source}/${attribute}`;\n  }\n\n  const headers = {Authorization: `Bearer ${accessToken}`};\n  const parameters: Record<string, string> = {};\n  if (type === 'query') {\n    parameters.q = source;\n    if (queryParameters) {\n      parameters.queryParameters = JSON.stringify(queryParameters);\n    }\n  }\n  const stats = await requestWithParameters({\n    baseUrl,\n    headers,\n    parameters,\n    errorContext\n  });\n\n  // Replace tilestats for attribute with value from API\n  const {attributes} = data.tilestats.layers[0];\n  const index = attributes.findIndex(d => d.attribute === attribute);\n  attributes[index] = stats;\n  return true;\n}\n\nasync function fillInMapDatasets(\n  {datasets, token}: {datasets: Dataset[]; token: string},\n  clientId: string,\n  apiBaseUrl: string,\n  headers?: Record<string, string>\n) {\n  const promises = datasets.map(dataset =>\n    _fetchMapDataset(dataset, token, apiBaseUrl, clientId, headers)\n  );\n  return await Promise.all(promises);\n}\n\nasync function fillInTileStats(\n  {datasets, keplerMapConfig, token}: {datasets: Dataset[]; keplerMapConfig: any; token: string},\n  apiBaseUrl: string\n) {\n  const attributes: {attribute?: string; dataset?: any}[] = [];\n  const {layers} = keplerMapConfig.config.visState;\n  for (const layer of layers) {\n    for (const channel of Object.keys(layer.visualChannels)) {\n      const attribute = layer.visualChannels[channel]?.name;\n      if (attribute) {\n        const dataset = datasets.find(d => d.id === layer.config.dataId);\n        if (dataset && dataset.type !== 'tileset' && (dataset.data as TilejsonResult).tilestats) {\n          // Only fetch stats for QUERY & TABLE map types\n          attributes.push({attribute, dataset});\n        }\n      }\n    }\n  }\n  // Remove duplicates to avoid repeated requests\n  const filteredAttributes: {attribute?: string; dataset?: any}[] = [];\n  for (const a of attributes) {\n    if (\n      !filteredAttributes.find(\n        ({attribute, dataset}) => attribute === a.attribute && dataset === a.dataset\n      )\n    ) {\n      filteredAttributes.push(a);\n    }\n  }\n\n  const promises = filteredAttributes.map(({attribute, dataset}) =>\n    _fetchTilestats(attribute, dataset, token, apiBaseUrl)\n  );\n  return await Promise.all(promises);\n}\n\nexport type FetchMapOptions = {\n  apiBaseUrl?: string;\n  cartoMapId: string;\n  clientId?: string;\n  headers?: Record<string, string>;\n  mapsUrl?: string;\n  autoRefresh?: number;\n  onNewData?: (map: any) => void;\n};\n\n/* eslint-disable max-statements */\nexport async function fetchMap({\n  apiBaseUrl = DEFAULT_API_BASE_URL,\n  cartoMapId,\n  clientId = DEFAULT_CLIENT,\n  headers = {},\n  mapsUrl,\n  autoRefresh,\n  onNewData\n}: FetchMapOptions) {\n  assert(cartoMapId, 'Must define CARTO map id: fetchMap({cartoMapId: \"XXXX-XXXX-XXXX\"})');\n  assert(apiBaseUrl, 'Must define apiBaseUrl');\n\n  if (autoRefresh || onNewData) {\n    assert(onNewData, 'Must define `onNewData` when using autoRefresh');\n    assert(typeof onNewData === 'function', '`onNewData` must be a function');\n    assert(\n      typeof autoRefresh === 'number' && autoRefresh > 0,\n      '`autoRefresh` must be a positive number'\n    );\n  }\n\n  const baseUrl = `${mapsUrl || buildMapsUrlFromBase(apiBaseUrl)}/public/${cartoMapId}`;\n  const errorContext: APIErrorContext = {requestType: 'Public map', mapId: cartoMapId};\n  const map = await requestWithParameters({baseUrl, headers, errorContext});\n\n  // Periodically check if the data has changed. Note that this\n  // will not update when a map is published.\n  let stopAutoRefresh: (() => void) | undefined;\n  if (autoRefresh) {\n    // eslint-disable-next-line @typescript-eslint/no-misused-promises\n    const intervalId = setInterval(async () => {\n      const changed = await fillInMapDatasets(map, clientId, apiBaseUrl, {\n        ...headers,\n        'If-Modified-Since': new Date().toUTCString()\n      });\n      if (onNewData && changed.some(v => v === true)) {\n        onNewData(parseMap(map));\n      }\n    }, autoRefresh * 1000);\n    stopAutoRefresh = () => {\n      clearInterval(intervalId);\n    };\n  }\n\n  const geojsonLayers = map.keplerMapConfig.config.visState.layers.filter(\n    ({type}) => type === 'geojson' || type === 'point'\n  );\n  const geojsonDatasetIds = geojsonLayers.map(({config}) => config.dataId);\n  map.datasets.forEach(dataset => {\n    if (geojsonDatasetIds.includes(dataset.id)) {\n      const {config} = geojsonLayers.find(({config}) => config.dataId === dataset.id);\n      dataset.format = 'geojson';\n      // Support for very old maps. geoColumn was not stored in the past\n      if (!dataset.geoColumn && config.columns.geojson) {\n        dataset.geoColumn = config.columns.geojson;\n      }\n    }\n  });\n\n  // Mutates map.datasets so that dataset.data contains data\n  await fillInMapDatasets(map, clientId, apiBaseUrl, headers);\n\n  // Mutates attributes in visualChannels to contain tile stats\n  await fillInTileStats(map, apiBaseUrl);\n  const out = {...parseMap(map), ...{stopAutoRefresh}};\n\n  const textLayers = out.layers.filter(layer => {\n    const pointType = layer.props.pointType || '';\n    return pointType.includes('text');\n  });\n\n  /* global FontFace, window, document */\n  if (textLayers.length && window.FontFace && !document.fonts.check('12px Inter')) {\n    // Fetch font needed for labels\n    const font = new FontFace(\n      'Inter',\n      'url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1ZL7W0Q5nw.woff2)'\n    );\n    await font.load().then(f => document.fonts.add(f));\n  }\n\n  return out;\n}\n"],"file":"fetch-map.js"}

package/dist/esm/api/index.js

@@ -1,5 +1,4 @@
 export { CartoAPIError } from './carto-api-error';
-export { FORMATS, TILE_FORMATS, MAP_TYPES, API_VERSIONS } from './maps-api-common';
-export { getDataV2, CONNECTIONS } from './maps-client';
-export { fetchLayerData, fetchMap, mapInstantiation } from './maps-v3-client';
+export { fetchMap } from './fetch-map';
+export { query } from './query';
 //# sourceMappingURL=index.js.map

package/dist/esm/api/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/api/index.ts"],"names":["CartoAPIError","FORMATS","TILE_FORMATS","MAP_TYPES","API_VERSIONS","getDataV2","CONNECTIONS","fetchLayerData","fetchMap","mapInstantiation"],"mappings":"AAAA,SAAQA,aAAR,QAA4B,mBAA5B;AAEA,SAAQC,OAAR,EAAiBC,YAAjB,EAA+BC,SAA/B,EAA0CC,YAA1C,QAA6D,mBAA7D;AAEA,SAAQC,SAAR,EAAmBC,WAAnB,QAAqC,eAArC;AACA,SAAQC,cAAR,EAAwBC,QAAxB,EAAkCC,gBAAlC,QAAyD,kBAAzD","sourcesContent":["export {CartoAPIError} from './carto-api-error';\nexport type {APIErrorContext} from './carto-api-error';\nexport {FORMATS, TILE_FORMATS, MAP_TYPES, API_VERSIONS} from './maps-api-common';\nexport type {QueryParameters} from './maps-api-common';\nexport {getDataV2, CONNECTIONS} from './maps-client';\nexport {fetchLayerData, fetchMap, mapInstantiation} from './maps-v3-client';\n"],"file":"index.js"}
+{"version":3,"sources":["../../../src/api/index.ts"],"names":["CartoAPIError","fetchMap","query"],"mappings":"AAAA,SAAQA,aAAR,QAA4B,mBAA5B;AACA,SAAQC,QAAR,QAAuB,aAAvB;AAGA,SAAQC,KAAR,QAAoB,SAApB","sourcesContent":["export {CartoAPIError} from './carto-api-error';\nexport {fetchMap} from './fetch-map';\nexport type {FetchMapOptions} from './fetch-map';\nexport type {APIErrorContext, Format, MapType, RequestType, QueryParameters} from './types';\nexport {query} from './query';\nexport type {QueryOptions} from './query';\n"],"file":"index.js"}

package/dist/esm/api/layer-map.js

@@ -10,8 +10,7 @@ import H3TileLayer from '../layers/h3-tile-layer';
 import QuadbinTileLayer from '../layers/quadbin-tile-layer';
 import RasterTileLayer from '../layers/raster-tile-layer';
 import VectorTileLayer from '../layers/vector-tile-layer';
-import { TILE_FORMATS } from './maps-api-common';
-import { assert, createBinaryProxy } from '../utils';
+import { assert, createBinaryProxy, scaleIdentity } from '../utils';
 const SCALE_FUNCS = {
   linear: scaleLinear,
   ordinal: scaleOrdinal,
@@ -20,7 +19,8 @@ const SCALE_FUNCS = {
   quantile: scaleQuantile,
   quantize: scaleQuantize,
   sqrt: scaleSqrt,
-  custom: scaleThreshold
+  custom: scaleThreshold,
+  identity: scaleIdentity
 };
 
 function identity(v) {
@@ -208,7 +208,7 @@ export function getLayer(type, config, dataset) {
     }
   };
 }
-export function layerFromTileDataset(formatTiles = TILE_FORMATS.MVT, scheme, type) {
+export function layerFromTileDataset(scheme, type) {
   if (type === 'raster') {
     return RasterTileLayer;
   }
@@ -229,13 +229,11 @@ function getTileLayer(dataset, basePropMap) {
     aggregationExp,
     aggregationResLevel,
     data: {
-      scheme,
-      tiles: [tileUrl]
+      scheme
     }
   } = dataset;
-  const formatTiles = new URL(tileUrl).searchParams.get('formatTiles');
   return {
-    Layer: layerFromTileDataset(formatTiles, scheme),
+    Layer: layerFromTileDataset(scheme),
     propMap: basePropMap,
     defaultProps: { ...defaultProps,
       ...(aggregationExp && {
@@ -244,7 +242,6 @@ function getTileLayer(dataset, basePropMap) {
       ...(aggregationResLevel && {
         aggregationResLevel
       }),
-      formatTiles,
       uniqueIdProperty: 'geoid'
     }
   };
@@ -356,35 +353,13 @@ export function getColorValueAccessor({
   return normalizeAccessor(accessor, data);
 }
 export function getColorAccessor({
-  name
+  name,
+  colorColumn
 }, scaleType, {
   aggregation,
-  range: {
-    colors,
-    colorMap
-  }
+  range
 }, opacity, data) {
-  const scale = SCALE_FUNCS[scaleType]();
-  let domain = [];
-  let scaleColor = [];
-
-  if (Array.isArray(colorMap)) {
-    colorMap.forEach(([value, color]) => {
-      domain.push(value);
-      scaleColor.push(color);
-    });
-  } else {
-    domain = calculateDomain(data, name, scaleType, colors.length);
-    scaleColor = colors;
-  }
-
-  if (scaleType === 'ordinal') {
-    domain = domain.slice(0, scaleColor.length);
-  }
-
-  scale.domain(domain);
-  scale.range(scaleColor);
-  scale.unknown(UNKNOWN_COLOR);
+  const scale = calculateLayerScale(colorColumn || name, scaleType, range, data);
   const alpha = opacityToAlpha(opacity);
   let accessorKeys = getAccessorKeys(name, aggregation);
 
@@ -404,6 +379,39 @@ export function getColorAccessor({
 
   return normalizeAccessor(accessor, data);
 }
+
+function calculateLayerScale(name, scaleType, range, data) {
+  const scale = SCALE_FUNCS[scaleType]();
+  let domain = [];
+  let scaleColor = [];
+
+  if (scaleType !== 'identity') {
+    const {
+      colorMap,
+      colors
+    } = range;
+
+    if (Array.isArray(colorMap)) {
+      colorMap.forEach(([value, color]) => {
+        domain.push(value);
+        scaleColor.push(color);
+      });
+    } else {
+      domain = calculateDomain(data, name, scaleType, colors.length);
+      scaleColor = colors;
+    }
+
+    if (scaleType === 'ordinal') {
+      domain = domain.slice(0, scaleColor.length);
+    }
+  }
+
+  scale.domain(domain);
+  scale.range(scaleColor);
+  scale.unknown(UNKNOWN_COLOR);
+  return scale;
+}
+
 const FALLBACK_ICON = 'data:image/svg+xml;charset=utf-8;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMTAwIDEwMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4NCiAgPGNpcmNsZSBjeD0iNTAiIGN5PSI1MCIgcj0iNTAiLz4NCjwvc3ZnPg==';
 export function getIconUrlAccessor(field, range, {
   fallbackUrl,