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

package/dist/api/common.d.ts

@@ -1,6 +1,6 @@
 export declare const DEFAULT_API_BASE_URL = "https://gcp-us-east1.api.carto.com";
 export declare const DEFAULT_CLIENT = "deck-gl-carto";
-export declare const V3_MINOR_VERSION = "3.3";
+export declare const V3_MINOR_VERSION = "3.4";
 export declare const MAX_GET_LENGTH = 8192;
 export declare const DEFAULT_PARAMETERS: {
     v: string;

package/dist/api/common.js

@@ -1,6 +1,6 @@
 export const DEFAULT_API_BASE_URL = 'https://gcp-us-east1.api.carto.com';
 export const DEFAULT_CLIENT = 'deck-gl-carto';
-export const V3_MINOR_VERSION = '3.3';
+export const V3_MINOR_VERSION = '3.4';
 export const MAX_GET_LENGTH = 8192;
 export const DEFAULT_PARAMETERS = {
     v: V3_MINOR_VERSION

package/dist/api/fetch-map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-map.d.ts","sourceRoot":"","sources":["../../src/api/fetch-map.ts"],"names":[],"mappings":"AAyMA,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;CAChC,CAAC;AAGF,wBAAsB,QAAQ,CAAC,EAC7B,UAAiC,EACjC,UAAU,EACV,QAAyB,EACzB,OAAY,EACZ,WAAW,EACX,SAAS,EACV,EAAE,eAAe;4BAmBY,IAAI;;;;;;;;;;GAuDjC"}
+{"version":3,"file":"fetch-map.d.ts","sourceRoot":"","sources":["../../src/api/fetch-map.ts"],"names":[],"mappings":"AA8MA,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;CAChC,CAAC;AAGF,wBAAsB,QAAQ,CAAC,EAC7B,UAAiC,EACjC,UAAU,EACV,QAAyB,EACzB,OAAY,EACZ,WAAW,EACX,SAAS,EACV,EAAE,eAAe;4BAmBY,IAAI;;;;;;;;;;GAuDjC"}

package/dist/api/fetch-map.js

@@ -36,13 +36,18 @@ async function _fetchMapDataset(dataset, accessToken, apiBaseUrl, clientId, head
                 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 });
@@ -51,7 +56,7 @@ async function _fetchMapDataset(dataset, accessToken, apiBaseUrl, clientId, head
         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 });

package/dist/api/request-with-parameters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request-with-parameters.d.ts","sourceRoot":"","sources":["../../src/api/request-with-parameters.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,eAAe,EAAC,mBAAgB;AAU7C,wBAAsB,qBAAqB,CAAC,CAAC,GAAG,GAAG,EAAE,EACnD,WAAW,EACX,OAAO,EACP,UAAU,EACV,OAAO,EAAE,aAAa,EACtB,YAAY,EACb,EAAE;IACD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,YAAY,EAAE,eAAe,CAAC;CAC/B,GAAG,OAAO,CAAC,CAAC,CAAC,CA2Cb"}
+{"version":3,"file":"request-with-parameters.d.ts","sourceRoot":"","sources":["../../src/api/request-with-parameters.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,eAAe,EAAC,mBAAgB;AAU7C,wBAAsB,qBAAqB,CAAC,CAAC,GAAG,GAAG,EAAE,EACnD,WAAW,EACX,OAAO,EACP,UAAU,EACV,OAAO,EAAE,aAAa,EACtB,YAAY,EACb,EAAE;IACD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,YAAY,EAAE,eAAe,CAAC;CAC/B,GAAG,OAAO,CAAC,CAAC,CAAC,CA4Cb"}

package/dist/api/request-with-parameters.js

@@ -8,14 +8,13 @@ function encodeParameter(name, value) {
 }
 const REQUEST_CACHE = new Map();
 export async function requestWithParameters({ accessToken, baseUrl, parameters, headers: customHeaders, errorContext }) {
-    const key = JSON.stringify({ baseUrl, parameters, customHeaders });
+    const key = createCacheKey(baseUrl, parameters || {}, customHeaders || {});
     if (REQUEST_CACHE.has(key)) {
         return REQUEST_CACHE.get(key);
     }
     let url = baseUrl;
     if (parameters) {
-        const allParameters = { ...DEFAULT_PARAMETERS, ...parameters };
-        const encodedParameters = Object.entries(allParameters).map(([key, value]) => {
+        const encodedParameters = Object.entries({ ...DEFAULT_PARAMETERS, ...parameters }).map(([key, value]) => {
             return encodeParameter(key, value);
         });
         url += `?${encodedParameters.join('&')}`;
@@ -51,3 +50,8 @@ export async function requestWithParameters({ accessToken, baseUrl, parameters,
         throw new CartoAPIError(error, errorContext);
     }
 }
+function createCacheKey(baseUrl, 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, parameters: parameterEntries, headers: headerEntries });
+}

package/dist/cartoRasterTile-worker.js

@@ -982,14 +982,12 @@
   };
   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));
     }
   };
