@deck.gl/aggregation-layers 9.0.40 → 9.1.0-beta.3

package/dist/grid-layer/bin-options-uniforms.d.ts

@@ -0,0 +1,13 @@
+export type BinOptions = {
+    cellOriginCommon: [number, number];
+    cellSizeCommon: [number, number];
+};
+export declare const binOptionsUniforms: {
+    readonly name: "binOptions";
+    readonly vs: "uniform binOptionsUniforms {\n  vec2 cellOriginCommon;\n  vec2 cellSizeCommon;\n} binOptions;\n";
+    readonly uniformTypes: {
+        readonly cellOriginCommon: "vec2<f32>";
+        readonly cellSizeCommon: "vec2<f32>";
+    };
+};
+//# sourceMappingURL=bin-options-uniforms.d.ts.map

package/dist/grid-layer/bin-options-uniforms.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bin-options-uniforms.d.ts","sourceRoot":"","sources":["../../src/grid-layer/bin-options-uniforms.ts"],"names":[],"mappings":"AAaA,MAAM,MAAM,UAAU,GAAG;IACvB,gBAAgB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC,CAAC;AAEF,eAAO,MAAM,kBAAkB;;;;;;;CAOc,CAAC"}

package/dist/grid-layer/bin-options-uniforms.js

@@ -0,0 +1,18 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+const uniformBlock = /* glsl */ `\
+uniform binOptionsUniforms {
+  vec2 cellOriginCommon;
+  vec2 cellSizeCommon;
+} binOptions;
+`;
+export const binOptionsUniforms = {
+    name: 'binOptions',
+    vs: uniformBlock,
+    uniformTypes: {
+        cellOriginCommon: 'vec2<f32>',
+        cellSizeCommon: 'vec2<f32>'
+    }
+};
+//# sourceMappingURL=bin-options-uniforms.js.map

package/dist/grid-layer/bin-options-uniforms.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bin-options-uniforms.js","sourceRoot":"","sources":["../../src/grid-layer/bin-options-uniforms.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,MAAM,YAAY,GAAG,UAAU,CAAC;;;;;CAK/B,CAAC;AAOF,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,IAAI,EAAE,YAAY;IAClB,EAAE,EAAE,YAAY;IAChB,YAAY,EAAE;QACZ,gBAAgB,EAAE,WAAW;QAC7B,cAAc,EAAE,WAAW;KAC5B;CAC0C,CAAC"}

package/dist/grid-layer/grid-cell-layer-vertex.glsl.d.ts

@@ -0,0 +1,3 @@
+declare const _default: "#version 300 es\n\n#define SHADER_NAME grid-cell-layer-vertex-shader\n\nin vec3 positions;\nin vec3 normals;\n\nin vec2 instancePositions;\nin float instanceElevationValues;\nin float instanceColorValues;\nin vec3 instancePickingColors;\n\nuniform sampler2D colorRange;\n\n// Result\nout vec4 vColor;\n\nfloat interp(float value, vec2 domain, vec2 range) {\n  float r = min(max((value - domain.x) / (domain.y - domain.x), 0.), 1.);\n  return mix(range.x, range.y, r);\n}\n\nvec4 interp(float value, vec2 domain, sampler2D range) {\n  float r = (value - domain.x) / (domain.y - domain.x);\n  return texture(range, vec2(r, 0.5));\n}\n\nvoid main(void) {\n  geometry.pickingColor = instancePickingColors;\n\n  if (isnan(instanceColorValues) ||\n    instanceColorValues < grid.colorDomain.z ||\n    instanceColorValues > grid.colorDomain.w ||\n    instanceElevationValues < grid.elevationDomain.z ||\n    instanceElevationValues > grid.elevationDomain.w\n  ) {\n    gl_Position = vec4(0.);\n    return;\n  }\n  \n  vec2 commonPosition = (instancePositions + (positions.xy + 1.0) / 2.0 * column.coverage) * grid.sizeCommon + grid.originCommon - project.commonOrigin.xy;\n  geometry.position = vec4(commonPosition, 0.0, 1.0);\n  geometry.normal = project_normal(normals);\n\n  // calculate z, if 3d not enabled set to 0\n  float elevation = 0.0;\n  if (column.extruded) {\n    elevation = interp(instanceElevationValues, grid.elevationDomain.xy, grid.elevationRange);\n    elevation = project_size(elevation);\n    // cylindar gemoetry height are between -1.0 to 1.0, transform it to between 0, 1\n    geometry.position.z = (positions.z + 1.0) / 2.0 * elevation;\n  }\n\n  gl_Position = project_common_position_to_clipspace(geometry.position);\n  DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n\n  vColor = interp(instanceColorValues, grid.colorDomain.xy, colorRange);\n  vColor.a *= layer.opacity;\n  if (column.extruded) {\n    vColor.rgb = lighting_getLightColor(vColor.rgb, project.cameraPosition, geometry.position.xyz, geometry.normal);\n  }\n  DECKGL_FILTER_COLOR(vColor, geometry);\n}\n";
+export default _default;
+//# sourceMappingURL=grid-cell-layer-vertex.glsl.d.ts.map

