@deck.gl/aggregation-layers 8.8.0-alpha.6 → 8.8.0-beta.3

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

@@ -1,96 +1,116 @@
-declare class HeatmapLayer extends AggregationLayer {
-    _updateHeatmapState(opts: any): void;
-    _getChangeFlags(opts: any): {
-        dataChanged: boolean;
-        viewportChanged: any;
-        viewportZoomChanged: boolean;
+import { Buffer, Texture2D } from '@luma.gl/core';
+import { Accessor, AccessorFunction, AttributeManager, ChangeFlags, Color, Layer, LayerContext, LayersList, Position, UpdateParameters, DefaultProps } from '@deck.gl/core/typed';
+import AggregationLayer, { AggregationLayerProps } from '../aggregation-layer';
+export declare type HeatmapLayerProps<DataT = any> = _HeatmapLayerProps<DataT> & AggregationLayerProps<DataT>;
+declare type _HeatmapLayerProps<DataT> = {
+    /**
+     * Radius of the circle in pixels, to which the weight of an object is distributed.
+     *
+     * @default 30
+     */
+    radiusPixels?: number;
+    /**
+     * Specified as an array of colors [color1, color2, ...].
+     *
+     * @default `6-class YlOrRd` - [colorbrewer](http://colorbrewer2.org/#type=sequential&scheme=YlOrRd&n=6)
+     */
+    colorRange?: Color[];
+    /**
+     * Value that is multiplied with the total weight at a pixel to obtain the final weight.
+     *
+     * @default 1
+     */
+    intensity?: number;
+    /**
+     * Ratio of the fading weight to the max weight, between `0` and `1`.
+     *
+     * For example, `0.1` affects all pixels with weight under 10% of the max.
+     *
+     * Ignored when `colorDomain` is specified.
+     * @default 0.05
+     */
+    threshold?: number;
+    /**
+     * Controls how weight values are mapped to the `colorRange`, as an array of two numbers [`minValue`, `maxValue`].
+     *
+     * @default null
+     */
+    colorDomain?: [number, number] | null;
+    /**
+     * Defines the type of aggregation operation
+     *
+     * V valid values are 'SUM', 'MEAN'.
+     *
+     * @default 'SUM'
+     */
+    aggregation?: 'SUM' | 'MEAN';
+    /**
+     * Specifies the size of weight texture.
+     * @default 2048
+     */
+    weightsTextureSize?: number;
+    /**
+     * Interval in milliseconds during which changes to the viewport don't trigger aggregation.
+     *
+     * @default 500
+     */
+    debounceTimeout?: number;
+    /**
+     * Method called to retrieve the position of each object.
+     *
+     * @default d => d.position
+     */
+    getPosition?: AccessorFunction<DataT, Position>;
+    /**
+     * The weight of each object.
+     *
+     * @default 1
+     */
+    getWeight?: Accessor<DataT, number>;
+};
+export default class HeatmapLayer<DataT = any, ExtraPropsT = {}> extends AggregationLayer<ExtraPropsT & Required<_HeatmapLayerProps<DataT>>> {
+    static layerName: string;
+    static defaultProps: DefaultProps<HeatmapLayerProps<any>>;
+    state: AggregationLayer['state'] & {
+        supported: boolean;
+        colorDomain?: number[];
+        isWeightMapDirty?: boolean;
+        weightsTexture?: Texture2D;
+        zoom?: number;
+        worldBounds?: number[];
+        normalizedCommonBounds?: number[];
+        updateTimer?: any;
+        triPositionBuffer?: Buffer;
+        triTexCoordBuffer?: Buffer;
+    };
+    initializeState(): void;
+    shouldUpdateState({ changeFlags }: UpdateParameters<this>): boolean;
+    updateState(opts: UpdateParameters<this>): void;
+    _updateHeatmapState(opts: UpdateParameters<this>): void;
+    renderLayers(): LayersList | Layer;
+    finalizeState(context: LayerContext): void;
+    _getAttributeManager(): AttributeManager;
+    _getChangeFlags(opts: UpdateParameters<this>): Partial<ChangeFlags> & {
+        boundsChanged?: boolean | undefined;
+        viewportZoomChanged?: boolean | undefined;
     };
     _createTextures(): void;
     _setupAttributes(): void;
     _setupTextureParams(): void;
+    getShaders(type: any): any;
     _createWeightsTransform(shaders?: {}): void;
     _setupResources(): void;
+    updateShaders(shaderOptions: any): void;
     _updateMaxWeightValue(): void;
-    _updateBounds(forceUpdate?: boolean): boolean;
+    _updateBounds(forceUpdate?: any): boolean;
     _updateTextureRenderingBounds(): void;
     _updateColorTexture(opts: any): void;
     _updateWeightmap(): void;
     _debouncedUpdateWeightmap(fromTimer?: boolean): void;
-    _worldToCommonBounds(worldBounds: any, opts?: {}): number[];
+    _worldToCommonBounds(worldBounds: any, opts?: {
+        useLayerCoordinateSystem?: boolean;
+    }): number[];
     _commonToWorldBounds(commonBounds: any): number[];
 }
-declare namespace HeatmapLayer {
-    export const layerName: string;
-    export { defaultProps };
-}
-export default HeatmapLayer;
-import AggregationLayer from "../aggregation-layer";
-declare namespace defaultProps {
-    export namespace getPosition {
-        const type: string;
-        function value(x: any): any;
-    }
-    export namespace getWeight {
-        const type_1: string;
-        export { type_1 as type };
-        const value_1: number;
-        export { value_1 as value };
-    }
-    export namespace intensity {
-        const type_2: string;
-        export { type_2 as type };
-        export const min: number;
-        const value_2: number;
-        export { value_2 as value };
-    }
-    export namespace radiusPixels {
-        const type_3: string;
-        export { type_3 as type };
-        const min_1: number;
-        export { min_1 as min };
-        export const max: number;
-        const value_3: number;
-        export { value_3 as value };
-    }
-    export { defaultColorRange as colorRange };
-    export namespace threshold {
-        const type_4: string;
-        export { type_4 as type };
-        const min_2: number;
-        export { min_2 as min };
-        const max_1: number;
-        export { max_1 as max };
-        const value_4: number;
-        export { value_4 as value };
-    }
-    export namespace colorDomain {
-        const type_5: string;
-        export { type_5 as type };
-        const value_5: null;
-        export { value_5 as value };
-        export const optional: boolean;
-    }
-    export const aggregation: string;
-    export namespace weightsTextureSize {
-        const type_6: string;
-        export { type_6 as type };
-        const min_3: number;
-        export { min_3 as min };
-        const max_2: number;
-        export { max_2 as max };
-        const value_6: number;
-        export { value_6 as value };
-    }
-    export namespace debounceTimeout {
-        const type_7: string;
-        export { type_7 as type };
-        const min_4: number;
-        export { min_4 as min };
-        const max_3: number;
-        export { max_3 as max };
-        const value_7: number;
-        export { value_7 as value };
-    }
-}
-import { defaultColorRange } from "../utils/color-utils";
+export {};
 //# sourceMappingURL=heatmap-layer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"heatmap-layer.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/heatmap-layer.js"],"names":[],"mappings":"AAuFA;IA6BE,qCA4BC;IA+ED;;;;MAiBC;IAED,wBAcC;IAED,yBAOC;IAED,4BAcC;IAgBD,4CAcC;IAED,wBAkCC;IAQD,8BAUC;IAGD,8CAgDC;IAED,sCAaC;IAED,qCAmBC;IAED,yBAmDC;IAED,qDAiBC;IAKD,4DAsCC;IAID,kDAOC;CACF;;;;;;;;;;QAzgBwC,4BAAe"}
+{"version":3,"file":"heatmap-layer.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/heatmap-layer.ts"],"names":[],"mappings":"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"}

package/typed/heatmap-layer/max-fs.glsl.d.ts

@@ -1,3 +1,3 @@
-declare var _default: "varying vec4 outTexture;\nvoid main() {\n  gl_FragColor = outTexture;\n  gl_FragColor.g = outTexture.r / max(1.0, outTexture.a);\n}\n";
+declare const _default: "varying vec4 outTexture;\nvoid main() {\n  gl_FragColor = outTexture;\n  gl_FragColor.g = outTexture.r / max(1.0, outTexture.a);\n}\n";
 export default _default;
 //# sourceMappingURL=max-fs.glsl.d.ts.map

package/typed/heatmap-layer/max-fs.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"max-fs.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/max-fs.glsl.js"],"names":[],"mappings":""}
+{"version":3,"file":"max-fs.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/max-fs.glsl.ts"],"names":[],"mappings":";AAAA,wBAME"}

