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

package/src/sources/vector-query-source.ts

@@ -1,23 +1,26 @@
 /* eslint-disable camelcase */
+import {DEFAULT_TILE_RESOLUTION} from '../constants';
 import {baseSource} from './base-source';
 import type {
   FilterOptions,
   SourceOptions,
   QuerySourceOptions,
   SpatialDataType,
-  TilejsonResult
+  TilejsonResult,
+  ColumnsOption
 } from './types';
 
 export type VectorQuerySourceOptions = SourceOptions &
   QuerySourceOptions &
-  FilterOptions & {
-    columns?: string[];
-  };
+  FilterOptions &
+  ColumnsOption;
+
 type UrlParameters = {
   columns?: string;
   filters?: string;
   spatialDataType: SpatialDataType;
   spatialDataColumn?: string;
+  tileResolution?: string;
   q: string;
   queryParameters?: string;
 };
@@ -25,8 +28,21 @@ type UrlParameters = {
 export const vectorQuerySource = async function (
   options: VectorQuerySourceOptions
 ): Promise<TilejsonResult> {
-  const {columns, filters, spatialDataColumn = 'geom', sqlQuery, queryParameters} = options;
-  const urlParameters: UrlParameters = {spatialDataColumn, spatialDataType: 'geo', q: sqlQuery};
+  const {
+    columns,
+    filters,
+    spatialDataColumn = 'geom',
+    sqlQuery,
+    tileResolution = DEFAULT_TILE_RESOLUTION,
+    queryParameters
+  } = options;
+
+  const urlParameters: UrlParameters = {
+    spatialDataColumn,
+    spatialDataType: 'geo',
+    tileResolution: tileResolution.toString(),
+    q: sqlQuery
+  };
 
   if (columns) {
     urlParameters.columns = columns.join(',');

package/src/sources/vector-table-source.ts

@@ -1,27 +1,45 @@
 /* eslint-disable camelcase */
+import {DEFAULT_TILE_RESOLUTION} from '../constants';
 import {baseSource} from './base-source';
 import type {
   FilterOptions,
+  ColumnsOption,
   SourceOptions,
   SpatialDataType,
   TableSourceOptions,
   TilejsonResult
 } from './types';
 
-export type VectorTableSourceOptions = SourceOptions & TableSourceOptions & FilterOptions;
+export type VectorTableSourceOptions = SourceOptions &
+  TableSourceOptions &
+  FilterOptions &
+  ColumnsOption;
 type UrlParameters = {
   columns?: string;
   filters?: string;
   spatialDataType: SpatialDataType;
   spatialDataColumn?: string;
+  tileResolution?: string;
   name: string;
 };
 
 export const vectorTableSource = async function (
   options: VectorTableSourceOptions
 ): Promise<TilejsonResult> {
-  const {columns, filters, spatialDataColumn = 'geom', tableName} = options;
-  const urlParameters: UrlParameters = {name: tableName, spatialDataColumn, spatialDataType: 'geo'};
+  const {
+    columns,
+    filters,
+    spatialDataColumn = 'geom',
+    tableName,
+    tileResolution = DEFAULT_TILE_RESOLUTION
+  } = options;
+
+  const urlParameters: UrlParameters = {
+    name: tableName,
+    spatialDataColumn,
+    spatialDataType: 'geo',
+    tileResolution: tileResolution.toString()
+  };
 
   if (columns) {
     urlParameters.columns = columns.join(',');

package/src/utils.ts

@@ -51,7 +51,11 @@ export function scaleIdentity() {
     return unknown;
   };
 
-  scale.copy = () => scaleIdentity().unknown(unknown);
+  scale.copy = () => {
+    const scaleCopy = scaleIdentity();
+    scaleCopy.unknown(unknown);
+    return scaleCopy;
+  };
 
   return scale;
 }