package/dist/grid-layer/grid-cell-layer-vertex.glsl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"grid-cell-layer-vertex.glsl.d.ts","sourceRoot":"","sources":["../../src/grid-layer/grid-cell-layer-vertex.glsl.ts"],"names":[],"mappings":";AAIA,wBA+DE"}

package/dist/grid-layer/grid-cell-layer-vertex.glsl.js

@@ -0,0 +1,52 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+export default /* glsl */ `#version 300 es
+#define SHADER_NAME grid-cell-layer-vertex-shader
+in vec3 positions;
+in vec3 normals;
+in vec2 instancePositions;
+in float instanceElevationValues;
+in float instanceColorValues;
+in vec3 instancePickingColors;
+uniform sampler2D colorRange;
+out vec4 vColor;
+float interp(float value, vec2 domain, vec2 range) {
+float r = min(max((value - domain.x) / (domain.y - domain.x), 0.), 1.);
+return mix(range.x, range.y, r);
+}
+vec4 interp(float value, vec2 domain, sampler2D range) {
+float r = (value - domain.x) / (domain.y - domain.x);
+return texture(range, vec2(r, 0.5));
+}
+void main(void) {
+geometry.pickingColor = instancePickingColors;
+if (isnan(instanceColorValues) ||
+instanceColorValues < grid.colorDomain.z ||
+instanceColorValues > grid.colorDomain.w ||
+instanceElevationValues < grid.elevationDomain.z ||
+instanceElevationValues > grid.elevationDomain.w
+) {
+gl_Position = vec4(0.);
+return;
+}
+vec2 commonPosition = (instancePositions + (positions.xy + 1.0) / 2.0 * column.coverage) * grid.sizeCommon + grid.originCommon - project.commonOrigin.xy;
+geometry.position = vec4(commonPosition, 0.0, 1.0);
+geometry.normal = project_normal(normals);
+float elevation = 0.0;
+if (column.extruded) {
+elevation = interp(instanceElevationValues, grid.elevationDomain.xy, grid.elevationRange);
+elevation = project_size(elevation);
+geometry.position.z = (positions.z + 1.0) / 2.0 * elevation;
+}
+gl_Position = project_common_position_to_clipspace(geometry.position);
+DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
+vColor = interp(instanceColorValues, grid.colorDomain.xy, colorRange);
+vColor.a *= layer.opacity;
+if (column.extruded) {
+vColor.rgb = lighting_getLightColor(vColor.rgb, project.cameraPosition, geometry.position.xyz, geometry.normal);
+}
+DECKGL_FILTER_COLOR(vColor, geometry);
+}
+`;
+//# sourceMappingURL=grid-cell-layer-vertex.glsl.js.map

package/dist/grid-layer/grid-cell-layer-vertex.glsl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"grid-cell-layer-vertex.glsl.js","sourceRoot":"","sources":["../../src/grid-layer/grid-cell-layer-vertex.glsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,eAAe,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+DvB"}

package/dist/grid-layer/grid-cell-layer.d.ts