package/typed/heatmap-layer/max-vs.glsl.d.ts

@@ -1,3 +1,3 @@
-declare var _default: "attribute vec4 inTexture;\nvarying vec4 outTexture;\n\nvoid main()\n{\noutTexture = inTexture;\ngl_Position = vec4(0, 0, 0, 1.);\n// Enforce default value for ANGLE issue (https://bugs.chromium.org/p/angleproject/issues/detail?id=3941)\ngl_PointSize = 1.0;\n}\n";
+declare const _default: "attribute vec4 inTexture;\nvarying vec4 outTexture;\n\nvoid main()\n{\noutTexture = inTexture;\ngl_Position = vec4(0, 0, 0, 1.);\n// Enforce default value for ANGLE issue (https://bugs.chromium.org/p/angleproject/issues/detail?id=3941)\ngl_PointSize = 1.0;\n}\n";
 export default _default;
 //# sourceMappingURL=max-vs.glsl.d.ts.map

package/typed/heatmap-layer/max-vs.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"max-vs.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/max-vs.glsl.js"],"names":[],"mappings":""}
+{"version":3,"file":"max-vs.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/max-vs.glsl.ts"],"names":[],"mappings":";AAAA,wBAWE"}

package/typed/heatmap-layer/triangle-layer-fragment.glsl.d.ts

