@deck.gl/carto 9.0.28 → 9.0.30

package/dist/index.cjs

@@ -74,18 +74,18 @@ var import_core6 = require("@deck.gl/core");
 // dist/layers/cluster-utils.js
 var import_quadbin = require("quadbin");
 var import_core = require("@deck.gl/core");
-function aggregateTile(tile, aggregationLevels, properties = [], getPosition, getWeight) {
+function aggregateTile(tile, tileAggregationCache, aggregationLevels, properties = [], getPosition, getWeight) {
   var _a;
   if (!tile.content)
     return false;
   if (!tile.userData)
     tile.userData = {};
-  const cell0 = (_a = tile.userData[aggregationLevels]) == null ? void 0 : _a[0];
+  const cell0 = (_a = tileAggregationCache.get(aggregationLevels)) == null ? void 0 : _a[0];
   if (cell0) {
     if (properties.every((property) => property.name in cell0)) {
       return false;
     }
-    tile.userData = {};
+    tileAggregationCache.clear();
   }
   const out = {};
   for (const cell of tile.content) {
@@ -125,7 +125,7 @@ function aggregateTile(tile, aggregationLevels, properties = [], getPosition, ge
       }
     }
   }
-  tile.userData[aggregationLevels] = Object.values(out);
+  tileAggregationCache.set(aggregationLevels, Object.values(out));
   return true;
 }
 function extractAggregationProperties(tile) {
@@ -548,7 +548,7 @@ function binaryToSpatialjson(binary) {
 }
 
 // dist/layers/schema/carto-spatial-tile-loader.js
-var VERSION = true ? "9.0.28" : "latest";
+var VERSION = true ? "9.0.30" : "latest";
 var id = "cartoSpatialTile";
 var DEFAULT_OPTIONS = {
   cartoSpatialTile: {
@@ -661,6 +661,10 @@ var defaultProps = {
   tileSize: DEFAULT_TILE_SIZE
 };
 var _ClusterGeoJsonLayer = class extends import_geo_layers2.TileLayer {
+  initializeState() {
+    super.initializeState();
+    this.state.aggregationCache = /* @__PURE__ */ new WeakMap();
+  }
   renderLayers() {
     var _a;
     const visibleTiles = (_a = this.state.tileset) == null ? void 0 : _a.tiles.filter((tile) => {
@@ -672,15 +676,21 @@ var _ClusterGeoJsonLayer = class extends import_geo_layers2.TileLayer {
     visibleTiles.sort((a, b) => b.zoom - a.zoom);
     const { zoom } = this.context.viewport;
     const { clusterLevel, getPosition, getWeight } = this.props;
+    const { aggregationCache } = this.state;
     const properties = extractAggregationProperties(visibleTiles[0]);
     const data = [];
     let needsUpdate = false;
     for (const tile of visibleTiles) {
       const overZoom = Math.round(zoom - tile.zoom);
       const aggregationLevels = Math.round(clusterLevel) - overZoom;
-      const didAggregate = aggregateTile(tile, aggregationLevels, properties, getPosition, getWeight);
+      let tileAggregationCache = aggregationCache.get(tile.content);
+      if (!tileAggregationCache) {
+        tileAggregationCache = /* @__PURE__ */ new Map();
+        aggregationCache.set(tile.content, tileAggregationCache);
+      }
+      const didAggregate = aggregateTile(tile, tileAggregationCache, aggregationLevels, properties, getPosition, getWeight);
       needsUpdate ||= didAggregate;
-      data.push(...tile.userData[aggregationLevels]);
+      data.push(...tileAggregationCache.get(aggregationLevels));
     }
     data.sort((a, b) => Number(b.count - a.count));
     const clusterIds = data == null ? void 0 : data.map((tile) => tile.id);
@@ -912,7 +922,7 @@ var TileReader3 = class {
 };
 
 // dist/layers/schema/carto-raster-tile-loader.js
-var VERSION2 = true ? "9.0.28" : "latest";
+var VERSION2 = true ? "9.0.30" : "latest";
 var id2 = "cartoRasterTile";
 var DEFAULT_OPTIONS2 = {
   cartoRasterTile: {
@@ -1994,7 +2004,7 @@ var carto_properties_tile_loader_default = CartoPropertiesTileLoader;
 
 // dist/layers/schema/carto-vector-tile-loader.js
 var import_earcut = __toESM(require("earcut"), 1);
-var VERSION3 = true ? "9.0.28" : "latest";
+var VERSION3 = true ? "9.0.30" : "latest";
 var id3 = "cartoVectorTile";
 var DEFAULT_OPTIONS3 = {
   cartoVectorTile: {
@@ -2413,7 +2423,7 @@ function colorContinuous({ attr, domain, colors = DEFAULT_PALETTE, nullColor = N
 var DEFAULT_API_BASE_URL = "https://gcp-us-east1.api.carto.com";
 var DEFAULT_CLIENT = "deck-gl-carto";
 var V3_MINOR_VERSION = "3.4";
-var MAX_GET_LENGTH = 8192;
+var DEFAULT_MAX_LENGTH_URL = 7e3;
 
 // dist/api/endpoints.js
 function joinPath(...args) {
@@ -2449,7 +2459,7 @@ var DEFAULT_HEADERS = {
   "Content-Type": "application/json"
 };
 var REQUEST_CACHE = /* @__PURE__ */ new Map();
-async function requestWithParameters({ baseUrl, parameters = {}, headers: customHeaders = {}, errorContext }) {
+async function requestWithParameters({ baseUrl, parameters = {}, headers: customHeaders = {}, errorContext, maxLengthURL = DEFAULT_MAX_LENGTH_URL }) {
   parameters = { ...DEFAULT_PARAMETERS, ...parameters };
   baseUrl = excludeURLParameters(baseUrl, Object.keys(parameters));
   const key = createCacheKey(baseUrl, parameters, customHeaders);
@@ -2458,7 +2468,7 @@ async function requestWithParameters({ baseUrl, parameters = {}, headers: custom
   }
   const url = createURLWithParameters(baseUrl, parameters);
   const headers = { ...DEFAULT_HEADERS, ...customHeaders };
-  const fetchPromise = url.length > MAX_GET_LENGTH ? fetch(baseUrl, { method: "POST", body: JSON.stringify(parameters), headers }) : fetch(url, { headers });
+  const fetchPromise = url.length > maxLengthURL ? fetch(baseUrl, { method: "POST", body: JSON.stringify(parameters), headers }) : fetch(url, { headers });
   let response;
   let responseJson;
   const jsonPromise = fetchPromise.then((_response) => {
@@ -2508,7 +2518,8 @@ var SOURCE_DEFAULTS = {
   apiBaseUrl: DEFAULT_API_BASE_URL,
   clientId: DEFAULT_CLIENT,
   format: "tilejson",
-  headers: {}
+  headers: {},
+  maxLengthURL: DEFAULT_MAX_LENGTH_URL
 };
 async function baseSource(endpoint, options, urlParameters) {
   const { accessToken, connectionName, cache, ...optionalOptions } = options;
@@ -2519,7 +2530,7 @@ async function baseSource(endpoint, options, urlParameters) {
     }
   }
   const baseUrl = buildSourceUrl(mergedOptions);
-  const { clientId, format } = mergedOptions;
+  const { clientId, maxLengthURL, format } = mergedOptions;
   const headers = { Authorization: `Bearer ${options.accessToken}`, ...options.headers };
   const parameters = { client: clientId, ...urlParameters };
   const errorContext = {
@@ -2532,7 +2543,8 @@ async function baseSource(endpoint, options, urlParameters) {
     baseUrl,
     parameters,
     headers,
-    errorContext
+    errorContext,
+    maxLengthURL
   });
   const dataUrl = mapInstantiation[format].url[0];
   if (cache) {
@@ -2543,7 +2555,8 @@ async function baseSource(endpoint, options, urlParameters) {
     const json = await requestWithParameters({
       baseUrl: dataUrl,
       headers,
-      errorContext
+      errorContext,
+      maxLengthURL
     });
     if (accessToken) {
       json.accessToken = accessToken;
@@ -2553,7 +2566,8 @@ async function baseSource(endpoint, options, urlParameters) {
   return await requestWithParameters({
     baseUrl: dataUrl,
     headers,
-    errorContext
+    errorContext,
+    maxLengthURL
   });
 }
 
@@ -3412,7 +3426,7 @@ async function fetchBasemapProps({ config, errorContext, applyLayerFilters = tru
 }
 
 // dist/api/fetch-map.js
-async function _fetchMapDataset(dataset, accessToken, apiBaseUrl, clientId, headers) {
+async function _fetchMapDataset(dataset, accessToken, apiBaseUrl, clientId, headers, maxLengthURL = DEFAULT_MAX_LENGTH_URL) {
   const { aggregationExp, aggregationResLevel, connectionName, columns, format, geoColumn, source, type, queryParameters } = dataset;
   const cache = {};
   const globalOptions = {
@@ -3422,7 +3436,8 @@ async function _fetchMapDataset(dataset, accessToken, apiBaseUrl, clientId, head
     clientId,
     connectionName,
     format,
-    headers
+    headers,
+    maxLengthURL
   };
   if (type === "tileset") {
     dataset.data = await vectorTilesetSource({ ...globalOptions, tableName: source });
@@ -3463,7 +3478,7 @@ async function _fetchMapDataset(dataset, accessToken, apiBaseUrl, clientId, head
   }
   return cacheChanged;
 }
-async function _fetchTilestats(attribute, dataset, accessToken, apiBaseUrl) {
+async function _fetchTilestats(attribute, dataset, accessToken, apiBaseUrl, maxLengthURL = DEFAULT_MAX_LENGTH_URL) {
   const { connectionName, data, id: id4, source, type, queryParameters } = dataset;
   const errorContext = {
     requestType: "Tile stats",
@@ -3491,18 +3506,19 @@ async function _fetchTilestats(attribute, dataset, accessToken, apiBaseUrl) {
     baseUrl,
     headers,
     parameters,
-    errorContext
+    errorContext,
+    maxLengthURL
   });
   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));
+async function fillInMapDatasets({ datasets, token }, clientId, apiBaseUrl, headers, maxLengthURL = DEFAULT_MAX_LENGTH_URL) {
+  const promises = datasets.map((dataset) => _fetchMapDataset(dataset, token, apiBaseUrl, clientId, headers, maxLengthURL));
   return await Promise.all(promises);
 }
-async function fillInTileStats({ datasets, keplerMapConfig, token }, apiBaseUrl) {
+async function fillInTileStats({ datasets, keplerMapConfig, token }, apiBaseUrl, maxLengthURL = DEFAULT_MAX_LENGTH_URL) {
   var _a;
   const attributes = [];
   const { layers } = keplerMapConfig.config.visState;
@@ -3523,12 +3539,15 @@ async function fillInTileStats({ datasets, keplerMapConfig, token }, apiBaseUrl)
       filteredAttributes.push(a);
     }
   }
-  const promises = filteredAttributes.map(({ attribute, dataset }) => _fetchTilestats(attribute, dataset, token, apiBaseUrl));
+  const promises = filteredAttributes.map(({ attribute, dataset }) => _fetchTilestats(attribute, dataset, token, apiBaseUrl, maxLengthURL));
   return await Promise.all(promises);
 }
-async function fetchMap({ apiBaseUrl = DEFAULT_API_BASE_URL, cartoMapId, clientId = DEFAULT_CLIENT, headers = {}, autoRefresh, onNewData }) {
+async function fetchMap({ accessToken, apiBaseUrl = DEFAULT_API_BASE_URL, cartoMapId, clientId = DEFAULT_CLIENT, headers = {}, autoRefresh, onNewData, maxLengthURL = DEFAULT_MAX_LENGTH_URL }) {
   assert(cartoMapId, 'Must define CARTO map id: fetchMap({cartoMapId: "XXXX-XXXX-XXXX"})');
   assert(apiBaseUrl, "Must define apiBaseUrl");
+  if (accessToken) {
+    headers = { Authorization: `Bearer ${accessToken}`, ...headers };
+  }
   if (autoRefresh || onNewData) {
     assert(onNewData, "Must define `onNewData` when using autoRefresh");
     assert(typeof onNewData === "function", "`onNewData` must be a function");
@@ -3536,14 +3555,14 @@ async function fetchMap({ apiBaseUrl = DEFAULT_API_BASE_URL, cartoMapId, clientI
   }
   const baseUrl = buildPublicMapUrl({ apiBaseUrl, cartoMapId });
   const errorContext = { requestType: "Public map", mapId: cartoMapId };
-  const map = await requestWithParameters({ baseUrl, headers, errorContext });
+  const map = await requestWithParameters({ baseUrl, headers, errorContext, maxLengthURL });
   let stopAutoRefresh;
   if (autoRefresh) {
     const intervalId = setInterval(async () => {
       const changed = await fillInMapDatasets(map, clientId, apiBaseUrl, {
         ...headers,
         "If-Modified-Since": new Date().toUTCString()
-      });
+      }, maxLengthURL);
       if (onNewData && changed.some((v) => v === true)) {
         onNewData(parseMap(map));
       }
@@ -3565,9 +3584,9 @@ async function fetchMap({ apiBaseUrl = DEFAULT_API_BASE_URL, cartoMapId, clientI
   });
   const [basemap] = await Promise.all([
     fetchBasemapProps({ config: map.keplerMapConfig.config, errorContext }),
-    fillInMapDatasets(map, clientId, apiBaseUrl, headers)
+    fillInMapDatasets(map, clientId, apiBaseUrl, headers, maxLengthURL)
   ]);
-  await fillInTileStats(map, apiBaseUrl);
+  await fillInTileStats(map, apiBaseUrl, maxLengthURL);
   const out = { ...parseMap(map), basemap, ...{ stopAutoRefresh } };
   const textLayers = out.layers.filter((layer) => {
     const pointType = layer.props.pointType || "";
@@ -3582,7 +3601,7 @@ async function fetchMap({ apiBaseUrl = DEFAULT_API_BASE_URL, cartoMapId, clientI
 
 // dist/api/query.js
 var query = async function(options) {
-  const { apiBaseUrl = SOURCE_DEFAULTS.apiBaseUrl, clientId = SOURCE_DEFAULTS.clientId, connectionName, sqlQuery, queryParameters } = options;
+  const { apiBaseUrl = SOURCE_DEFAULTS.apiBaseUrl, clientId = SOURCE_DEFAULTS.clientId, maxLengthURL = SOURCE_DEFAULTS.maxLengthURL, connectionName, sqlQuery, queryParameters } = options;
   const urlParameters = { q: sqlQuery };
   if (queryParameters) {
     urlParameters.queryParameters = JSON.stringify(queryParameters);
@@ -3600,7 +3619,8 @@ var query = async function(options) {
     baseUrl,
     parameters,
     headers,
-    errorContext
+    errorContext,
+    maxLengthURL
   });
 };