@deck.gl/carto 9.0.0-beta.7 → 9.0.0-beta.9

package/dist/dist.dev.js

@@ -9267,14 +9267,12 @@ var __exports__ = (() => {
   };
   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));
     }
   };
@@ -9322,7 +9320,11 @@ var __exports__ = (() => {
       }
       return unknown;
     };
-    scale.copy = () => scaleIdentity().unknown(unknown);
+    scale.copy = () => {
+      const scaleCopy = scaleIdentity();
+      scaleCopy.unknown(unknown);
+      return scaleCopy;
+    };
     return scale;
   }
 
@@ -9350,14 +9352,13 @@ var __exports__ = (() => {
   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;
 
@@ -9710,11 +9711,21 @@ var __exports__ = (() => {
 
   // src/layers/spatial-index-tile-layer.ts
   var import_geo_layers2 = __toESM(require_geo_layers(), 1);
+
+  // src/constants.ts
+  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;
+
+  // src/layers/spatial-index-tile-layer.ts
   (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;
@@ -9843,7 +9854,8 @@ var __exports__ = (() => {
     });
   };
   var defaultProps2 = {
-    data: TilejsonPropType
+    data: TilejsonPropType,
+    tileSize: DEFAULT_TILE_SIZE
   };
   var H3TileLayer = class extends import_core5.CompositeLayer {
     initializeState() {
@@ -10154,7 +10166,8 @@ var __exports__ = (() => {
     });
   };
   var defaultProps5 = {
-    data: TilejsonPropType
+    data: TilejsonPropType,
+    tileSize: DEFAULT_TILE_SIZE
   };
   var QuadbinTileLayer = class extends import_core7.CompositeLayer {
     getLoadOptions() {
@@ -10306,7 +10319,7 @@ void main(void) {
     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() {
@@ -10348,13 +10361,9 @@ void main(void) {
       } = 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,
@@ -10369,7 +10378,7 @@ void main(void) {
         {
           data: {
             data,
-            length: blockWidth * blockHeight
+            length: blockSize * blockSize
           },
           offset
         }
@@ -10398,7 +10407,8 @@ void main(void) {
     return new RasterLayer(props, { tileIndex });
   };
   var defaultProps7 = {
-    data: TilejsonPropType
+    data: TilejsonPropType,
+    tileSize: DEFAULT_TILE_SIZE
   };
   var RasterTileLayer = class extends import_core9.CompositeLayer {
     getLoadOptions() {
@@ -10536,11 +10546,11 @@ void main(void) {
 
   // ../../node_modules/@loaders.gl/gis/dist/lib/binary-features/binary-to-geojson.js
   function binaryToGeojson(data, options) {
-    const globalFeatureId = options === null || options === void 0 ? void 0 : options.globalFeatureId;
+    const globalFeatureId = options?.globalFeatureId;
     if (globalFeatureId !== void 0) {
       return getSingleFeature(data, globalFeatureId);
     }
-    return parseFeatures(data, options === null || options === void 0 ? void 0 : options.type);
+    return parseFeatures(data, options?.type);
   }
   function getSingleFeature(data, globalFeatureId) {
     const dataArray = normalizeInput(data);
@@ -10578,7 +10588,7 @@ void main(void) {
         return polygonToGeoJson(data, startIndex, endIndex);
       default:
         const unexpectedInput = data;
-        throw new Error(`Unsupported geometry type: ${unexpectedInput === null || unexpectedInput === void 0 ? void 0 : unexpectedInput.type}`);
+        throw new Error(`Unsupported geometry type: ${unexpectedInput?.type}`);
     }
   }
   function normalizeInput(data, type) {
@@ -10622,33 +10632,20 @@ void main(void) {
     const geometry = binaryToGeometry(data, startIndex, endIndex);
     const properties = parseProperties(data, startIndex, endIndex);
     const fields = parseFields(data, startIndex, endIndex);
-    return {
-      type: "Feature",
-      geometry,
-      properties,
-      ...fields
-    };
+    return { type: "Feature", geometry, properties, ...fields };
   }
-  function parseFields(data) {
-    let startIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0;
-    let endIndex = arguments.length > 2 ? arguments[2] : void 0;
+  function parseFields(data, startIndex = 0, endIndex) {
     return data.fields && data.fields[data.featureIds.value[startIndex]];
   }
-  function parseProperties(data) {
-    let startIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0;
-    let endIndex = arguments.length > 2 ? arguments[2] : void 0;
+  function parseProperties(data, startIndex = 0, endIndex) {
     const properties = Object.assign({}, data.properties[data.featureIds.value[startIndex]]);
     for (const key in data.numericProps) {
       properties[key] = data.numericProps[key].value[startIndex];
     }
     return properties;
   }
-  function polygonToGeoJson(data) {
-    let startIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : -Infinity;
-    let endIndex = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : Infinity;
-    const {
-      positions
-    } = data;
+  function polygonToGeoJson(data, startIndex = -Infinity, endIndex = Infinity) {
+    const { positions } = data;
     const polygonIndices = data.polygonIndices.value.filter((x) => x >= startIndex && x <= endIndex);
     const primitivePolygonIndices = data.primitivePolygonIndices.value.filter((x) => x >= startIndex && x <= endIndex);
     const multi = polygonIndices.length > 2;
@@ -10660,10 +10657,7 @@ void main(void) {
         const ringCoordinates = ringToGeoJson(positions, startRingIndex, endRingIndex);
         coordinates2.push(ringCoordinates);
       }
-      return {
-        type: "Polygon",
-        coordinates: coordinates2
-      };
+      return { type: "Polygon", coordinates: coordinates2 };
     }
     const coordinates = [];
     for (let i = 0; i < polygonIndices.length - 1; i++) {
@@ -10672,52 +10666,31 @@ void main(void) {
       const polygonCoordinates = polygonToGeoJson(data, startPolygonIndex, endPolygonIndex).coordinates;
       coordinates.push(polygonCoordinates);
     }
-    return {
-      type: "MultiPolygon",
-      coordinates
-    };
+    return { type: "MultiPolygon", coordinates };
   }
-  function lineStringToGeoJson(data) {
-    let startIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : -Infinity;
-    let endIndex = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : Infinity;
-    const {
-      positions
-    } = data;
+  function lineStringToGeoJson(data, startIndex = -Infinity, endIndex = Infinity) {
+    const { positions } = data;
     const pathIndices = data.pathIndices.value.filter((x) => x >= startIndex && x <= endIndex);
     const multi = pathIndices.length > 2;
     if (!multi) {
       const coordinates2 = ringToGeoJson(positions, pathIndices[0], pathIndices[1]);
-      return {
-        type: "LineString",
-        coordinates: coordinates2
-      };
+      return { type: "LineString", coordinates: coordinates2 };
     }
     const coordinates = [];
     for (let i = 0; i < pathIndices.length - 1; i++) {
       const ringCoordinates = ringToGeoJson(positions, pathIndices[i], pathIndices[i + 1]);
       coordinates.push(ringCoordinates);
     }
-    return {
-      type: "MultiLineString",
-      coordinates
-    };
+    return { type: "MultiLineString", coordinates };
   }
   function pointToGeoJson(data, startIndex, endIndex) {
-    const {
-      positions
-    } = data;
+    const { positions } = data;
     const coordinates = ringToGeoJson(positions, startIndex, endIndex);
     const multi = coordinates.length > 1;
     if (multi) {
-      return {
-        type: "MultiPoint",
-        coordinates
-      };
+      return { type: "MultiPoint", coordinates };
     }
-    return {
-      type: "Point",
-      coordinates: coordinates[0]
-    };
+    return { type: "Point", coordinates: coordinates[0] };
   }
   function ringToGeoJson(positions, startIndex, endIndex) {
     startIndex = startIndex || 0;
@@ -10738,7 +10711,8 @@ void main(void) {
   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) {
@@ -12875,7 +12849,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   // src/api/common.ts
   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
@@ -12936,16 +12910,17 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     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);
-      });
+      const encodedParameters = Object.entries({ ...DEFAULT_PARAMETERS, ...parameters }).map(
+        ([key2, value]) => {
+          return encodeParameter(key2, value);
+        }
+      );
       url += `?${encodedParameters.join("&")}`;
     }
     const headers = { ...DEFAULT_HEADERS, ...customHeaders };
@@ -12975,6 +12950,11 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
       throw new CartoAPIError(error, errorContext);
     }
   }
+  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 });
+  }
 
   // src/sources/base-source.ts
   var SOURCE_DEFAULTS = {
@@ -13075,7 +13055,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   var h3QuerySource = async function(options) {
     const {
       aggregationExp,
-      aggregationResLevel = 4,
+      aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_H3,
       sqlQuery,
       spatialDataColumn = "h3",
       queryParameters
@@ -13099,8 +13079,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   var h3TableSource = async function(options) {
     const {
       aggregationExp,
-      aggregationResLevel = 4,
-      columns,
+      aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_H3,
       spatialDataColumn = "h3",
       tableName
     } = options;
@@ -13113,9 +13092,6 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     if (aggregationResLevel) {
       urlParameters.aggregationResLevel = String(aggregationResLevel);
     }
-    if (columns) {
-      urlParameters.columns = columns.join(",");
-    }
     return baseSource("table", options, urlParameters);
   };
 
@@ -13137,7 +13113,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   var quadbinQuerySource = async function(options) {
     const {
       aggregationExp,
-      aggregationResLevel = 6,
+      aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN,
       sqlQuery,
       spatialDataColumn = "quadbin",
       queryParameters
@@ -13161,8 +13137,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   var quadbinTableSource = async function(options) {
     const {
       aggregationExp,
-      aggregationResLevel = 6,
-      columns,
+      aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN,
       spatialDataColumn = "quadbin",
       tableName
     } = options;
@@ -13175,9 +13150,6 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     if (aggregationResLevel) {
       urlParameters.aggregationResLevel = String(aggregationResLevel);
     }
-    if (columns) {
-      urlParameters.columns = columns.join(",");
-    }
     return baseSource("table", options, urlParameters);
   };
 
@@ -13190,8 +13162,20 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
 
   // src/sources/vector-query-source.ts
   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(",");
     }
@@ -13206,8 +13190,19 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
 
   // src/sources/vector-table-source.ts
   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(",");
     }
@@ -14530,19 +14525,24 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
         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 });
         }