@@ -1,3 +1,3 @@
-declare var _default: "#define SHADER_NAME triangle-layer-fragment-shader\n\nprecision highp float;\n\nuniform float opacity;\nuniform sampler2D texture;\nuniform sampler2D colorTexture;\nuniform float aggregationMode;\n\nvarying vec2 vTexCoords;\nvarying float vIntensityMin;\nvarying float vIntensityMax;\n\nvec4 getLinearColor(float value) {\n  float factor = clamp(value * vIntensityMax, 0., 1.);\n  vec4 color = texture2D(colorTexture, vec2(factor, 0.5));\n  color.a *= min(value * vIntensityMin, 1.0);\n  return color;\n}\n\nvoid main(void) {\n  vec4 weights = texture2D(texture, vTexCoords);\n  float weight = weights.r;\n\n  if (aggregationMode > 0.5) {\n    weight /= max(1.0, weights.a);\n  }\n\n  // discard pixels with 0 weight.\n  if (weight <= 0.) {\n     discard;\n  }\n\n  vec4 linearColor = getLinearColor(weight);\n  linearColor.a *= opacity;\n  gl_FragColor =linearColor;\n}\n";
+declare const _default: "#define SHADER_NAME triangle-layer-fragment-shader\n\nprecision highp float;\n\nuniform float opacity;\nuniform sampler2D texture;\nuniform sampler2D colorTexture;\nuniform float aggregationMode;\n\nvarying vec2 vTexCoords;\nvarying float vIntensityMin;\nvarying float vIntensityMax;\n\nvec4 getLinearColor(float value) {\n  float factor = clamp(value * vIntensityMax, 0., 1.);\n  vec4 color = texture2D(colorTexture, vec2(factor, 0.5));\n  color.a *= min(value * vIntensityMin, 1.0);\n  return color;\n}\n\nvoid main(void) {\n  vec4 weights = texture2D(texture, vTexCoords);\n  float weight = weights.r;\n\n  if (aggregationMode > 0.5) {\n    weight /= max(1.0, weights.a);\n  }\n\n  // discard pixels with 0 weight.\n  if (weight <= 0.) {\n     discard;\n  }\n\n  vec4 linearColor = getLinearColor(weight);\n  linearColor.a *= opacity;\n  gl_FragColor =linearColor;\n}\n";
 export default _default;
 //# sourceMappingURL=triangle-layer-fragment.glsl.d.ts.map

package/typed/heatmap-layer/triangle-layer-fragment.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"triangle-layer-fragment.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/triangle-layer-fragment.glsl.js"],"names":[],"mappings":""}
+{"version":3,"file":"triangle-layer-fragment.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/triangle-layer-fragment.glsl.ts"],"names":[],"mappings":";AAoBA,wBAsCE"}

package/typed/heatmap-layer/triangle-layer-vertex.glsl.d.ts

