@deck.gl/aggregation-layers 8.8.0-beta.1 → 8.8.0-beta.2

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/aggregation-layers",
   "description": "deck.gl layers that aggregate the input data into alternative representations",
   "license": "MIT",
-  "version": "8.8.0-beta.1",
+  "version": "8.8.0-beta.2",
   "publishConfig": {
     "access": "public"
   },
@@ -31,14 +31,14 @@
   },
   "dependencies": {
     "@luma.gl/constants": "^8.5.14",
-    "@luma.gl/core": "^8.5.14",
     "@luma.gl/shadertools": "^8.5.14",
     "@math.gl/web-mercator": "^3.6.0",
     "d3-hexbin": "^0.2.1"
   },
   "peerDependencies": {
     "@deck.gl/core": "^8.0.0",
-    "@deck.gl/layers": "^8.0.0"
+    "@deck.gl/layers": "^8.0.0",
+    "@luma.gl/core": "^8.0.0"
   },
-  "gitHead": "1e4621a4f7422a053a74dcd8a175f9b56c273a14"
+  "gitHead": "d9bae59d015387c547366465d75d80950c60a34e"
 }

package/src/contour-layer/contour-layer.ts

@@ -28,7 +28,8 @@ import {
   Layer,
   log,
   Position,
-  UpdateParameters
+  UpdateParameters,
+  DefaultProps
 } from '@deck.gl/core';
 
 import GPUGridAggregator from '../utils/gpu-grid-aggregation/gpu-grid-aggregator';
@@ -40,7 +41,7 @@ const DEFAULT_COLOR = [255, 255, 255, 255];
 const DEFAULT_STROKE_WIDTH = 1;
 const DEFAULT_THRESHOLD = 1;
 