@@ -0,0 +1,32 @@
+import { Texture } from '@luma.gl/core';
+import { UpdateParameters, Color } from '@deck.gl/core';
+import { ColumnLayer } from '@deck.gl/layers';
+import type { ScaleType } from "../common/types.js";
+/** Proprties added by GridCellLayer. */
+type GridCellLayerProps = {
+    cellSizeCommon: [number, number];
+    cellOriginCommon: [number, number];
+    colorDomain: [number, number];
+    colorCutoff: [number, number] | null;
+    colorRange: Color[];
+    colorScaleType: ScaleType;
+    elevationDomain: [number, number];
+    elevationCutoff: [number, number] | null;
+    elevationRange: [number, number];
+};
+export declare class GridCellLayer<ExtraPropsT extends {} = {}> extends ColumnLayer<null, ExtraPropsT & Required<GridCellLayerProps>> {
+    static layerName: string;
+    state: ColumnLayer['state'] & {
+        colorTexture: Texture;
+    };
+    getShaders(): any;
+    initializeState(): void;
+    updateState(params: UpdateParameters<this>): void;
+    finalizeState(context: any): void;
+    protected _updateGeometry(): void;
+    draw({ uniforms }: {
+        uniforms: any;
+    }): void;
+}
+export {};
+//# sourceMappingURL=grid-cell-layer.d.ts.map

package/dist/grid-layer/grid-cell-layer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"grid-cell-layer.d.ts","sourceRoot":"","sources":["../../src/grid-layer/grid-cell-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAC,gBAAgB,EAAE,KAAK,EAAC,MAAM,eAAe,CAAC;AACtD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAK5C,OAAO,KAAK,EAAC,SAAS,EAAC,2BAAwB;AAE/C,wCAAwC;AACxC,KAAK,kBAAkB,GAAG;IACxB,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,gBAAgB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IACrC,UAAU,EAAE,KAAK,EAAE,CAAC;IACpB,cAAc,EAAE,SAAS,CAAC;IAC1B,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IACzC,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC,CAAC;AAEF,qBAAa,aAAa,CAAC,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,WAAW,CACzE,IAAI,EACJ,WAAW,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAC3C;IACC,MAAM,CAAC,SAAS,SAAmB;IAEnC,KAAK,EAAG,WAAW,CAAC,OAAO,CAAC,GAAG;QAC7B,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;IAEF,UAAU;IAMV,eAAe;IA6Bf,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAoB1C,aAAa,CAAC,OAAO,KAAA;IAMrB,SAAS,CAAC,eAAe;IAKzB,IAAI,CAAC,EAAC,QAAQ,EAAC;;KAAA;CAsChB"}

package/dist/grid-layer/grid-cell-layer.js