@@ -1,3 +1,3 @@
-declare var _default: "#define SHADER_NAME heatp-map-layer-vertex-shader\n\nuniform sampler2D maxTexture;\nuniform float intensity;\nuniform vec2 colorDomain;\nuniform float threshold;\nuniform float aggregationMode;\n\nattribute vec3 positions;\nattribute vec2 texCoords;\n\nvarying vec2 vTexCoords;\nvarying float vIntensityMin;\nvarying float vIntensityMax;\n\nvoid main(void) {\n  gl_Position = project_position_to_clipspace(positions, vec3(0.0), vec3(0.0));\n  vTexCoords = texCoords;\n  vec4 maxTexture = texture2D(maxTexture, vec2(0.5));\n  float maxValue = aggregationMode < 0.5 ? maxTexture.r : maxTexture.g;\n  float minValue = maxValue * threshold;\n  if (colorDomain[1] > 0.) {\n    // if user specified custom domain use it.\n    maxValue = colorDomain[1];\n    minValue = colorDomain[0];\n  }\n  vIntensityMax = intensity / maxValue;\n  vIntensityMin = intensity / minValue;\n}\n";
+declare const _default: "#define SHADER_NAME heatp-map-layer-vertex-shader\n\nuniform sampler2D maxTexture;\nuniform float intensity;\nuniform vec2 colorDomain;\nuniform float threshold;\nuniform float aggregationMode;\n\nattribute vec3 positions;\nattribute vec2 texCoords;\n\nvarying vec2 vTexCoords;\nvarying float vIntensityMin;\nvarying float vIntensityMax;\n\nvoid main(void) {\n  gl_Position = project_position_to_clipspace(positions, vec3(0.0), vec3(0.0));\n  vTexCoords = texCoords;\n  vec4 maxTexture = texture2D(maxTexture, vec2(0.5));\n  float maxValue = aggregationMode < 0.5 ? maxTexture.r : maxTexture.g;\n  float minValue = maxValue * threshold;\n  if (colorDomain[1] > 0.) {\n    // if user specified custom domain use it.\n    maxValue = colorDomain[1];\n    minValue = colorDomain[0];\n  }\n  vIntensityMax = intensity / maxValue;\n  vIntensityMin = intensity / minValue;\n}\n";
 export default _default;
 //# sourceMappingURL=triangle-layer-vertex.glsl.d.ts.map

package/typed/heatmap-layer/triangle-layer-vertex.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"triangle-layer-vertex.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/triangle-layer-vertex.glsl.js"],"names":[],"mappings":""}
+{"version":3,"file":"triangle-layer-vertex.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/triangle-layer-vertex.glsl.ts"],"names":[],"mappings":";AAsBA,wBA8BE"}

package/typed/heatmap-layer/triangle-layer.d.ts

@@ -1,10 +1,27 @@
-declare class TriangleLayer extends Layer<any> {
-    constructor(...propObjects: Partial<any>[]);
-    _getModel(gl: any): any;
+import { Model, Texture2D } from '@luma.gl/core';
+import { Layer, LayerContext } from '@deck.gl/core/typed';
+declare type _TriangleLayerProps = {
+    colorDomain: number[];
+    aggregationMode: string;
+    threshold: number;
+    intensity: number;
+    vertexCount: number;
+    colorTexture: Texture2D;
+    maxTexture: Texture2D;
+    texture: Texture2D;
+};
+export default class TriangleLayer extends Layer<_TriangleLayerProps> {
+    static layerName: string;
+    getShaders(): {
+        vs: string;
+        fs: string;
+        modules: import("@deck.gl/core")._ShaderModule<any>[];
+    };
+    initializeState({ gl }: LayerContext): void;
+    _getModel(gl: WebGLRenderingContext): Model;
+    draw({ uniforms }: {
+        uniforms: any;
+    }): void;
 }
-declare namespace TriangleLayer {
-    const layerName: string;
-}
-export default TriangleLayer;
-import { Layer } from '@deck.gl/core/typed';
+export {};
 //# sourceMappingURL=triangle-layer.d.ts.map

package/typed/heatmap-layer/triangle-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"triangle-layer.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/triangle-layer.js"],"names":[],"mappings":"AA0BA;IAhBoB,4CAEN;IA+BZ,wBAWC;CAqBF"}
+{"version":3,"file":"triangle-layer.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/triangle-layer.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,KAAK,EAAY,SAAS,EAAC,MAAM,eAAe,CAAC;AACzD,OAAO,EAAC,KAAK,EAAE,YAAY,EAAY,MAAM,eAAe,CAAC;AAI7D,aAAK,mBAAmB,GAAG;IACzB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,SAAS,CAAC;IACxB,UAAU,EAAE,SAAS,CAAC;IACtB,OAAO,EAAE,SAAS,CAAC;CACpB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,KAAK,CAAC,mBAAmB,CAAC;IACnE,MAAM,CAAC,SAAS,SAAmB;IAEnC,UAAU;;;;;IAIV,eAAe,CAAC,EAAC,EAAE,EAAC,EAAE,YAAY,GAAG,IAAI;IAWzC,SAAS,CAAC,EAAE,EAAE,qBAAqB,GAAG,KAAK;IAa3C,IAAI,CAAC,EAAC,QAAQ,EAAC;;KAAA,GAAG,IAAI;CAmBvB"}