@@ -1008,7 +1006,7 @@
   }
 
   // src/layers/schema/carto-raster-tile-loader.ts
-  var VERSION = true ? "9.0.0-beta.8" : "latest";
+  var VERSION = true ? "9.0.0-beta.9" : "latest";
   var id = "cartoRasterTile";
   var DEFAULT_OPTIONS = {
     cartoRasterTile: {
@@ -1031,14 +1029,13 @@
   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;
 

package/dist/cartoSpatialTile-worker.js

@@ -1395,7 +1395,7 @@
   }
 
   // src/layers/schema/carto-spatial-tile-loader.ts
-  var VERSION = true ? "9.0.0-beta.8" : "latest";
+  var VERSION = true ? "9.0.0-beta.9" : "latest";
   var id = "cartoSpatialTile";
   var DEFAULT_OPTIONS = {
     cartoSpatialTile: {

package/dist/cartoVectorTile-worker.js

@@ -1623,7 +1623,7 @@
   }
 
   // src/layers/schema/carto-vector-tile-loader.ts
-  var VERSION = true ? "9.0.0-beta.8" : "latest";
+  var VERSION = true ? "9.0.0-beta.9" : "latest";
   var id = "cartoVectorTile";
   var DEFAULT_OPTIONS = {
     cartoVectorTile: {

package/dist/constants.d.ts

@@ -0,0 +1,5 @@
+export declare const DEFAULT_TILE_SIZE = 512;
+export declare const DEFAULT_TILE_RESOLUTION = 0.5;
+export declare const DEFAULT_AGGREGATION_RES_LEVEL_H3 = 4;
+export declare const DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN = 6;
+//# sourceMappingURL=constants.d.ts.map

package/dist/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB,MAAM,CAAC;AACrC,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAE3C,eAAO,MAAM,gCAAgC,IAAI,CAAC;AAClD,eAAO,MAAM,qCAAqC,IAAI,CAAC"}

package/dist/constants.js

@@ -0,0 +1,4 @@
+export const DEFAULT_TILE_SIZE = 512;
+export const DEFAULT_TILE_RESOLUTION = 0.5;
+export const DEFAULT_AGGREGATION_RES_LEVEL_H3 = 4;
+export const DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN = 6;

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() {
@@ -10701,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) {
@@ -12838,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
@@ -12899,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 };
@@ -12938,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 = {
@@ -13038,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
@@ -13062,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;
@@ -13076,9 +13092,6 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     if (aggregationResLevel) {
       urlParameters.aggregationResLevel = String(aggregationResLevel);
     }
-    if (columns) {
-      urlParameters.columns = columns.join(",");
-    }
     return baseSource("table", options, urlParameters);
   };
 
@@ -13100,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
@@ -13124,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;
@@ -13138,9 +13150,6 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     if (aggregationResLevel) {
       urlParameters.aggregationResLevel = String(aggregationResLevel);
     }
-    if (columns) {
-      urlParameters.columns = columns.join(",");
-    }
     return baseSource("table", options, urlParameters);
   };
 
@@ -13153,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(",");
     }
@@ -13169,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(",");
     }
@@ -14493,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 });
         }