@deck.gl/carto 9.0.23 → 9.0.25

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

@@ -3,13 +3,17 @@ import {DEFAULT_AGGREGATION_RES_LEVEL_H3} from '../constants';
 import {baseSource} from './base-source';
 import type {
   AggregationOptions,
+  FilterOptions,
   QuerySourceOptions,
   SourceOptions,
   SpatialDataType,
   TilejsonResult
 } from './types';
 
-export type H3QuerySourceOptions = SourceOptions & QuerySourceOptions & AggregationOptions;
+export type H3QuerySourceOptions = SourceOptions &
+  QuerySourceOptions &
+  AggregationOptions &
+  FilterOptions;
 type UrlParameters = {
   aggregationExp: string;
   aggregationResLevel?: string;
@@ -17,6 +21,7 @@ type UrlParameters = {
   spatialDataColumn?: string;
   q: string;
   queryParameters?: Record<string, unknown> | unknown[];
+  filters?: Record<string, unknown>;
 };
 
 export const h3QuerySource = async function (
@@ -27,7 +32,8 @@ export const h3QuerySource = async function (
     aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_H3,
     sqlQuery,
     spatialDataColumn = 'h3',
-    queryParameters
+    queryParameters,
+    filters
   } = options;
   const urlParameters: UrlParameters = {
     aggregationExp,
@@ -42,5 +48,8 @@ export const h3QuerySource = async function (
   if (queryParameters) {
     urlParameters.queryParameters = queryParameters;
   }
+  if (filters) {
+    urlParameters.filters = filters;
+  }
   return baseSource<UrlParameters>('query', options, urlParameters) as Promise<TilejsonResult>;
 };

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

@@ -3,13 +3,17 @@ import {DEFAULT_AGGREGATION_RES_LEVEL_H3} from '../constants';
 import {baseSource} from './base-source';
 import type {
   AggregationOptions,
+  FilterOptions,
   SourceOptions,
   SpatialDataType,
   TableSourceOptions,
   TilejsonResult
 } from './types';
 
-export type H3TableSourceOptions = SourceOptions & TableSourceOptions & AggregationOptions;
+export type H3TableSourceOptions = SourceOptions &
+  TableSourceOptions &
+  AggregationOptions &
+  FilterOptions;
 
 type UrlParameters = {
   aggregationExp: string;
@@ -17,6 +21,7 @@ type UrlParameters = {
   spatialDataType: SpatialDataType;
   spatialDataColumn?: string;
   name: string;
+  filters?: Record<string, unknown>;
 };
 
 export const h3TableSource = async function (
@@ -26,7 +31,8 @@ export const h3TableSource = async function (
     aggregationExp,
     aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_H3,
     spatialDataColumn = 'h3',
-    tableName
+    tableName,
+    filters
   } = options;
   const urlParameters: UrlParameters = {
     aggregationExp,
@@ -38,5 +44,8 @@ export const h3TableSource = async function (
   if (aggregationResLevel) {
     urlParameters.aggregationResLevel = String(aggregationResLevel);
   }
+  if (filters) {
+    urlParameters.filters = filters;
+  }
   return baseSource<UrlParameters>('table', options, urlParameters) as Promise<TilejsonResult>;
 };

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

@@ -3,13 +3,17 @@ import {DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN} from '../constants';
 import {baseSource} from './base-source';
 import type {
   AggregationOptions,
+  FilterOptions,
   QuerySourceOptions,
   SourceOptions,
   SpatialDataType,
   TilejsonResult
 } from './types';
 
-export type QuadbinQuerySourceOptions = SourceOptions & QuerySourceOptions & AggregationOptions;
+export type QuadbinQuerySourceOptions = SourceOptions &
+  QuerySourceOptions &
+  AggregationOptions &
+  FilterOptions;
 
 type UrlParameters = {
   aggregationExp: string;
@@ -18,6 +22,7 @@ type UrlParameters = {
   spatialDataColumn?: string;
   q: string;
   queryParameters?: Record<string, unknown> | unknown[];
+  filters?: Record<string, unknown>;
 };
 
 export const quadbinQuerySource = async function (
@@ -28,7 +33,8 @@ export const quadbinQuerySource = async function (
     aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN,
     sqlQuery,
     spatialDataColumn = 'quadbin',
-    queryParameters
+    queryParameters,
+    filters
   } = options;
   const urlParameters: UrlParameters = {
     aggregationExp,
@@ -43,5 +49,8 @@ export const quadbinQuerySource = async function (
   if (queryParameters) {
     urlParameters.queryParameters = queryParameters;
   }
+  if (filters) {
+    urlParameters.filters = filters;
+  }
   return baseSource<UrlParameters>('query', options, urlParameters) as Promise<TilejsonResult>;
 };

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

@@ -3,13 +3,17 @@ import {DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN} from '../constants';
 import {baseSource} from './base-source';
 import type {
   AggregationOptions,
+  FilterOptions,
   SourceOptions,
   SpatialDataType,
   TableSourceOptions,
   TilejsonResult
 } from './types';
 
-export type QuadbinTableSourceOptions = SourceOptions & TableSourceOptions & AggregationOptions;
+export type QuadbinTableSourceOptions = SourceOptions &
+  TableSourceOptions &
+  AggregationOptions &
+  FilterOptions;
 
 type UrlParameters = {
   aggregationExp: string;
@@ -17,6 +21,7 @@ type UrlParameters = {
   spatialDataType: SpatialDataType;
   spatialDataColumn?: string;
   name: string;
+  filters?: Record<string, unknown>;
 };
 
 export const quadbinTableSource = async function (
@@ -26,7 +31,8 @@ export const quadbinTableSource = async function (
     aggregationExp,
     aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN,
     spatialDataColumn = 'quadbin',
-    tableName
+    tableName,
+    filters
   } = options;
 
   const urlParameters: UrlParameters = {
@@ -39,5 +45,8 @@ export const quadbinTableSource = async function (
   if (aggregationResLevel) {
     urlParameters.aggregationResLevel = String(aggregationResLevel);
   }
+  if (filters) {
+    urlParameters.filters = filters;
+  }
   return baseSource<UrlParameters>('table', options, urlParameters) as Promise<TilejsonResult>;
 };

package/src/style/color-bins-style.ts

@@ -1,7 +1,7 @@
 import {scaleThreshold} from 'd3-scale';
-import {AccessorFunction} from '@deck.gl/core';
+import {AccessorFunction, Color} from '@deck.gl/core';
 import {Feature} from 'geojson';
-import getPalette, {Color, DEFAULT_PALETTE, NULL_COLOR} from './palette';
+import getPalette, {DEFAULT_PALETTE, NULL_COLOR} from './palette';
 import {assert} from '../utils';
 import {AttributeSelector, getAttrValue} from './utils';
 

package/src/style/color-categories-style.ts

@@ -1,6 +1,6 @@
-import {AccessorFunction} from '@deck.gl/core';
+import {AccessorFunction, Color} from '@deck.gl/core';
 import {Feature} from 'geojson';
-import getPalette, {Color, DEFAULT_PALETTE, NULL_COLOR, OTHERS_COLOR} from './palette';
+import getPalette, {DEFAULT_PALETTE, NULL_COLOR, OTHERS_COLOR} from './palette';
 import {assert} from '../utils';
 import {AttributeSelector, getAttrValue} from './utils';
 

package/src/style/color-continuous-style.ts

@@ -1,7 +1,7 @@
-import {AccessorFunction} from '@deck.gl/core';
+import {AccessorFunction, Color} from '@deck.gl/core';
 import {scaleLinear} from 'd3-scale';
 import {Feature} from 'geojson';
-import getPalette, {Color, DEFAULT_PALETTE, NULL_COLOR} from './palette';
+import getPalette, {DEFAULT_PALETTE, NULL_COLOR} from './palette';
 import {assert} from '../utils';
 import {AttributeSelector, getAttrValue} from './utils';
 

package/src/style/palette.ts

@@ -1,7 +1,6 @@
 import * as cartoColors from 'cartocolor';
 import {assert} from '../utils';
-
-export type Color = [r: number, b: number, g: number, a?: number];
+import {Color} from '@deck.gl/core';
 
 export const DEFAULT_PALETTE = 'PurpOr';
 export const NULL_COLOR: Color = [204, 204, 204];

package/src/utils.ts

@@ -22,6 +22,14 @@ export function createBinaryProxy(
 
     has(target, property) {
       return property in numericProps || property in target;
+    },
+
+    ownKeys(target) {
+      return [...Object.keys(numericProps), ...Reflect.ownKeys(target)];
+    },
+
+    getOwnPropertyDescriptor(target, prop) {
+      return {enumerable: true, configurable: true};
     }
   });
 }