@@ -0,0 +1,94 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+import { ColumnLayer } from '@deck.gl/layers';
+import { CubeGeometry } from '@luma.gl/engine';
+import { createColorRangeTexture, updateColorRangeTexture } from "../common/utils/color-utils.js";
+import vs from "./grid-cell-layer-vertex.glsl.js";
+import { gridUniforms } from "./grid-layer-uniforms.js";
+export class GridCellLayer extends ColumnLayer {
+    getShaders() {
+        const shaders = super.getShaders();
+        shaders.modules.push(gridUniforms);
+        return { ...shaders, vs };
+    }
+    initializeState() {
+        super.initializeState();
+        const attributeManager = this.getAttributeManager();
+        attributeManager.remove([
+            'instanceElevations',
+            'instanceFillColors',
+            'instanceLineColors',
+            'instanceStrokeWidths'
+        ]);
+        attributeManager.addInstanced({
+            instancePositions: {
+                size: 2,
+                type: 'float32',
+                accessor: 'getBin'
+            },
+            instanceColorValues: {
+                size: 1,
+                type: 'float32',
+                accessor: 'getColorValue'
+            },
+            instanceElevationValues: {
+                size: 1,
+                type: 'float32',
+                accessor: 'getElevationValue'
+            }
+        });
+    }
+    updateState(params) {
+        super.updateState(params);
+        const { props, oldProps } = params;
+        const model = this.state.fillModel;
+        if (oldProps.colorRange !== props.colorRange) {
+            this.state.colorTexture?.destroy();
+            this.state.colorTexture = createColorRangeTexture(this.context.device, props.colorRange, props.colorScaleType);
+            const gridProps = { colorRange: this.state.colorTexture };
+            model.shaderInputs.setProps({ grid: gridProps });
+        }
+        else if (oldProps.colorScaleType !== props.colorScaleType) {
+            updateColorRangeTexture(this.state.colorTexture, props.colorScaleType);
+        }
+    }
+    finalizeState(context) {
+        super.finalizeState(context);
+        this.state.colorTexture?.destroy();
+    }
+    _updateGeometry() {
+        const geometry = new CubeGeometry();
+        this.state.fillModel.setGeometry(geometry);
+    }
+    draw({ uniforms }) {
+        const { cellOriginCommon, cellSizeCommon, elevationRange, elevationScale, extruded, coverage, colorDomain, elevationDomain } = this.props;
+        const colorCutoff = this.props.colorCutoff || [-Infinity, Infinity];
+        const elevationCutoff = this.props.elevationCutoff || [-Infinity, Infinity];
+        const fillModel = this.state.fillModel;
+        const gridProps = {
+            colorDomain: [
+                Math.max(colorDomain[0], colorCutoff[0]), // instanceColorValue that maps to colorRange[0]
+                Math.min(colorDomain[1], colorCutoff[1]), // instanceColorValue that maps to colorRange[colorRange.length - 1]
+                Math.max(colorDomain[0] - 1, colorCutoff[0]), // hide cell if instanceColorValue is less than this
+                Math.min(colorDomain[1] + 1, colorCutoff[1]) // hide cell if instanceColorValue is greater than this
+            ],
+            elevationDomain: [
+                Math.max(elevationDomain[0], elevationCutoff[0]), // instanceElevationValue that maps to elevationRange[0]
+                Math.min(elevationDomain[1], elevationCutoff[1]), // instanceElevationValue that maps to elevationRange[elevationRange.length - 1]
+                Math.max(elevationDomain[0] - 1, elevationCutoff[0]), // hide cell if instanceElevationValue is less than this
+                Math.min(elevationDomain[1] + 1, elevationCutoff[1]) // hide cell if instanceElevationValue is greater than this
+            ],
+            elevationRange: [elevationRange[0] * elevationScale, elevationRange[1] * elevationScale],
+            originCommon: cellOriginCommon,
+            sizeCommon: cellSizeCommon
+        };
+        fillModel.shaderInputs.setProps({
+            column: { extruded, coverage },
+            grid: gridProps
+        });
+        fillModel.draw(this.context.renderPass);
+    }
+}
+GridCellLayer.layerName = 'GridCellLayer';
+//# sourceMappingURL=grid-cell-layer.js.map

package/dist/grid-layer/grid-cell-layer.js.map

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

package/dist/grid-layer/grid-layer-uniforms.d.ts

@@ -0,0 +1,21 @@
+import { Texture } from '@luma.gl/core';
+export type GridProps = {
+    colorDomain: [number, number, number, number];
+    colorRange: Texture;
+    elevationDomain: [number, number, number, number];
+    elevationRange: [number, number];
+    originCommon: [number, number];
+    sizeCommon: [number, number];
+};
+export declare const gridUniforms: {
+    readonly name: "grid";
+    readonly vs: "uniform gridUniforms {\n  vec4 colorDomain;\n  vec4 elevationDomain;\n  vec2 elevationRange;\n  vec2 originCommon;\n  vec2 sizeCommon;\n} grid;\n";
+    readonly uniformTypes: {
+        readonly colorDomain: "vec4<f32>";
+        readonly elevationDomain: "vec4<f32>";
+        readonly elevationRange: "vec2<f32>";
+        readonly originCommon: "vec2<f32>";
+        readonly sizeCommon: "vec2<f32>";
+    };
+};
+//# sourceMappingURL=grid-layer-uniforms.d.ts.map

package/dist/grid-layer/grid-layer-uniforms.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"grid-layer-uniforms.d.ts","sourceRoot":"","sources":["../../src/grid-layer/grid-layer-uniforms.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAatC,MAAM,MAAM,SAAS,GAAG;IACtB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClD,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;;;;;;CAUmB,CAAC"}