package/typed/heatmap-layer/weights-fs.glsl.d.ts

@@ -1,3 +1,3 @@
-declare var _default: "varying vec4 weightsTexture;\n// Epanechnikov function, keeping for reference\n// float epanechnikovKDE(float u) {\n//   return 0.75 * (1.0 - u * u);\n// }\nfloat gaussianKDE(float u){\n  return pow(2.71828, -u*u/0.05555)/(1.77245385*0.166666);\n}\nvoid main()\n{\n  float dist = length(gl_PointCoord - vec2(0.5, 0.5));\n  if (dist > 0.5) {\n    discard;\n  }\n  gl_FragColor = weightsTexture * gaussianKDE(2. * dist);\n  DECKGL_FILTER_COLOR(gl_FragColor, geometry);\n}\n";
+declare const _default: "varying vec4 weightsTexture;\n// Epanechnikov function, keeping for reference\n// float epanechnikovKDE(float u) {\n//   return 0.75 * (1.0 - u * u);\n// }\nfloat gaussianKDE(float u){\n  return pow(2.71828, -u*u/0.05555)/(1.77245385*0.166666);\n}\nvoid main()\n{\n  float dist = length(gl_PointCoord - vec2(0.5, 0.5));\n  if (dist > 0.5) {\n    discard;\n  }\n  gl_FragColor = weightsTexture * gaussianKDE(2. * dist);\n  DECKGL_FILTER_COLOR(gl_FragColor, geometry);\n}\n";
 export default _default;
 //# sourceMappingURL=weights-fs.glsl.d.ts.map

package/typed/heatmap-layer/weights-fs.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"weights-fs.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/weights-fs.glsl.js"],"names":[],"mappings":""}
+{"version":3,"file":"weights-fs.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/weights-fs.glsl.ts"],"names":[],"mappings":";AAAA,wBAkBE"}

package/typed/heatmap-layer/weights-vs.glsl.d.ts

@@ -1,3 +1,3 @@
-declare var _default: "attribute vec3 positions;\nattribute vec3 positions64Low;\nattribute float weights;\nvarying vec4 weightsTexture;\nuniform float radiusPixels;\nuniform float textureWidth;\nuniform vec4 commonBounds;\nuniform float weightsScale;\nvoid main()\n{\n  weightsTexture = vec4(weights * weightsScale, 0., 0., 1.);\n\n  float radiusTexels  = project_pixel_size(radiusPixels) * textureWidth / (commonBounds.z - commonBounds.x);\n  gl_PointSize = radiusTexels * 2.;\n\n  vec3 commonPosition = project_position(positions, positions64Low);\n\n  // map xy from commonBounds to [-1, 1]\n  gl_Position.xy = (commonPosition.xy - commonBounds.xy) / (commonBounds.zw - commonBounds.xy) ;\n  gl_Position.xy = (gl_Position.xy * 2.) - (1.);\n}\n";
+declare const _default: "attribute vec3 positions;\nattribute vec3 positions64Low;\nattribute float weights;\nvarying vec4 weightsTexture;\nuniform float radiusPixels;\nuniform float textureWidth;\nuniform vec4 commonBounds;\nuniform float weightsScale;\nvoid main()\n{\n  weightsTexture = vec4(weights * weightsScale, 0., 0., 1.);\n\n  float radiusTexels  = project_pixel_size(radiusPixels) * textureWidth / (commonBounds.z - commonBounds.x);\n  gl_PointSize = radiusTexels * 2.;\n\n  vec3 commonPosition = project_position(positions, positions64Low);\n\n  // map xy from commonBounds to [-1, 1]\n  gl_Position.xy = (commonPosition.xy - commonBounds.xy) / (commonBounds.zw - commonBounds.xy) ;\n  gl_Position.xy = (gl_Position.xy * 2.) - (1.);\n}\n";
 export default _default;
 //# sourceMappingURL=weights-vs.glsl.d.ts.map