-const defaultProps = {
+const defaultProps: DefaultProps<ContourLayerProps> = {
   // grid aggregation
   cellSize: {type: 'number', min: 1, max: 1000, value: 1000},
   getPosition: {type: 'accessor', value: x => x.position},

package/src/cpu-grid-layer/cpu-grid-layer.ts

@@ -19,8 +19,8 @@
 // THE SOFTWARE.
 
 import GL from '@luma.gl/constants';
-import {GridCellLayer, _MaterialProps as MaterialProps} from '@deck.gl/layers';
-import {Accessor, AccessorFunction, Color, Position} from '@deck.gl/core';
+import {GridCellLayer} from '@deck.gl/layers';
+import {Accessor, AccessorFunction, Color, Position, Material, DefaultProps} from '@deck.gl/core';
 
 import {defaultColorRange} from '../utils/color-utils';
 import {pointToDensityGridDataCPU} from './grid-aggregator';
@@ -34,7 +34,7 @@ import {AggregateAccessor} from '../types';
 // eslint-disable-next-line @typescript-eslint/no-empty-function
 function nop() {}
 
-const defaultProps = {
+const defaultProps: DefaultProps<CPUGridLayerProps> = {
   // color
   colorDomain: null,
   colorRange: defaultColorRange,
@@ -162,11 +162,20 @@ export type _CPUGridLayerProps<DataT> = {
   colorScaleType?: 'quantize' | 'linear' | 'quantile' | 'ordinal';
 
   /**
-   * This is an object that contains material props
-   * for [lighting effect](/docs/api-reference/core/lighting-effect.md) applied on extruded polygons.
+   * Scaling function used to determine the elevation of the grid cell, only supports 'linear'.
+   */
+  elevationScaleType?: 'linear';
+
+  // TODO - document
+  gridAggregator?: (props: any, params: any) => any;
+
+  /**
+   * Material settings for lighting effect. Applies if `extruded: true`.
+   *
    * @default true
+   * @see https://deck.gl/docs/developer-guide/using-lighting
    */
-  material?: MaterialProps | null;
+  material?: Material;
 
   /**
    * Defines the operation used to aggregate all data object weights to calculate a cell's color value.
@@ -221,6 +230,11 @@ export type _CPUGridLayerProps<DataT> = {
    * @default () => {}
    */
   onSetElevationDomain?: (minMax: [number, number]) => void;
+
+  /**
+   * (Experimental) Filter data objects
+   */
+  _filterData: null | ((d: DataT) => boolean);
 };
 
 export default class CPUGridLayer<DataT = any, ExtraPropsT = {}> extends AggregationLayer<

package/src/gpu-grid-layer/gpu-grid-cell-layer.ts

@@ -18,7 +18,16 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import {Layer, fp64LowPart, project32, gouraudLighting, picking, LayerContext} from '@deck.gl/core';
+import {
+  Layer,
+  fp64LowPart,
+  project32,
+  gouraudLighting,
+  picking,
+  LayerContext,
+  LayerProps,
+  DefaultProps
+} from '@deck.gl/core';
 import GL from '@luma.gl/constants';
 import {Model, CubeGeometry, Buffer} from '@luma.gl/core';
 import {fp64arithmetic} from '@luma.gl/shadertools';
@@ -30,7 +39,7 @@ import fs from './gpu-grid-cell-layer-fragment.glsl';
 const COLOR_DATA_UBO_INDEX = 0;
 const ELEVATION_DATA_UBO_INDEX = 1;
 
-const defaultProps = {
+const defaultProps: DefaultProps<_GPUGridCellLayerProps & LayerProps> = {
   // color
   colorDomain: null,
   colorRange: defaultColorRange,
@@ -41,12 +50,12 @@ const defaultProps = {
   elevationScale: {type: 'number', min: 0, value: 1},
 
   // grid
-  gridSize: {type: 'array', min: 0, value: [1, 1]},
-  gridOrigin: {type: 'array', min: 0, value: [0, 0]},
-  gridOffset: {type: 'array', min: 0, value: [0, 0]},
+  gridSize: {type: 'array', value: [1, 1]},
+  gridOrigin: {type: 'array', value: [0, 0]},
+  gridOffset: {type: 'array', value: [0, 0]},
 
   cellSize: {type: 'number', min: 0, max: 1000, value: 1000},
-  offset: {type: 'array', min: 0, value: [1, 1]},
+  offset: {type: 'array', value: [1, 1]},
   coverage: {type: 'number', min: 0, max: 1, value: 1},
   extruded: true,
 

package/src/gpu-grid-layer/gpu-grid-layer.ts

@@ -24,13 +24,14 @@ import {
   Accessor,
   AccessorFunction,
   Color,
+  Material,
   GetPickingInfoParams,
   LayerContext,
   log,
   PickingInfo,
-  Position
+  Position,
+  DefaultProps
 } from '@deck.gl/core';
-import {_MaterialProps as MaterialProps} from '@deck.gl/layers';
 
 import GPUGridAggregator from '../utils/gpu-grid-aggregation/gpu-grid-aggregator';
 import {AGGREGATION_OPERATION} from '../utils/aggregation-operation-utils';
@@ -40,7 +41,7 @@ import {pointToDensityGridDataCPU} from './../cpu-grid-layer/grid-aggregator';
 import GridAggregationLayer, {GridAggregationLayerProps} from '../grid-aggregation-layer';
 import {getBoundingBox, getGridParams} from '../utils/grid-aggregation-utils';
 
-const defaultProps = {
+const defaultProps: DefaultProps<GPUGridLayerProps> = {
   // color
   colorDomain: null,
   colorRange: defaultColorRange,
@@ -129,11 +130,12 @@ export type _GPUGridLayerProps<DataT> = {
   extruded?: boolean;
 
   /**
-   * This is an object that contains material props
-   * for [lighting effect](/docs/api-reference/core/lighting-effect.md) applied on extruded polygons.
+   * Material settings for lighting effect. Applies if `extruded: true`.
+   *
    * @default true
+   * @see https://deck.gl/docs/developer-guide/using-lighting
    */
-  material?: MaterialProps | null;
+  material?: Material;
 
   /**
    * Defines the operation used to aggregate all data object weights to calculate a cell's color value.

package/src/grid-layer/grid-layer.ts

@@ -1,9 +1,15 @@
-import {CompositeLayer, CompositeLayerProps, Layer, UpdateParameters} from '@deck.gl/core';
+import {
+  CompositeLayer,
+  CompositeLayerProps,
+  Layer,
+  UpdateParameters,
+  DefaultProps
+} from '@deck.gl/core';
 import GPUGridAggregator from '../utils/gpu-grid-aggregation/gpu-grid-aggregator';
 import GPUGridLayer, {_GPUGridLayerProps} from '../gpu-grid-layer/gpu-grid-layer';
 import CPUGridLayer, {_CPUGridLayerProps} from '../cpu-grid-layer/cpu-grid-layer';
 
-const defaultProps = {
+const defaultProps: DefaultProps<GridLayerProps> = {
   ...GPUGridLayer.defaultProps,
   ...CPUGridLayer.defaultProps,
   gpuAggregation: false
@@ -13,7 +19,7 @@ const defaultProps = {
 export type GridLayerProps<DataT = any> = _GridLayerProps<DataT> & CompositeLayerProps<DataT>;
 
 /** Properties added by GridLayer. */
-type _GridLayerProps<DataT = any> = _CPUGridLayerProps<DataT> &
+type _GridLayerProps<DataT> = _CPUGridLayerProps<DataT> &
   _GPUGridLayerProps<DataT> & {
     /**
      * Whether the aggregation should be performed in high-precision 64-bit mode.

package/src/heatmap-layer/heatmap-layer.ts

@@ -41,7 +41,8 @@ import {
   LayersList,
   log,
   Position,
-  UpdateParameters
+  UpdateParameters,
+  DefaultProps
 } from '@deck.gl/core';
 import TriangleLayer from './triangle-layer';
 import AggregationLayer, {AggregationLayerProps} from '../aggregation-layer';
@@ -68,7 +69,7 @@ const AGGREGATION_MODE = {
   MEAN: 1
 };
 
-const defaultProps = {
+const defaultProps: DefaultProps<HeatmapLayerProps> = {
   getPosition: {type: 'accessor', value: x => x.position},
   getWeight: {type: 'accessor', value: 1},
   intensity: {type: 'number', min: 0, value: 1},
@@ -98,9 +99,10 @@ const DIMENSIONS = {
   }
 };
 
-export type HeatmapLayerProps<DataT> = _HeatmapLayerProps<DataT> & AggregationLayerProps<DataT>;
+export type HeatmapLayerProps<DataT = any> = _HeatmapLayerProps<DataT> &
+  AggregationLayerProps<DataT>;
 
-type _HeatmapLayerProps<DataT = any> = {
+type _HeatmapLayerProps<DataT> = {
   /**
    * Radius of the circle in pixels, to which the weight of an object is distributed.
    *

package/src/hexagon-layer/hexagon-layer.ts

@@ -18,8 +18,17 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import {Accessor, AccessorFunction, Color, log, Position, UpdateParameters} from '@deck.gl/core';
-import {ColumnLayer, _MaterialProps as MaterialProps} from '@deck.gl/layers';
+import {
+  Accessor,
+  AccessorFunction,
+  Color,
+  log,
+  Position,
+  Material,
+  UpdateParameters,
+  DefaultProps
+} from '@deck.gl/core';
+import {ColumnLayer} from '@deck.gl/layers';
 
 import {defaultColorRange} from '../utils/color-utils';
 
@@ -33,7 +42,7 @@ import {AggregateAccessor} from '../types';
 // eslint-disable-next-line @typescript-eslint/no-empty-function
 function nop() {}
 
-const defaultProps = {
+const defaultProps: DefaultProps<HexagonLayerProps> = {
   // color
   colorDomain: null,
   colorRange: defaultColorRange,
@@ -85,13 +94,13 @@ type _HexagonLayerProps<DataT = any> = {
    * Function to aggregate data into hexagonal bins.
    * @default d3-hexbin
    */
-  hexagonAggregator?: () => any;
+  hexagonAggregator?: (props: any, params: any) => any;
 
   /**
    * Color scale input domain.
    * @default [min(colorWeight), max(colorWeight)]
    */
-  colorDomain?: number[];
+  colorDomain?: [number, number] | null;
 
   /**
    * Specified as an array of colors [color1, color2, ...].
@@ -109,13 +118,13 @@ type _HexagonLayerProps<DataT = any> = {
    * Elevation scale input domain. The elevation scale is a linear scale that maps number of counts to elevation.
    * @default [0, max(elevationWeight)]
    */
-  elevationDomain?: number[];
+  elevationDomain?: [number, number] | null;
 
   /**
    * Elevation scale output range.
    * @default [0, 1000]
    */
-  elevationRange?: number[];
+  elevationRange?: [number, number];
 
   /**
    * Hexagon elevation multiplier.
@@ -165,11 +174,17 @@ type _HexagonLayerProps<DataT = any> = {
   colorScaleType?: 'quantize' | 'quantile' | 'ordinal';
 
   /**
-   * This is an object that contains material props
-   * for [lighting effect](/docs/api-reference/core/lighting-effect.md) applied on extruded polygons.
+   * Scaling function used to determine the elevation of the grid cell, only supports 'linear'.
+   */
+  elevationScaleType?: 'linear';
+
+  /**
+   * Material settings for lighting effect. Applies if `extruded: true`.
+   *
    * @default true
+   * @see https://deck.gl/docs/developer-guide/using-lighting
    */
-  material?: MaterialProps | boolean;
+  material?: Material;
 
   /**
    * Defines the operation used to aggregate all data object weights to calculate a cell's color value.
@@ -224,6 +239,11 @@ type _HexagonLayerProps<DataT = any> = {
    * @default () => {}
    */
   onSetElevationDomain?: (minMax: [number, number]) => void;
+
+  /**
+   * (Experimental) Filter data objects
+   */
+  _filterData: null | ((d: DataT) => boolean);
 };
 
 export default class HexagonLayer<ExtraPropsT = {}> extends AggregationLayer<

package/src/screen-grid-layer/screen-grid-cell-layer.ts

@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 import GL from '@luma.gl/constants';
-import {Model, Geometry, FEATURES, hasFeatures, Texture2D} from '@luma.gl/core';
+import {Model, Geometry, FEATURES, hasFeatures, Texture2D, DefaultProps} from '@luma.gl/core';
 import {Layer, LayerProps, log, picking, UpdateParameters} from '@deck.gl/core';
 import {defaultColorRange, colorRangeToFlatArray} from '../utils/color-utils';
 import vs from './screen-grid-layer-vertex.glsl';
@@ -30,7 +30,7 @@ const DEFAULT_MINCOLOR = [0, 0, 0, 0];
 const DEFAULT_MAXCOLOR = [0, 255, 0, 255];
 const COLOR_PROPS = ['minColor', 'maxColor', 'colorRange', 'colorDomain'];
 
-const defaultProps = {
+const defaultProps: DefaultProps<ScreenGridCellLayerProps> = {
   cellSizePixels: {value: 100, min: 1},
   cellMarginPixels: {value: 2, min: 0, max: 5},
 
@@ -39,7 +39,8 @@ const defaultProps = {
 };
 
 /** All properties supported by ScreenGridCellLayer. */
-export type ScreenGridCellLayerProps<DataT> = _ScreenGridCellLayerProps<DataT> & LayerProps<DataT>;
+export type ScreenGridCellLayerProps<DataT = any> = _ScreenGridCellLayerProps<DataT> &
+  LayerProps<DataT>;
 
 /** Proprties added by ScreenGridCellLayer. */
 export type _ScreenGridCellLayerProps<DataT> = _ScreenGridLayerProps<DataT> & {

package/src/screen-grid-layer/screen-grid-layer.ts

@@ -28,7 +28,8 @@ import {
   log,
   PickingInfo,
   Position,
-  UpdateParameters
+  UpdateParameters,
+  DefaultProps
 } from '@deck.gl/core';
 import GL from '@luma.gl/constants';
 import type {Texture2D} from '@luma.gl/core';
@@ -38,7 +39,7 @@ import ScreenGridCellLayer from './screen-grid-cell-layer';
 import GridAggregationLayer, {GridAggregationLayerProps} from '../grid-aggregation-layer';
 import {getFloatTexture} from '../utils/resource-utils.js';
 
-const defaultProps = {
+const defaultProps: DefaultProps<ScreenGridLayerProps> = {
   ...ScreenGridCellLayer.defaultProps,
   getPosition: {type: 'accessor', value: d => d.position},
   getWeight: {type: 'accessor', value: 1},
@@ -59,11 +60,11 @@ const DIMENSIONS = {
 };
 
 /** All properties supported by ScreenGridLayer. */
-export type ScreenGridLayerProps<DataT> = _ScreenGridLayerProps<DataT> &
+export type ScreenGridLayerProps<DataT = any> = _ScreenGridLayerProps<DataT> &
   GridAggregationLayerProps<DataT>;
 
 /** Properties added by ScreenGridLayer. */
-export type _ScreenGridLayerProps<DataT = any> = {
+export type _ScreenGridLayerProps<DataT> = {
   /**
    * Unit width/height of the bins.
    * @default 100

package/src/utils/{color-utils.js → color-utils.ts}

@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-export const defaultColorRange = [
+export const defaultColorRange: [number, number, number][] = [
   [255, 255, 178],
   [254, 217, 118],
   [254, 178, 76],

package/typed/contour-layer/contour-layer.d.ts

@@ -1,4 +1,4 @@
-import { Accessor, AccessorFunction, Color, Layer, Position, UpdateParameters } from '@deck.gl/core/typed';
+import { Accessor, AccessorFunction, Color, Layer, Position, UpdateParameters, DefaultProps } from '@deck.gl/core/typed';
 import GridAggregationLayer, { GridAggregationLayerProps } from '../grid-aggregation-layer';
 /** All properties supported by ContourLayer. */
 export declare type ContourLayerProps<DataT = any> = _ContourLayerProps<DataT> & GridAggregationLayerProps<DataT>;
@@ -61,28 +61,7 @@ export declare type _ContourLayerProps<DataT> = {
 };
 export default class ContourLayer<DataT = any, ExtraPropsT = {}> extends GridAggregationLayer<ExtraPropsT & Required<_ContourLayerProps<DataT>>> {
     static layerName: string;
-    static defaultProps: {
-        cellSize: {
-            type: string;
-            min: number;
-            max: number;
-            value: number;
-        };
-        getPosition: {
-            type: string;
-            value: (x: any) => any;
-        };
-        getWeight: {
-            type: string;
-            value: number;
-        };
-        gpuAggregation: boolean;
-        aggregation: string;
-        contours: {
-            threshold: number;
-        }[];
-        zOffset: number;
-    };
+    static defaultProps: DefaultProps<ContourLayerProps<any>>;
     initializeState(): void;
     updateState(opts: UpdateParameters<this>): void;
     renderLayers(): Layer[];

package/typed/contour-layer/contour-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contour-layer.d.ts","sourceRoot":"","sources":["../../src/contour-layer/contour-layer.ts"],"names":[],"mappings":"AAuBA,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,KAAK,EACL,KAAK,EAEL,QAAQ,EACR,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAKvB,OAAO,oBAAoB,EAAE,EAAC,yBAAyB,EAAC,MAAM,2BAA2B,CAAC;AAgC1F,gDAAgD;AAChD,oBAAY,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,GACpE,yBAAyB,CAAC,KAAK,CAAC,CAAC;AAEnC,wCAAwC;AACxC,oBAAY,kBAAkB,CAAC,KAAK,IAAI;IACtC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;OAGG;IACH,WAAW,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;IAE7C;;;OAGG;IACH,QAAQ,EAAE;QACR;;;;WAIG;QACH,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;QAE7B;;;WAGG;QACH,KAAK,CAAC,EAAE,KAAK,CAAC;QAEd;;;WAGG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;QAErB,sCAAsC;QACtC,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IAEJ;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAEhD;;;OAGG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CACrC,CAAC;AACF,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,KAAK,GAAG,GAAG,EAAE,WAAW,GAAG,EAAE,CAAE,SAAQ,oBAAoB,CAC3F,WAAW,GAAG,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAClD;IACC,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;;;;;;;MAAgB;IAEnC,eAAe,IAAI,IAAI;IA2BvB,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAgB/C,YAAY,IAAI,KAAK,EAAE;IA4CvB,sBAAsB,CAAC,IAAI,KAAA;IAyE3B,OAAO,CAAC,gBAAgB;IAUxB,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,iBAAiB;IAsBzB,OAAO,CAAC,oBAAoB;CAc7B"}
+{"version":3,"file":"contour-layer.d.ts","sourceRoot":"","sources":["../../src/contour-layer/contour-layer.ts"],"names":[],"mappings":"AAuBA,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,KAAK,EACL,KAAK,EAEL,QAAQ,EACR,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAC;AAKvB,OAAO,oBAAoB,EAAE,EAAC,yBAAyB,EAAC,MAAM,2BAA2B,CAAC;AAgC1F,gDAAgD;AAChD,oBAAY,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,GACpE,yBAAyB,CAAC,KAAK,CAAC,CAAC;AAEnC,wCAAwC;AACxC,oBAAY,kBAAkB,CAAC,KAAK,IAAI;IACtC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;OAGG;IACH,WAAW,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;IAE7C;;;OAGG;IACH,QAAQ,EAAE;QACR;;;;WAIG;QACH,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;QAE7B;;;WAGG;QACH,KAAK,CAAC,EAAE,KAAK,CAAC;QAEd;;;WAGG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;QAErB,sCAAsC;QACtC,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IAEJ;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAEhD;;;OAGG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CACrC,CAAC;AACF,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,KAAK,GAAG,GAAG,EAAE,WAAW,GAAG,EAAE,CAAE,SAAQ,oBAAoB,CAC3F,WAAW,GAAG,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAClD;IACC,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,uCAAgB;IAEnC,eAAe,IAAI,IAAI;IA2BvB,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAgB/C,YAAY,IAAI,KAAK,EAAE;IA4CvB,sBAAsB,CAAC,IAAI,KAAA;IAyE3B,OAAO,CAAC,gBAAgB;IAUxB,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,iBAAiB;IAsBzB,OAAO,CAAC,oBAAoB;CAc7B"}

package/typed/cpu-grid-layer/cpu-grid-layer.d.ts

@@ -1,11 +1,8 @@
-import { _MaterialProps as MaterialProps } from '@deck.gl/layers/typed';
-import { Accessor, AccessorFunction, Color, Position } from '@deck.gl/core/typed';
-import { pointToDensityGridDataCPU } from './grid-aggregator';
+import { Accessor, AccessorFunction, Color, Position, Material, DefaultProps } from '@deck.gl/core/typed';
 import AggregationLayer, { AggregationLayerProps } from '../aggregation-layer';
 import Layer, { UpdateParameters } from 'modules/core/src/lib/layer';
 import { GetPickingInfoParams, PickingInfo } from 'modules/core/src/lib/picking/pick-info';
 import { AggregateAccessor } from '../types';
-declare function nop(): void;
 /** All properties supported by CPUGridLayer. */
 export declare type CPUGridLayerProps<DataT = any> = _CPUGridLayerProps<DataT> & AggregationLayerProps<DataT>;
 /** Properties added by CPUGridLayer. */
@@ -80,11 +77,17 @@ export declare type _CPUGridLayerProps<DataT> = {
      */
     colorScaleType?: 'quantize' | 'linear' | 'quantile' | 'ordinal';
     /**
-     * This is an object that contains material props
-     * for [lighting effect](/docs/api-reference/core/lighting-effect.md) applied on extruded polygons.
+     * Scaling function used to determine the elevation of the grid cell, only supports 'linear'.
+     */
+    elevationScaleType?: 'linear';
+    gridAggregator?: (props: any, params: any) => any;
+    /**
+     * Material settings for lighting effect. Applies if `extruded: true`.
+     *
      * @default true
+     * @see https://deck.gl/docs/developer-guide/using-lighting
      */
-    material?: MaterialProps | null;
+    material?: Material;
     /**
      * Defines the operation used to aggregate all data object weights to calculate a cell's color value.
      * @default 'SUM'
@@ -130,90 +133,14 @@ export declare type _CPUGridLayerProps<DataT> = {
      * @default () => {}
      */
     onSetElevationDomain?: (minMax: [number, number]) => void;
+    /**
+     * (Experimental) Filter data objects
+     */
+    _filterData: null | ((d: DataT) => boolean);
 };
 export default class CPUGridLayer<DataT = any, ExtraPropsT = {}> extends AggregationLayer<ExtraPropsT & Required<_CPUGridLayerProps<DataT>>> {
     static layerName: string;
-    static defaultProps: {
-        colorDomain: null;
-        colorRange: number[][];
-        getColorValue: {
-            type: string;
-            value: null;
-        };
-        getColorWeight: {
-            type: string;
-            value: number;
-        };
-        colorAggregation: string;
-        lowerPercentile: {
-            type: string;
-            min: number;
-            max: number;
-            value: number;
-        };
-        upperPercentile: {
-            type: string;
-            min: number;
-            max: number;
-            value: number;
-        };
-        colorScaleType: string;
-        onSetColorDomain: typeof nop;
-        elevationDomain: null;
-        elevationRange: number[];
-        getElevationValue: {
-            type: string;
-            value: null;
-        };
-        getElevationWeight: {
-            type: string;
-            value: number;
-        };
-        elevationAggregation: string;
-        elevationLowerPercentile: {
-            type: string;
-            min: number;
-            max: number;
-            value: number;
-        };
-        elevationUpperPercentile: {
-            type: string;
-            min: number;
-            max: number;
-            value: number;
-        };
-        elevationScale: {
-            type: string;
-            min: number;
-            value: number;
-        };
-        elevationScaleType: string;
-        onSetElevationDomain: typeof nop;
-        gridAggregator: typeof pointToDensityGridDataCPU;
-        cellSize: {
-            type: string;
-            min: number;
-            max: number;
-            value: number;
-        };
-        coverage: {
-            type: string;
-            min: number;
-            max: number;
-            value: number;
-        };
-        getPosition: {
-            type: string;
-            value: (x: any) => any;
-        };
-        extruded: boolean;
-        material: boolean;
-        _filterData: {
-            type: string;
-            value: null;
-            optional: boolean;
-        };
-    };
+    static defaultProps: DefaultProps<CPUGridLayerProps<any>>;
     initializeState(): void;
     updateState(opts: UpdateParameters<this>): void;
     getPickingInfo({ info }: GetPickingInfoParams): PickingInfo;
@@ -222,5 +149,4 @@ export default class CPUGridLayer<DataT = any, ExtraPropsT = {}> extends Aggrega
     _getSublayerUpdateTriggers(): any;
     renderLayers(): Layer;
 }
-export {};
 //# sourceMappingURL=cpu-grid-layer.d.ts.map

package/typed/cpu-grid-layer/cpu-grid-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cpu-grid-layer.d.ts","sourceRoot":"","sources":["../../src/cpu-grid-layer/cpu-grid-layer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cpu-grid-layer.d.ts","sourceRoot":"","sources":["../../src/cpu-grid-layer/cpu-grid-layer.ts"],"names":[],"mappings":"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"}