package/dist/grid-layer/grid-layer-uniforms.js

@@ -0,0 +1,24 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+const uniformBlock = /* glsl */ `\
+uniform gridUniforms {
+  vec4 colorDomain;
+  vec4 elevationDomain;
+  vec2 elevationRange;
+  vec2 originCommon;
+  vec2 sizeCommon;
+} grid;
+`;
+export const gridUniforms = {
+    name: 'grid',
+    vs: uniformBlock,
+    uniformTypes: {
+        colorDomain: 'vec4<f32>',
+        elevationDomain: 'vec4<f32>',
+        elevationRange: 'vec2<f32>',
+        originCommon: 'vec2<f32>',
+        sizeCommon: 'vec2<f32>'
+    }
+};
+//# sourceMappingURL=grid-layer-uniforms.js.map

package/dist/grid-layer/grid-layer-uniforms.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"grid-layer-uniforms.js","sourceRoot":"","sources":["../../src/grid-layer/grid-layer-uniforms.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAKpC,MAAM,YAAY,GAAG,UAAU,CAAC;;;;;;;;CAQ/B,CAAC;AAWF,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,IAAI,EAAE,MAAM;IACZ,EAAE,EAAE,YAAY;IAChB,YAAY,EAAE;QACZ,WAAW,EAAE,WAAW;QACxB,eAAe,EAAE,WAAW;QAC5B,cAAc,EAAE,WAAW;QAC3B,YAAY,EAAE,WAAW;QACzB,UAAU,EAAE,WAAW;KACxB;CACyC,CAAC"}

package/dist/grid-layer/grid-layer.d.ts

@@ -1,32 +1,194 @@
-import { CompositeLayer, CompositeLayerProps, Layer, UpdateParameters, DefaultProps } from '@deck.gl/core';
-import { GPUGridLayerProps } from "../gpu-grid-layer/gpu-grid-layer.js";
-import { CPUGridLayerProps } from "../cpu-grid-layer/cpu-grid-layer.js";
+import { Accessor, Color, GetPickingInfoParams, CompositeLayerProps, Layer, Material, LayersList, PickingInfo, Position, Viewport, UpdateParameters, DefaultProps } from '@deck.gl/core';
+import { WebGLAggregator, CPUAggregator, AggregationOperation } from "../common/aggregator/index.js";
+import AggregationLayer from "../common/aggregation-layer.js";
+import { AggregateAccessor } from "../common/types.js";
+import { AttributeWithScale } from "../common/utils/scale-utils.js";
+import { BinOptions } from "./bin-options-uniforms.js";
 /** All properties supported by GridLayer. */
 export type GridLayerProps<DataT = unknown> = _GridLayerProps<DataT> & CompositeLayerProps;
 /** Properties added by GridLayer. */