package/typed/heatmap-layer/weights-vs.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"weights-vs.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/weights-vs.glsl.js"],"names":[],"mappings":""}
+{"version":3,"file":"weights-vs.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/weights-vs.glsl.ts"],"names":[],"mappings":";AAAA,wBAsBE"}

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

@@ -1,130 +1,165 @@
-declare class HexagonLayer extends AggregationLayer {
+import { Accessor, AccessorFunction, Color, Position, Material, UpdateParameters, DefaultProps } from '@deck.gl/core/typed';
+import { ColumnLayer } from '@deck.gl/layers/typed';
+import CPUAggregator from '../utils/cpu-aggregator';
+import AggregationLayer, { AggregationLayerProps } from '../aggregation-layer';
+import { AggregateAccessor } from '../types';
+/** All properties supported by by HexagonLayer. */
+export declare type HexagonLayerProps<DataT = any> = _HexagonLayerProps<DataT> & AggregationLayerProps<DataT>;
+/** Properties added by HexagonLayer. */
+declare type _HexagonLayerProps<DataT = any> = {
+    /**
+     * Radius of hexagon bin in meters. The hexagons are pointy-topped (rather than flat-topped).
+     * @default 1000
+     */
+    radius?: number;
+    /**
+     * Function to aggregate data into hexagonal bins.
+     * @default d3-hexbin
+     */
+    hexagonAggregator?: (props: any, params: any) => any;
+    /**
+     * Color scale input domain.
+     * @default [min(colorWeight), max(colorWeight)]
+     */
+    colorDomain?: [number, number] | null;
+    /**
+     * Specified as an array of colors [color1, color2, ...].
+     * @default `6-class YlOrRd` - [colorbrewer](http://colorbrewer2.org/#type=sequential&scheme=YlOrRd&n=6)
+     */
+    colorRange?: Color[];
+    /**
+     * Hexagon radius multiplier, clamped between 0 - 1.
+     * @default 1
+     */
+    coverage?: number;
+    /**
+     * Elevation scale input domain. The elevation scale is a linear scale that maps number of counts to elevation.
+     * @default [0, max(elevationWeight)]
+     */
+    elevationDomain?: [number, number] | null;
+    /**
+     * Elevation scale output range.
+     * @default [0, 1000]
+     */
+    elevationRange?: [number, number];
+    /**
+     * Hexagon elevation multiplier.
+     * @default 1
+     */
+    elevationScale?: number;
+    /**
+     * Whether to enable cell elevation. If set to false, all cell will be flat.
+     * @default false
+     */
+    extruded?: boolean;
+    /**
+     * Filter bins and re-calculate color by `upperPercentile`.
+     * Hexagons with color value larger than the `upperPercentile` will be hidden.
+     * @default 100
+     */
+    upperPercentile?: number;
+    /**
+     * Filter bins and re-calculate color by `lowerPercentile`.
+     * Hexagons with color value smaller than the `lowerPercentile` will be hidden.
+     * @default 0
+     */
+    lowerPercentile?: number;
+    /**
+     * Filter bins and re-calculate elevation by `elevationUpperPercentile`.
+     * Hexagons with elevation value larger than the `elevationUpperPercentile` will be hidden.
+     * @default 100
+     */
+    elevationUpperPercentile?: number;
+    /**
+     * Filter bins and re-calculate elevation by `elevationLowerPercentile`.
+     * Hexagons 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, default value is 'quantize'.
+     * Supported Values are 'quantize', 'quantile' and 'ordinal'.
+     * @default 'quantize'
+     */
+    colorScaleType?: 'quantize' | 'quantile' | 'ordinal';
+    /**
+     * 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?: Material;
+    /**
+     * Defines the operation used to aggregate all data object weights to calculate a cell's color value.
+     * @default 'SUM'
+     */
+    colorAggregation?: 'SUM' | 'MEAN' | 'MIN' | 'MAX';
+    /**
+     * Defines the operation used to aggregate all data object weights to calculate a cell's elevation value.
+     * @default 'SUM'
+     */
+    elevationAggregation?: 'SUM' | 'MEAN' | 'MIN' | 'MAX';
+    /**
+     * Method called to retrieve the position of each object.
+     * @default object => object.position
+     */
+    getPosition?: AccessorFunction<DataT, Position>;
+    /**
+     * The weight of a data object used to calculate the color value for a bin.
+     * @default 1
+     */
+    getColorWeight?: Accessor<DataT, number>;
+    /**
+     * After data objects are aggregated into bins, this accessor is called on each cell to get the value that its color is based on.
+     * @default null
+     */
+    getColorValue?: AggregateAccessor<DataT> | null;
+    /**
+     * The weight of a data object used to calculate the elevation value for a bin.
+     * @default 1
+     */
+    getElevationWeight?: Accessor<DataT, number>;
+    /**
+     * After data objects are aggregated into bins, this accessor is called on each cell to get the value that its elevation is based on.
+     * @default null
+     */
+    getElevationValue?: AggregateAccessor<DataT> | null;
+    /**
+     * This callback will be called when cell color domain has been calculated.
+     * @default () => {}
+     */
+    onSetColorDomain?: (minMax: [number, number]) => void;
+    /**
+     * This callback will be called when cell elevation domain has been calculated.
+     * @default () => {}
+     */
+    onSetElevationDomain?: (minMax: [number, number]) => void;
+    /**
+     * (Experimental) Filter data objects
+     */
+    _filterData: null | ((d: DataT) => boolean);
+};
+export default class HexagonLayer<ExtraPropsT = {}> extends AggregationLayer<ExtraPropsT & Required<_HexagonLayerProps>> {
+    static layerName: string;
+    static defaultProps: DefaultProps<HexagonLayerProps<any>>;
+    state: AggregationLayer['state'] & {
+        cpuAggregator: CPUAggregator;
+        aggregatorState: any;
+    };
+    initializeState(): void;
+    updateState(opts: UpdateParameters<this>): void;
     convertLatLngToMeterOffset(hexagonVertices: any): number[][] | null;
+    getPickingInfo({ info }: {
+        info: any;
+    }): any;
     _onGetSublayerColor(cell: any): any;
     _onGetSublayerElevation(cell: any): any;
-    _getSublayerUpdateTriggers(): any;
+    _getSublayerUpdateTriggers(): {};
+    renderLayers(): ColumnLayer<any, {}>;
 }
-declare namespace HexagonLayer {
-    export const layerName: string;
-    export { defaultProps };
-}
-export default HexagonLayer;
-import AggregationLayer from "../aggregation-layer";
-declare namespace defaultProps {
-    export const colorDomain: null;
-    export { defaultColorRange as colorRange };
-    export namespace getColorValue {
-        const type: string;
-        const value: null;
-    }
-    export namespace getColorWeight {
-        const type_1: string;
-        export { type_1 as type };
-        const value_1: number;
-        export { value_1 as value };
-    }
-    export const colorAggregation: string;
-    export namespace lowerPercentile {
-        const type_2: string;
-        export { type_2 as type };
-        const value_2: number;
-        export { value_2 as value };
-        export const min: number;
-        export const max: number;
-    }
-    export namespace upperPercentile {
-        const type_3: string;
-        export { type_3 as type };
-        const value_3: number;
-        export { value_3 as value };
-        const min_1: number;
-        export { min_1 as min };
-        const max_1: number;
-        export { max_1 as max };
-    }
-    export const colorScaleType: string;
-    export { nop as onSetColorDomain };
-    export const elevationDomain: null;
-    export const elevationRange: number[];
-    export namespace getElevationValue {
-        const type_4: string;
-        export { type_4 as type };
-        const value_4: null;
-        export { value_4 as value };
-    }
-    export namespace getElevationWeight {
-        const type_5: string;
-        export { type_5 as type };
-        const value_5: number;
-        export { value_5 as value };
-    }
-    export const elevationAggregation: string;
-    export namespace elevationLowerPercentile {
-        const type_6: string;
-        export { type_6 as type };
-        const value_6: number;
-        export { value_6 as value };
-        const min_2: number;
-        export { min_2 as min };
-        const max_2: number;
-        export { max_2 as max };
-    }
-    export namespace elevationUpperPercentile {
-        const type_7: string;
-        export { type_7 as type };
-        const value_7: number;
-        export { value_7 as value };
-        const min_3: number;
-        export { min_3 as min };
-        const max_3: number;
-        export { max_3 as max };
-    }
-    export namespace elevationScale {
-        const type_8: string;
-        export { type_8 as type };
-        const min_4: number;
-        export { min_4 as min };
-        const value_8: number;
-        export { value_8 as value };
-    }
-    export const elevationScaleType: string;
-    export { nop as onSetElevationDomain };
-    export namespace radius {
-        const type_9: string;
-        export { type_9 as type };
-        const value_9: number;
-        export { value_9 as value };
-        const min_5: number;
-        export { min_5 as min };
-    }
-    export namespace coverage {
-        const type_10: string;
-        export { type_10 as type };
-        const min_6: number;
-        export { min_6 as min };
-        const max_4: number;
-        export { max_4 as max };
-        const value_10: number;
-        export { value_10 as value };
-    }
-    export const extruded: boolean;
-    export { pointToHexbin as hexagonAggregator };
-    export namespace getPosition {
-        const type_11: string;
-        export { type_11 as type };
-        export function value_11(x: any): any;
-        export { value_11 as value };
-    }
-    export const material: boolean;
-    export namespace _filterData {
-        const type_12: string;
-        export { type_12 as type };
-        const value_12: null;
-        export { value_12 as value };
-        export const optional: boolean;
-    }
-}
-import { defaultColorRange } from "../utils/color-utils";
-declare function nop(): void;
-import { pointToHexbin } from "./hexagon-aggregator";
+export {};
 //# sourceMappingURL=hexagon-layer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"hexagon-layer.d.ts","sourceRoot":"","sources":["../../src/hexagon-layer/hexagon-layer.js"],"names":[],"mappings":"AAqEA;IA4CE,oEA2BC;IAOD,oCAEC;IAGD,wCAEC;IAED,kCAEC;CA0CF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA3IwC,sCAAe;;;;;;;;;;;;;AA9BxD,6BAAiB"}
+{"version":3,"file":"hexagon-layer.d.ts","sourceRoot":"","sources":["../../src/hexagon-layer/hexagon-layer.ts"],"names":[],"mappings":"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"}

package/typed/index.d.ts

@@ -10,4 +10,11 @@ export { default as _GPUGridAggregator } from './utils/gpu-grid-aggregation/gpu-
 export { default as _CPUAggregator } from './utils/cpu-aggregator';
 export { default as _AggregationLayer } from './aggregation-layer';
 export { default as _BinSorter } from './utils/bin-sorter';
+export type { ContourLayerProps } from './contour-layer/contour-layer';
+export type { HeatmapLayerProps } from './heatmap-layer/heatmap-layer';
+export type { HexagonLayerProps } from './hexagon-layer/hexagon-layer';
+export type { CPUGridLayerProps } from './cpu-grid-layer/cpu-grid-layer';
+export type { GridLayerProps } from './grid-layer/grid-layer';
+export type { GPUGridLayerProps } from './gpu-grid-layer/gpu-grid-layer';
+export type { ScreenGridLayerProps } from './screen-grid-layer/screen-grid-layer';
 //# sourceMappingURL=index.d.ts.map

package/typed/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAC,qBAAqB,EAAC,MAAM,qCAAqC,CAAC;AAG1E,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,kBAAkB,EAAC,MAAM,kDAAkD,CAAC;AAC/F,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAC,OAAO,IAAI,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAC,qBAAqB,EAAC,MAAM,qCAAqC,CAAC;AAG1E,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,kBAAkB,EAAC,MAAM,kDAAkD,CAAC;AAC/F,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAC,OAAO,IAAI,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAGzD,YAAY,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AACrE,YAAY,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AACrE,YAAY,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AACrE,YAAY,EAAC,iBAAiB,EAAC,MAAM,iCAAiC,CAAC;AACvE,YAAY,EAAC,cAAc,EAAC,MAAM,yBAAyB,CAAC;AAC5D,YAAY,EAAC,iBAAiB,EAAC,MAAM,iCAAiC,CAAC;AACvE,YAAY,EAAC,oBAAoB,EAAC,MAAM,uCAAuC,CAAC"}