@deck.gl/carto 9.0.0-beta.8 → 9.0.0

package/dist/index.cjs

@@ -183,14 +183,12 @@ var BandReader = class {
 };
 var TileReader = class {
   static read(pbf, end) {
-    return pbf.readFields(TileReader._readField, { blockWidth: 0, blockHeight: 0, bands: [] }, end);
+    return pbf.readFields(TileReader._readField, { blockSize: 0, bands: [] }, end);
   }
   static _readField(tag, obj, pbf) {
     if (tag === 1)
-      obj.blockWidth = pbf.readVarint();
+      obj.blockSize = pbf.readVarint();
     else if (tag === 2)
-      obj.blockHeight = pbf.readVarint();
-    else if (tag === 3)
       obj.bands.push(BandReader.read(pbf, pbf.readVarint() + pbf.pos));
   }
 };
@@ -238,12 +236,16 @@ function scaleIdentity() {
     }
     return unknown;
   };
-  scale.copy = () => scaleIdentity().unknown(unknown);
+  scale.copy = () => {
+    const scaleCopy = scaleIdentity();
+    scaleCopy.unknown(unknown);
+    return scaleCopy;
+  };
   return scale;
 }
 
 // dist/layers/schema/carto-raster-tile-loader.js
-var VERSION = true ? "9.0.0-beta.7" : "latest";
+var VERSION = true ? "9.0.0-beta.10" : "latest";
 var id = "cartoRasterTile";
 var DEFAULT_OPTIONS = {
   cartoRasterTile: {
@@ -266,14 +268,13 @@ var CartoRasterTileLoader = {
 function parseCartoRasterTile(arrayBuffer, options) {
   if (!arrayBuffer)
     return null;
-  const tile = parsePbf(arrayBuffer, TileReader);
-  const { bands, blockHeight, blockWidth } = tile;
+  const { bands, blockSize } = parsePbf(arrayBuffer, TileReader);
   const numericProps = {};
   for (let i = 0; i < bands.length; i++) {
     const { name, data } = bands[i];
     numericProps[name] = data;
   }
-  return { blockWidth, blockHeight, cells: { numericProps, properties: [] } };
+  return { blockSize, cells: { numericProps, properties: [] } };
 }
 var carto_raster_tile_loader_default = CartoRasterTileLoader;
 
@@ -515,7 +516,7 @@ function binaryToSpatialjson(binary) {
 }
 
 // dist/layers/schema/carto-spatial-tile-loader.js
-var VERSION2 = true ? "9.0.0-beta.7" : "latest";
+var VERSION2 = true ? "9.0.0-beta.10" : "latest";
 var id2 = "cartoSpatialTile";
 var DEFAULT_OPTIONS2 = {
   cartoSpatialTile: {
@@ -550,11 +551,21 @@ var carto_spatial_tile_loader_default = CartoSpatialTileLoader;
 
 // dist/layers/spatial-index-tile-layer.js
 var import_geo_layers2 = require("@deck.gl/geo-layers");
+
+// dist/constants.js
+var DEFAULT_TILE_SIZE = 512;
+var DEFAULT_TILE_RESOLUTION = 0.5;
+var DEFAULT_AGGREGATION_RES_LEVEL_H3 = 4;
+var DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN = 6;
+
+// dist/layers/spatial-index-tile-layer.js
 (0, import_core2.registerLoaders)([carto_raster_tile_loader_default, carto_spatial_tile_loader_default]);
 function isFeatureIdDefined(value) {
   return value !== void 0 && value !== null && value !== "";
 }
-var defaultProps = {};
+var defaultProps = {
+  tileSize: DEFAULT_TILE_SIZE
+};
 var _SpatialIndexTileLayer = class extends import_geo_layers2.TileLayer {
   _updateAutoHighlight(info) {
     const { hoveredFeatureId } = this.state;
@@ -689,7 +700,8 @@ var renderSubLayers = (props) => {
   });
 };
 var defaultProps2 = {
-  data: TilejsonPropType
+  data: TilejsonPropType,
+  tileSize: DEFAULT_TILE_SIZE
 };
 var _H3TileLayer = class extends import_core5.CompositeLayer {
   initializeState() {
@@ -966,7 +978,8 @@ var renderSubLayers2 = (props) => {
   });
 };
 var defaultProps5 = {
-  data: TilejsonPropType
+  data: TilejsonPropType,
+  tileSize: DEFAULT_TILE_SIZE
 };
 var _QuadbinTileLayer = class extends import_core7.CompositeLayer {
   getLoadOptions() {
@@ -1093,7 +1106,7 @@ var _RasterColumnLayer = class extends import_layers2.ColumnLayer {
   getShaders() {
     const shaders = super.getShaders();
     const data = this.props.data;
-    const BLOCK_WIDTH = data.blockWidth || Math.sqrt(data.length);
+    const BLOCK_WIDTH = data.data.blockSize ?? Math.sqrt(data.length);
     return { ...shaders, defines: { ...shaders.defines, BLOCK_WIDTH }, vs: raster_layer_vertex_glsl_default };
   }
   initializeState() {
@@ -1130,10 +1143,9 @@ var _RasterLayer = class extends import_core8.CompositeLayer {
     const { data, getElevation, getFillColor, getLineColor, getLineWidth, tileIndex, updateTriggers } = this.props;
     if (!data || !tileIndex)
       return null;
-    const { blockWidth, blockHeight } = data;
-    assert(blockWidth === blockHeight, `blockWidth (${blockWidth}) must equal blockHeight (${blockHeight})`);
+    const blockSize = data.blockSize ?? 0;
     const [xOffset, yOffset, scale] = quadbinToOffset(tileIndex);
-    const offset = [xOffset, yOffset, scale / blockWidth];
+    const offset = [xOffset, yOffset, scale / blockSize];
     const CellLayer = this.getSubLayerClass("column", RasterColumnLayer);
     return new CellLayer(this.props, this.getSubLayerProps({
       id: "cell",
@@ -1145,7 +1157,7 @@ var _RasterLayer = class extends import_core8.CompositeLayer {
     }), {
       data: {
         data,
-        length: blockWidth * blockHeight
+        length: blockSize * blockSize
       },
       offset
     });
@@ -1179,7 +1191,8 @@ var renderSubLayers3 = (props) => {
   return new RasterLayer(props, { tileIndex });
 };
 var defaultProps7 = {
-  data: TilejsonPropType
+  data: TilejsonPropType,
+  tileSize: DEFAULT_TILE_SIZE
 };
 var _RasterTileLayer = class extends import_core9.CompositeLayer {
   getLoadOptions() {
@@ -1255,7 +1268,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.0-beta.7" : "latest";
+var VERSION3 = true ? "9.0.0-beta.10" : "latest";
 var id3 = "cartoVectorTile";
 var DEFAULT_OPTIONS3 = {
   cartoVectorTile: {
@@ -1320,7 +1333,8 @@ var import_gis = require("@loaders.gl/gis");
 var defaultProps8 = {
   ...import_geo_layers6.MVTLayer.defaultProps,
   data: TilejsonPropType,
-  dataComparator: TilejsonPropType.equal
+  dataComparator: TilejsonPropType.equal,
+  tileSize: DEFAULT_TILE_SIZE
 };
 var _VectorTileLayer = class extends import_geo_layers6.MVTLayer {
   constructor(...propObjects) {
@@ -1573,7 +1587,7 @@ function formatErrorKey(key) {
 // dist/api/common.js
 var DEFAULT_API_BASE_URL = "https://gcp-us-east1.api.carto.com";
 var DEFAULT_CLIENT = "deck-gl-carto";
-var V3_MINOR_VERSION = "3.3";
+var V3_MINOR_VERSION = "3.4";
 var MAX_GET_LENGTH = 8192;
 var DEFAULT_PARAMETERS = {
   v: V3_MINOR_VERSION
@@ -1612,44 +1626,42 @@ function encodeParameter(name, value) {
 }
 var REQUEST_CACHE = /* @__PURE__ */ new Map();
 async function requestWithParameters({ accessToken, baseUrl: baseUrl2, parameters, headers: customHeaders, errorContext }) {
-  const key = JSON.stringify({ baseUrl: baseUrl2, parameters, customHeaders });
+  const key = createCacheKey(baseUrl2, parameters || {}, customHeaders || {});
   if (REQUEST_CACHE.has(key)) {
     return REQUEST_CACHE.get(key);
   }
-  let url = baseUrl2;
-  if (parameters) {
-    const allParameters = { ...DEFAULT_PARAMETERS, ...parameters };
-    const encodedParameters = Object.entries(allParameters).map(([key2, value]) => {
-      return encodeParameter(key2, value);
-    });
-    url += `?${encodedParameters.join("&")}`;
-  }
+  const url = parameters ? createURLWithParameters(baseUrl2, parameters) : baseUrl2;
   const headers = { ...DEFAULT_HEADERS, ...customHeaders };
-  try {
-    let response;
-    if (url.length > MAX_GET_LENGTH) {
-      response = await fetch(baseUrl2, { method: "POST", body: JSON.stringify(parameters), headers });
-    } else {
-      response = await fetch(url, { headers });
-    }
-    let json;
-    try {
-      json = await response.json();
-      if (accessToken) {
-        json.accessToken = accessToken;
-      }
-    } catch {
-      json = { error: "" };
+  const fetchPromise = url.length > MAX_GET_LENGTH ? fetch(baseUrl2, { method: "POST", body: JSON.stringify(parameters), headers }) : fetch(url, { headers });
+  let response;
+  const jsonPromise = fetchPromise.then((_response) => {
+    response = _response;
+    return response.json();
+  }).then((json) => {
+    if (!response || !response.ok) {
+      throw new Error(json.error);
     }
-    if (!response.ok) {
-      REQUEST_CACHE.delete(key);
-      throw new CartoAPIError(json.error, errorContext, response);
+    if (accessToken) {
+      json.accessToken = accessToken;
     }
-    REQUEST_CACHE.set(key, json);
     return json;
-  } catch (error) {
-    throw new CartoAPIError(error, errorContext);
-  }
+  }).catch((error) => {
+    REQUEST_CACHE.delete(key);
+    throw new CartoAPIError(error, errorContext, response);
+  });
+  REQUEST_CACHE.set(key, jsonPromise);
+  return jsonPromise;
+}
+function createCacheKey(baseUrl2, parameters, headers) {
+  const parameterEntries = Object.entries(parameters).sort(([a], [b]) => a > b ? 1 : -1);
+  const headerEntries = Object.entries(headers).sort(([a], [b]) => a > b ? 1 : -1);
+  return JSON.stringify({ baseUrl: baseUrl2, parameters: parameterEntries, headers: headerEntries });
+}
+function createURLWithParameters(baseUrl2, parameters) {
+  const encodedParameters = Object.entries({ ...DEFAULT_PARAMETERS, ...parameters }).map(([key, value]) => {
+    return encodeParameter(key, value);
+  });
+  return `${baseUrl2}?${encodedParameters.join("&")}`;
 }
 
 // dist/sources/base-source.js
@@ -1742,7 +1754,7 @@ var boundaryTableSource = async function(options) {
 
 // dist/sources/h3-query-source.js
 var h3QuerySource = async function(options) {
-  const { aggregationExp, aggregationResLevel = 4, sqlQuery, spatialDataColumn = "h3", queryParameters } = options;
+  const { aggregationExp, aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_H3, sqlQuery, spatialDataColumn = "h3", queryParameters } = options;
   const urlParameters = {
     aggregationExp,
     spatialDataColumn,
@@ -1760,7 +1772,7 @@ var h3QuerySource = async function(options) {
 
 // dist/sources/h3-table-source.js
 var h3TableSource = async function(options) {
-  const { aggregationExp, aggregationResLevel = 4, columns, spatialDataColumn = "h3", tableName } = options;
+  const { aggregationExp, aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_H3, spatialDataColumn = "h3", tableName } = options;
   const urlParameters = {
     aggregationExp,
     name: tableName,
@@ -1770,9 +1782,6 @@ var h3TableSource = async function(options) {
   if (aggregationResLevel) {
     urlParameters.aggregationResLevel = String(aggregationResLevel);
   }
-  if (columns) {
-    urlParameters.columns = columns.join(",");
-  }
   return baseSource("table", options, urlParameters);
 };
 
@@ -1792,7 +1801,7 @@ var rasterSource = async function(options) {
 
 // dist/sources/quadbin-query-source.js
 var quadbinQuerySource = async function(options) {
-  const { aggregationExp, aggregationResLevel = 6, sqlQuery, spatialDataColumn = "quadbin", queryParameters } = options;
+  const { aggregationExp, aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN, sqlQuery, spatialDataColumn = "quadbin", queryParameters } = options;
   const urlParameters = {
     aggregationExp,
     q: sqlQuery,
@@ -1810,7 +1819,7 @@ var quadbinQuerySource = async function(options) {
 
 // dist/sources/quadbin-table-source.js
 var quadbinTableSource = async function(options) {
-  const { aggregationExp, aggregationResLevel = 6, columns, spatialDataColumn = "quadbin", tableName } = options;
+  const { aggregationExp, aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN, spatialDataColumn = "quadbin", tableName } = options;
   const urlParameters = {
     aggregationExp,
     name: tableName,
@@ -1820,9 +1829,6 @@ var quadbinTableSource = async function(options) {
   if (aggregationResLevel) {
     urlParameters.aggregationResLevel = String(aggregationResLevel);
   }
-  if (columns) {
-    urlParameters.columns = columns.join(",");
-  }
   return baseSource("table", options, urlParameters);
 };
 
@@ -1835,8 +1841,13 @@ var quadbinTilesetSource = async function(options) {
 
 // dist/sources/vector-query-source.js
 var vectorQuerySource = async function(options) {
-  const { columns, filters, spatialDataColumn = "geom", sqlQuery, queryParameters } = options;
-  const urlParameters = { spatialDataColumn, spatialDataType: "geo", q: sqlQuery };
+  const { columns, filters, spatialDataColumn = "geom", sqlQuery, tileResolution = DEFAULT_TILE_RESOLUTION, queryParameters } = options;
+  const urlParameters = {
+    spatialDataColumn,
+    spatialDataType: "geo",
+    tileResolution: tileResolution.toString(),
+    q: sqlQuery
+  };
   if (columns) {
     urlParameters.columns = columns.join(",");
   }
@@ -1851,8 +1862,13 @@ var vectorQuerySource = async function(options) {
 
 // dist/sources/vector-table-source.js
 var vectorTableSource = async function(options) {
-  const { columns, filters, spatialDataColumn = "geom", tableName } = options;
-  const urlParameters = { name: tableName, spatialDataColumn, spatialDataType: "geo" };
+  const { columns, filters, spatialDataColumn = "geom", tableName, tileResolution = DEFAULT_TILE_RESOLUTION } = options;
+  const urlParameters = {
+    name: tableName,
+    spatialDataColumn,
+    spatialDataType: "geo",
+    tileResolution: tileResolution.toString()
+  };
   if (columns) {
     urlParameters.columns = columns.join(",");
   }
@@ -1870,7 +1886,7 @@ var vectorTilesetSource = async function(options) {
 };
 
 // dist/api/parse-map.js
-var import_constants = require("@luma.gl/constants");
+var import_constants12 = require("@luma.gl/constants");
 var import_core11 = require("@deck.gl/core");
 
 // dist/api/layer-map.js
@@ -2492,19 +2508,24 @@ async function _fetchMapDataset(dataset, accessToken, apiBaseUrl, clientId, head
       if (type === "table") {
         dataset.data = await vectorTableSource({ ...options, columns, tableName: source });
       } else if (type === "query") {
-        dataset.data = await vectorQuerySource({ ...options, sqlQuery: source, queryParameters });
+        dataset.data = await vectorQuerySource({
+          ...options,
+          columns,
+          sqlQuery: source,
+          queryParameters
+        });
       }
     } else if (spatialDataType === "h3") {
       const options = { ...globalOptions, aggregationExp, aggregationResLevel, spatialDataColumn };
       if (type === "table") {
-        dataset.data = await h3TableSource({ ...options, columns, tableName: source });
+        dataset.data = await h3TableSource({ ...options, 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 });
+        dataset.data = await quadbinTableSource({ ...options, tableName: source });
       } else if (type === "query") {
         dataset.data = await quadbinQuerySource({ ...options, sqlQuery: source, queryParameters });
       }