-type _GridLayerProps<DataT> = CPUGridLayerProps<DataT> & GPUGridLayerProps<DataT> & {
+type _GridLayerProps<DataT> = {
     /**
-     * Whether the aggregation should be performed in high-precision 64-bit mode.
-     * @default false
+     * Custom accessor to retrieve a grid bin index from each data object.
+     * Not supported by GPU aggregation.
      */
-    fp64?: boolean;
+    gridAggregator?: ((position: number[], cellSize: number) => [number, number]) | null;
+    /**
+     * Size of each cell in meters.
+     * @default 1000
+     */
+    cellSize?: number;
+    /**
+     * Color scale domain, default is set to the extent of aggregated weights in each cell.
+     * @default [min(colorWeight), max(colorWeight)]
+     */
+    colorDomain?: [number, number] | null;
+    /**
+     * Default: [colorbrewer](http://colorbrewer2.org/#type=sequential&scheme=YlOrRd&n=6) `6-class YlOrRd`
+     */
+    colorRange?: Color[];
+    /**
+     * Cell size multiplier, clamped between 0 - 1.
+     * @default 1
+     */
+    coverage?: number;
+    /**
+     * Elevation scale input domain, default is set to between 0 and the max of aggregated weights in each cell.
+     * @default [0, max(elevationWeight)]
+     */
+    elevationDomain?: [number, number] | null;
+    /**
+     * Elevation scale output range.
+     * @default [0, 1000]
+     */
+    elevationRange?: [number, number];
+    /**
+     * Cell elevation multiplier.
+     * @default 1
+     */
+    elevationScale?: number;
+    /**
+     * Whether to enable cell elevation. If set to false, all cell will be flat.
+     * @default true
+     */
+    extruded?: boolean;
+    /**
+     * Filter cells and re-calculate color by `upperPercentile`.
+     * Cells with value larger than the upperPercentile will be hidden.
+     * @default 100
+     */
+    upperPercentile?: number;
+    /**
+     * Filter cells and re-calculate color by `lowerPercentile`.
+     * Cells with value smaller than the lowerPercentile will be hidden.
+     * @default 0
+     */
+    lowerPercentile?: number;
+    /**
+     * Filter cells and re-calculate elevation by `elevationUpperPercentile`.
+     * Cells with elevation value larger than the `elevationUpperPercentile` will be hidden.
+     * @default 100
+     */
+    elevationUpperPercentile?: number;
+    /**
+     * Filter cells and re-calculate elevation by `elevationLowerPercentile`.
+     * Cells with elevation value larger than the `elevationLowerPercentile` will be hidden.
+     * @default 0
+     */
+    elevationLowerPercentile?: number;
+    /**
+     * Scaling function used to determine the color of the grid cell.
+     * Supported Values are 'quantize', 'linear', 'quantile' and 'ordinal'.
+     * @default 'quantize'
+     */
+    colorScaleType?: 'quantize' | 'linear' | 'quantile' | 'ordinal';
+    /**
+     * Scaling function used to determine the elevation of the grid cell.
+     * Supported Values are 'linear' and 'quantile'.
+     * @default 'linear'
+     */
+    elevationScaleType?: 'linear' | 'quantile';
+    /**
+     * Material settings for lighting effect. Applies if `extruded: true`.
+     *
+     * @default true
+     * @see https://deck.gl/docs/developer-guide/using-lighting
+     */
+    material?: Material;
+    /**
+     * Defines the operation used to aggregate all data object weights to calculate a cell's color value.
+     * Valid values are 'SUM', 'MEAN', 'MIN', 'MAX', 'COUNT'.
+     *
+     * @default 'SUM'
+     */
+    colorAggregation?: AggregationOperation;
+    /**
+     * Defines the operation used to aggregate all data object weights to calculate a cell's elevation value.
+     * Valid values are 'SUM', 'MEAN', 'MIN', 'MAX', 'COUNT'.
+     *
+     * @default 'SUM'
+     */
+    elevationAggregation?: AggregationOperation;
+    /**
+     * Method called to retrieve the position of each object.
+     * @default object => object.position
+     */
+    getPosition?: Accessor<DataT, Position>;
+    /**
+     * The weight of a data object used to calculate the color value for a cell.
+     * @default 1
+     */
+    getColorWeight?: Accessor<DataT, number>;
+    /**
+     * After data objects are aggregated into cells, this accessor is called on each cell to get the value that its color is based on.
+     * Not supported by GPU aggregation.
+     * @default null
+     */
+    getColorValue?: AggregateAccessor<DataT> | null;
+    /**
+     * The weight of a data object used to calculate the elevation value for a cell.
+     * @default 1
+     */
+    getElevationWeight?: Accessor<DataT, number>;
+    /**
+     * After data objects are aggregated into cells, this accessor is called on each cell to get the value that its elevation is based on.
+     * Not supported by GPU aggregation.
+     * @default null
+     */
+    getElevationValue?: AggregateAccessor<DataT> | null;
+    /**
+     * This callback will be called when bin color domain has been calculated.
+     * @default () => {}
+     */
+    onSetColorDomain?: (minMax: [number, number]) => void;
+    /**
+     * This callback will be called when bin elevation domain has been calculated.
+     * @default () => {}
+     */
+    onSetElevationDomain?: (minMax: [number, number]) => void;
     /**
      * When set to true, aggregation is performed on GPU, provided other conditions are met.
-     * @default false
+     * @default true
      */
     gpuAggregation?: boolean;
 };
+export type GridLayerPickingInfo<DataT> = PickingInfo<{
+    /** Column index of the picked cell */
+    col: number;
+    /** Row index of the picked cell */
+    row: number;
+    /** Aggregated color value, as determined by `getColorWeight` and `colorAggregation` */
+    colorValue: number;
+    /** Aggregated elevation value, as determined by `getElevationWeight` and `elevationAggregation` */
+    elevationValue: number;
+    /** Number of data points in the picked cell */
+    count: number;
+    /** Indices of the data objects in the picked cell. Only available if using CPU aggregation. */
+    pointIndices?: number[];
+    /** The data objects in the picked cell. Only available if using CPU aggregation and layer data is an array. */
+    points?: DataT[];
+}>;
 /** Aggregate data into a grid-based heatmap. The color and height of a cell are determined based on the objects it contains. */
-export default class GridLayer<DataT = any, ExtraPropsT extends {} = {}> extends CompositeLayer<ExtraPropsT & Required<_GridLayerProps<DataT>>> {
+export default class GridLayer<DataT = any, ExtraPropsT extends {} = {}> extends AggregationLayer<DataT, ExtraPropsT & Required<_GridLayerProps<DataT>>> {
     static layerName: string;
     static defaultProps: DefaultProps<GridLayerProps<unknown>>;
-    state: CompositeLayer['state'] & {
-        useGPUAggregation: boolean;
+    state: AggregationLayer<DataT>['state'] & BinOptions & {
+        dataAsArray?: DataT[];
+        colors?: AttributeWithScale;
+        elevations?: AttributeWithScale;
+        binIdRange: [number, number][];
+        aggregatorViewport: Viewport;
     };
+    getAggregatorType(): string;
+    createAggregator(type: string): WebGLAggregator | CPUAggregator;
     initializeState(): void;
-    updateState({ props }: UpdateParameters<this>): void;
-    renderLayers(): Layer;
-    canUseGPUAggregation(props: GridLayer['props']): boolean;
+    updateState(params: UpdateParameters<this>): boolean;
+    private _updateBinOptions;
+    draw(opts: any): void;
+    private _onAggregationUpdate;
+    onAttributeChange(id: string): void;
+    renderLayers(): LayersList | Layer | null;
+    getPickingInfo(params: GetPickingInfoParams): GridLayerPickingInfo<DataT>;
 }
 export {};
 //# sourceMappingURL=grid-layer.d.ts.map

package/dist/grid-layer/grid-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-layer.d.ts","sourceRoot":"","sources":["../../src/grid-layer/grid-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,KAAK,EACL,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAC;AAEvB,OAAqB,EAAC,iBAAiB,EAAC,4CAAyC;AACjF,OAAqB,EAAC,iBAAiB,EAAC,4CAAyC;AAQjF,6CAA6C;AAC7C,MAAM,MAAM,cAAc,CAAC,KAAK,GAAG,OAAO,IAAI,eAAe,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC;AAE3F,qCAAqC;AACrC,KAAK,eAAe,CAAC,KAAK,IAAI,iBAAiB,CAAC,KAAK,CAAC,GACpD,iBAAiB,CAAC,KAAK,CAAC,GAAG;IACzB;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEJ,gIAAgI;AAChI,MAAM,CAAC,OAAO,OAAO,SAAS,CAAC,KAAK,GAAG,GAAG,EAAE,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CAC7F,WAAW,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAC/C;IACC,MAAM,CAAC,SAAS,SAAe;IAC/B,MAAM,CAAC,YAAY,wCAAgB;IAEnC,KAAK,EAAG,cAAc,CAAC,OAAO,CAAC,GAAG;QAChC,iBAAiB,EAAE,OAAO,CAAC;KAC5B,CAAC;IAEF,eAAe;IAMf,WAAW,CAAC,EAAC,KAAK,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAQ3C,YAAY,IAAI,KAAK;IAoBrB,oBAAoB,CAAC,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC;CA8B/C"}
+{"version":3,"file":"grid-layer.d.ts","sourceRoot":"","sources":["../../src/grid-layer/grid-layer.ts"],"names":[],"mappings":"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"}