@deck.gl/aggregation-layers 8.10.0-alpha.7 → 9.0.0-alpha.3

package/src/utils/gpu-grid-aggregation/{gpu-grid-aggregator.js → gpu-grid-aggregator.ts}

@@ -18,18 +18,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import GL from '@luma.gl/constants';
-import {
-  Model,
-  Transform,
-  FEATURES,
-  hasFeatures,
-  isWebGL2,
-  readPixelsToBuffer,
-  withParameters
-} from '@luma.gl/core';
+import type {Device, DeviceFeature} from '@luma.gl/core';
+import {Model, Transform} from '@luma.gl/engine';
 import {fp64arithmetic} from '@luma.gl/shadertools';
-import {log, project32, _mergeShaders as mergeShaders} from '@deck.gl/core';
+import {readPixelsToBuffer, withGLParameters, clear} from '@luma.gl/webgl';
+import {GL} from '@luma.gl/constants';
+import {log, project32, _mergeShaders as mergeShaders, getShaderAssembler} from '@deck.gl/core';
 
 import {
   DEFAULT_RUN_PARAMS,
@@ -48,7 +42,7 @@ import AGGREGATE_TO_GRID_FS from './aggregate-to-grid-fs.glsl';
 import AGGREGATE_ALL_VS from './aggregate-all-vs.glsl';
 import AGGREGATE_ALL_FS from './aggregate-all-fs.glsl';
 import TRANSFORM_MEAN_VS from './transform-mean-vs.glsl';
-import {getFloatTexture, getFramebuffer} from './../resource-utils.js';
+import {getFloatTexture, getFramebuffer} from './../resource-utils';
 
 const BUFFER_NAMES = ['aggregationBuffer', 'maxMinBuffer', 'minBuffer', 'maxBuffer'];
 const ARRAY_BUFFER_MAP = {
@@ -57,19 +51,35 @@ const ARRAY_BUFFER_MAP = {
   maxMinData: 'maxMinBuffer'
 };
 
-const REQUIRED_FEATURES = [
-  FEATURES.WEBGL2, // TODO: Remove after trannsform refactor
-  FEATURES.COLOR_ATTACHMENT_RGBA32F,
-  FEATURES.BLEND_EQUATION_MINMAX,
-  FEATURES.FLOAT_BLEND,
-  FEATURES.TEXTURE_FLOAT
+const REQUIRED_FEATURES: DeviceFeature[] = [
+  'webgl2',
+  'blend-minmax-webgl1',
+  'texture-renderable-float32-webgl',
+  'texture-blend-float-webgl1',
+  'texture-formats-float32-webgl1'
 ];
 
+export type GPUGridAggregatorProps = {
+  id?: string;
+};
+
 export default class GPUGridAggregator {
   // Decode and return aggregation data of given pixel.
-  static getAggregationData({aggregationData, maxData, minData, maxMinData, pixelIndex}) {
+  static getAggregationData({
+    aggregationData,
+    maxData,
+    minData,
+    maxMinData,
+    pixelIndex
+  }: {
+    aggregationData?: Float32Array;
+    maxData?: Float32Array;
+    minData?: Float32Array;
+    maxMinData?: Float32Array;
+    pixelIndex: number;
+  }) {
     const index = pixelIndex * PIXEL_SIZE;
-    const results = {};
+    const results: {cellCount?; cellWeight?; maxCellWieght?; minCellWeight?; totalCount?} = {};
     if (aggregationData) {
       results.cellCount = aggregationData[index + 3];
       results.cellWeight = aggregationData[index];
@@ -84,7 +94,7 @@ export default class GPUGridAggregator {
       }
       if (minData) {
         results.minCellWeight = minData[0];
-        results.totalCount = maxData[3];
+        results.totalCount = minData[3];
       }
     }
     return results;
@@ -106,8 +116,8 @@ export default class GPUGridAggregator {
     return {cellCounts, cellWeights};
   }
 
-  static isSupported(gl) {
-    return hasFeatures(gl, REQUIRED_FEATURES);
+  static isSupported(device: Device) {
+    return REQUIRED_FEATURES.every(feature => device.features.has(feature));
   }
 
   // DEBUG ONLY
@@ -135,35 +145,50 @@ export default class GPUGridAggregator {
   //   }
   // }
 
-  constructor(gl, opts = {}) {
-    this.id = opts.id || 'gpu-grid-aggregator';
-    this.gl = gl;
-    this.state = {
-      // per weight GPU resources
-      weightAttributes: {},
-      textures: {},
-      meanTextures: {},
-      buffers: {},
-      framebuffers: {},
-      maxMinFramebuffers: {},
-      minFramebuffers: {},
-      maxFramebuffers: {},
-      equations: {},
-
-      // common resources to be deleted
-      resources: {},
-
-      // results
-      results: {}
-    };
+  state = {
+    // per weight GPU resources
+    weightAttributes: {},
+    textures: {},
+    meanTextures: {},
+    buffers: {},
+    framebuffers: {},
+    maxMinFramebuffers: {},
+    minFramebuffers: {},
+    maxFramebuffers: {},
+    equations: {},
+
+    shaderOptions: {},
+    modelDirty: false,
+
+    // common resources to be deleted
+    resources: {},
+
+    // results
+    results: {}
+  };
+
+  id: string;
+  device: Device;
+  _hasGPUSupport: boolean;
+
+  gridAggregationModel;
+  allAggregationModel;
+  meanTransform;
+
+  constructor(device: Device, props: GPUGridAggregatorProps = {}) {
+    this.id = props.id || 'gpu-grid-aggregator';
+    this.device = device;
+
+    const REQUIRED_FEATURES: DeviceFeature[] = [
+      'blend-minmax-webgl1', // set min/max blend modes
+      'texture-renderable-float32-webgl', // render to float texture
+      'texture-formats-float32-webgl1' // sample from a float texture
+    ];
+
+    // gl_InstanceID usage in min/max calculation shaders
     this._hasGPUSupport =
-      isWebGL2(gl) && // gl_InstanceID usage in min/max calculation shaders
-      hasFeatures(
-        this.gl,
-        FEATURES.BLEND_EQUATION_MINMAX, // set min/max blend modes
-        FEATURES.COLOR_ATTACHMENT_RGBA32F, // render to float texture
-        FEATURES.TEXTURE_FLOAT // sample from a float texture
-      );
+      this.device.info.type === 'webgl2' &&
+      REQUIRED_FEATURES.every(feature => device.features.has(feature));
     if (this._hasGPUSupport) {
       this._setupModels();
     }
@@ -182,9 +207,9 @@ export default class GPUGridAggregator {
       resources
     } = this.state;
 
-    gridAggregationModel?.delete();
-    allAggregationModel?.delete();
-    meanTransform?.delete();
+    gridAggregationModel?.destroy();
+    allAggregationModel?.destroy();
+    meanTransform?.destroy();
 
     deleteResources([
       framebuffers,
@@ -212,7 +237,12 @@ export default class GPUGridAggregator {
   // For WebGL1, data is available in JS Array objects already.
   // For WebGL2, data is read from Buffer objects and cached for subsequent queries.
   getData(weightId) {
-    const data = {};
+    const data: {
+      aggregationData?: Float32Array;
+      maxData?: Float32Array;
+      minData?: Float32Array;
+      maxMinData?: Float32Array;
+    } = {};
     const results = this.state.results;
     if (!results[weightId].aggregationData) {
       // cache the results if reading from the buffer (WebGL2 path)
@@ -381,26 +411,24 @@ export default class GPUGridAggregator {
   _renderToMaxMinTexture(opts) {
     const {id, parameters, gridSize, minOrMaxFb, combineMaxMin, clearParams = {}} = opts;
     const {framebuffers} = this.state;
-    const {gl, allAggregationModel} = this;
+    const {allAggregationModel} = this;
 
-    withParameters(
-      gl,
+    withGLParameters(
+      this.device,
       {
         ...clearParams,
         framebuffer: minOrMaxFb,
         viewport: [0, 0, gridSize[0], gridSize[1]]
       },
       () => {
-        gl.clear(gl.COLOR_BUFFER_BIT);
-
-        allAggregationModel.draw({
-          parameters,
-          uniforms: {
-            uSampler: framebuffers[id].texture,
-            gridSize,
-            combineMaxMin
-          }
-        });
+        clear(this.device, {color: true});
+
+        // allAggregationModel.setParameters(parameters);
+        allAggregationModel.setUniforms({gridSize, combineMaxMin});
+        allAggregationModel.setBindings({uSampler: framebuffers[id].texture});
+        allAggregationModel.draw();
+        // TODO - we need to create a render pass for the aggregation
+        // allAggregationModel.draw(renderPass);
       }
     );
   }
@@ -409,22 +437,22 @@ export default class GPUGridAggregator {
   _renderToWeightsTexture(opts) {
     const {id, parameters, moduleSettings, uniforms, gridSize, weights} = opts;
     const {framebuffers, equations, weightAttributes} = this.state;
-    const {gl, gridAggregationModel} = this;
+    const {gridAggregationModel} = this;
     const {operation} = weights[id];
 
     const clearColor =
       operation === AGGREGATION_OPERATION.MIN
         ? [MAX_32_BIT_FLOAT, MAX_32_BIT_FLOAT, MAX_32_BIT_FLOAT, 0]
         : [0, 0, 0, 0];
-    withParameters(
-      gl,
+    withGLParameters(
+      this.device,
       {
         framebuffer: framebuffers[id],
         viewport: [0, 0, gridSize[0], gridSize[1]],
         clearColor
       },
       () => {
-        gl.clear(gl.COLOR_BUFFER_BIT);
+        clear(this.device, {color: true});
 
         const attributes = {weights: weightAttributes[id]};
         gridAggregationModel.draw({
@@ -446,7 +474,7 @@ export default class GPUGridAggregator {
       if (this.meanTransform) {
         this.meanTransform.update(transformOptions);
       } else {
-        this.meanTransform = getMeanTransform(gl, transformOptions);
+        this.meanTransform = getMeanTransform(this.device, transformOptions);
       }
       this.meanTransform.run({
         parameters: {
@@ -489,21 +517,21 @@ export default class GPUGridAggregator {
       textures[id] =
         weights[id].aggregationTexture ||
         textures[id] ||
-        getFloatTexture(this.gl, {id: `${id}-texture`, width: numCol, height: numRow});
+        getFloatTexture(this.device, {id: `${id}-texture`, width: numCol, height: numRow});
       textures[id].resize(framebufferSize);
       let texture = textures[id];
       if (operation === AGGREGATION_OPERATION.MEAN) {
         // For MEAN, we first aggregatet into a temp texture
         meanTextures[id] =
           meanTextures[id] ||
-          getFloatTexture(this.gl, {id: `${id}-mean-texture`, width: numCol, height: numRow});
+          getFloatTexture(this.device, {id: `${id}-mean-texture`, width: numCol, height: numRow});
         meanTextures[id].resize(framebufferSize);
         texture = meanTextures[id];
       }
       if (framebuffers[id]) {
         framebuffers[id].attach({[GL.COLOR_ATTACHMENT0]: texture});
       } else {
-        framebuffers[id] = getFramebuffer(this.gl, {
+        framebuffers[id] = getFramebuffer(this.device, {
           id: `${id}-fb`,
           width: numCol,
           height: numRow,
@@ -511,19 +539,19 @@ export default class GPUGridAggregator {
         });
       }
       framebuffers[id].resize(framebufferSize);
-      equations[id] = EQUATION_MAP[operation] || EQUATION_MAP.SUM;
+      equations[id] = EQUATION_MAP[operation] || EQUATION_MAP[AGGREGATION_OPERATION.SUM];
       // For min/max framebuffers will use default size 1X1
       if (needMin || needMax) {
         if (needMin && needMax && combineMaxMin) {
           if (!maxMinFramebuffers[id]) {
             texture = weights[id].maxMinTexture || this._getMinMaxTexture(`${id}-maxMinTexture`);
-            maxMinFramebuffers[id] = getFramebuffer(this.gl, {id: `${id}-maxMinFb`, texture});
+            maxMinFramebuffers[id] = getFramebuffer(this.device, {id: `${id}-maxMinFb`, texture});
           }
         } else {
           if (needMin) {
             if (!minFramebuffers[id]) {
               texture = weights[id].minTexture || this._getMinMaxTexture(`${id}-minTexture`);
-              minFramebuffers[id] = getFramebuffer(this.gl, {
+              minFramebuffers[id] = getFramebuffer(this.device, {
                 id: `${id}-minFb`,
                 texture
               });
@@ -532,7 +560,7 @@ export default class GPUGridAggregator {
           if (needMax) {
             if (!maxFramebuffers[id]) {
               texture = weights[id].maxTexture || this._getMinMaxTexture(`${id}-maxTexture`);
-              maxFramebuffers[id] = getFramebuffer(this.gl, {
+              maxFramebuffers[id] = getFramebuffer(this.device, {
                 id: `${id}-maxFb`,
                 texture
               });
@@ -547,19 +575,18 @@ export default class GPUGridAggregator {
   _getMinMaxTexture(name) {
     const {resources} = this.state;
     if (!resources[name]) {
-      resources[name] = getFloatTexture(this.gl, {id: `resourceName`});
+      resources[name] = getFloatTexture(this.device, {id: 'resourceName'});
     }
     return resources[name];
   }
 
   _setupModels({numCol = 0, numRow = 0} = {}) {
-    const {gl} = this;
     const {shaderOptions} = this.state;
-    this.gridAggregationModel?.delete();
-    this.gridAggregationModel = getAggregationModel(gl, shaderOptions);
+    this.gridAggregationModel?.destroy();
+    this.gridAggregationModel = getAggregationModel(this.device, shaderOptions);
     if (!this.allAggregationModel) {
       const instanceCount = numCol * numRow;
-      this.allAggregationModel = getAllAggregationModel(gl, instanceCount);
+      this.allAggregationModel = getAllAggregationModel(this.device, instanceCount);
     }
   }
 
@@ -572,7 +599,7 @@ export default class GPUGridAggregator {
     }
   }
 
-  // GPU Aggregation results are provided in Buffers, if new Buffer objects are created track them for later deletion.
+  /** GPU Aggregation results are provided in Buffers, if new Buffer objects are created track them for later deletion. */
   /* eslint-disable max-depth */
   _trackGPUResultBuffers(results, weights) {
     const {resources} = this.state;
@@ -632,7 +659,7 @@ function deleteResources(resources) {
   });
 }
 
-function getAggregationModel(gl, shaderOptions) {
+function getAggregationModel(device: Device, shaderOptions) {
   const shaders = mergeShaders(
     {
       vs: AGGREGATE_TO_GRID_VS,
@@ -642,32 +669,34 @@ function getAggregationModel(gl, shaderOptions) {
     shaderOptions
   );
 
-  return new Model(gl, {
-    id: 'Gird-Aggregation-Model',
+  return new Model(device, {
+    id: 'Grid-Aggregation-Model',
     vertexCount: 1,
     drawMode: GL.POINTS,
+    shaderAssembler: getShaderAssembler(),
     ...shaders
   });
 }
 
-function getAllAggregationModel(gl, instanceCount) {
-  return new Model(gl, {
+function getAllAggregationModel(device: Device, instanceCount: number): Model {
+  return new Model(device, {
     id: 'All-Aggregation-Model',
     vs: AGGREGATE_ALL_VS,
     fs: AGGREGATE_ALL_FS,
     modules: [fp64arithmetic],
     vertexCount: 1,
-    drawMode: GL.POINTS,
+    topology: 'point-list',
     isInstanced: true,
     instanceCount,
     attributes: {
+      // @ts-expect-error
       position: [0, 0]
     }
   });
 }
 
-function getMeanTransform(gl, opts) {
-  return new Transform(gl, {
+function getMeanTransform(device: Device, opts) {
+  return new Transform(device, {
     vs: TRANSFORM_MEAN_VS,
     _targetTextureVarying: 'meanValues',
     ...opts

package/src/utils/{grid-aggregation-utils.js → grid-aggregation-utils.ts}

@@ -6,7 +6,7 @@ function toFinite(n) {
 }
 
 // Parse input data to build positions, wights and bounding box.
-/* eslint-disable max-statements */
+/* eslint-disable-next-line max-statements */
 export function getBoundingBox(attributes, vertexCount) {
   // TODO - value might not exist (e.g. attribute transition)
   const positions = attributes.positions.value;

package/src/utils/resource-utils.ts

@@ -0,0 +1,59 @@
+import {Device, Sampler, SamplerProps} from '@luma.gl/core';
+
+const DEFAULT_PARAMETERS: SamplerProps = {
+  minFilter: 'nearest',
+  magFilter: 'nearest'
+};
+
+type FloatTextureOptions = {
+  id: string;
+  width?: number;
+  height?: number;
+  data?: any;
+  unpackFlipY?: boolean;
+  parameters?: SamplerProps;
+};
+
+// TODO - not working
+export function getFloatTexture(device: Device, opts: FloatTextureOptions) {
+  const {
+    width = 1,
+    height = 1,
+    data = null,
+    unpackFlipY = true,
+    parameters = DEFAULT_PARAMETERS
+  } = opts;
+  const texture = device.createTexture({
+    data,
+    format: 'rgba32float', // device.info.type === 'webgl2' ? 'rgba32float' : GL.RGBA,
+    // type: GL.FLOAT,
+    // border: 0,
+    mipmaps: false,
+    sampler: parameters,
+    // dataFormat: GL.RGBA,
+    width,
+    height
+    // ts-expect-error
+    // unpackFlipY
+  });
+  return texture;
+}
+
+export function getFramebuffer(device: Device, opts) {
+  const {id, width = 1, height = 1, texture} = opts;
+  const fb = device.createFramebuffer({
+    id,
+    width,
+    height,
+    colorAttachments: [texture]
+  });
+
+  return fb;
+}
+
+export function getFloatArray(array, size, fillValue = 0) {
+  if (!array || array.length < size) {
+    return new Float32Array(size).fill(fillValue);
+  }
+  return array;
+}

package/typed/aggregation-layer.d.ts

@@ -4,15 +4,16 @@ export declare type AggregationLayerProps<DataT> = CompositeLayerProps & {
 };
 export default abstract class AggregationLayer<DataT, ExtraPropsT extends {} = {}> extends CompositeLayer<Required<AggregationLayer<DataT>> & ExtraPropsT> {
     static layerName: string;
-    state: CompositeLayer['state'] & {
+    state: {
         ignoreProps?: Record<string, any>;
         dimensions?: any;
+        changedAttributes?: Record<string, any>;
     };
     initializeAggregationLayer(dimensions: any): void;
     updateState(opts: UpdateParameters<this>): void;
     updateAttributes(changedAttributes: any): void;
     getAttributes(): {
-        [id: string]: import("modules/core/src/lib/attribute/shader-attribute").IShaderAttribute;
+        [id: string]: import("modules/core/src/lib/attribute/attribute").default;
     };
     getModuleSettings(): any;
     updateShaders(shaders: any): void;
@@ -34,7 +35,7 @@ export default abstract class AggregationLayer<DataT, ExtraPropsT extends {} = {
      * @returns {Boolean} - `true` if attribute `name` is changed, `false` otherwise,
      *                       If `name` is not passed or `undefiend`, `true` if any attribute is changed, `false` otherwise
      **/
-    isAttributeChanged(name?: string): any;
+    isAttributeChanged(name?: string): boolean | undefined;
     _getAttributeManager(): AttributeManager;
 }
 //# sourceMappingURL=aggregation-layer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"aggregation-layer.d.ts","sourceRoot":"","sources":["../src/aggregation-layer.ts"],"names":[],"mappings":"AAoBA,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,eAAe,EAEf,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,eAAe,CAAC;AAIvB,oBAAY,qBAAqB,CAAC,KAAK,IAAI,mBAAmB,GAAG;IAC/D,IAAI,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,gBAAgB,CAC5C,KAAK,EACL,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,cAAc,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,GAAG,WAAW,CAAC;IACvE,MAAM,CAAC,SAAS,SAAsB;IAEtC,KAAK,EAAG,cAAc,CAAC,OAAO,CAAC,GAAG;QAChC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAClC,UAAU,CAAC,EAAE,GAAG,CAAC;KAClB,CAAC;IAEF,0BAA0B,CAAC,UAAU,EAAE,GAAG;IAU1C,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAexC,gBAAgB,CAAC,iBAAiB,KAAA;IAMlC,aAAa;;;IAIb,iBAAiB;IAcjB,aAAa,CAAC,OAAO,KAAA;IAIrB;;;;;;;QAOI;IACJ,kBAAkB,CAChB,UAAU,KAAA,EACV,MAAM,GAAE;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,GAAG,CAAA;KAAM,GACnD,MAAM,GAAG,OAAO;IAyCnB;;;;;QAKI;IACJ,kBAAkB,CAAC,IAAI,CAAC,EAAE,MAAM;IAYhC,oBAAoB;CAMrB"}
+{"version":3,"file":"aggregation-layer.d.ts","sourceRoot":"","sources":["../src/aggregation-layer.ts"],"names":[],"mappings":"AAoBA,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,eAAe,EAEf,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,eAAe,CAAC;AAGvB,oBAAY,qBAAqB,CAAC,KAAK,IAAI,mBAAmB,GAAG;IAC/D,IAAI,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,gBAAgB,CAC5C,KAAK,EACL,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,cAAc,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,GAAG,WAAW,CAAC;IACvE,MAAM,CAAC,SAAS,SAAsB;IAEtC,KAAK,EAAG;QACN,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAClC,UAAU,CAAC,EAAE,GAAG,CAAC;QACjB,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACzC,CAAC;IAEF,0BAA0B,CAAC,UAAU,EAAE,GAAG;IAU1C,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAexC,gBAAgB,CAAC,iBAAiB,KAAA;IAMlC,aAAa;;;IAIb,iBAAiB;IAejB,aAAa,CAAC,OAAO,KAAA;IAIrB;;;;;;;QAOI;IACJ,kBAAkB,CAChB,UAAU,KAAA,EACV,MAAM,GAAE;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,GAAG,CAAA;KAAM,GACnD,MAAM,GAAG,OAAO;IAyCnB;;;;;QAKI;IACJ,kBAAkB,CAAC,IAAI,CAAC,EAAE,MAAM;IAYhC,oBAAoB;CAMrB"}

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

@@ -1,7 +1,7 @@
-import { Accessor, AccessorFunction, Color, Layer, Position, UpdateParameters, DefaultProps } from '@deck.gl/core/typed';
+import { Accessor, AccessorFunction, Color, Position, UpdateParameters, DefaultProps, LayersList } 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>;
+export declare type ContourLayerProps<DataT = unknown> = _ContourLayerProps<DataT> & GridAggregationLayerProps<DataT>;
 /** Properties added by ContourLayer. */
 export declare type _ContourLayerProps<DataT> = {
     /**
@@ -62,11 +62,25 @@ export declare type _ContourLayerProps<DataT> = {
 /** Aggregate data into iso-lines or iso-bands for a given threshold and cell size. */
 export default class ContourLayer<DataT = any, ExtraPropsT extends {} = {}> extends GridAggregationLayer<DataT, ExtraPropsT & Required<_ContourLayerProps<DataT>>> {
     static layerName: string;
-    static defaultProps: DefaultProps<ContourLayerProps<any>>;
+    static defaultProps: DefaultProps<ContourLayerProps<unknown>>;
+    state: GridAggregationLayer<DataT>['state'] & {
+        contourData: {
+            contourSegments: {
+                start: number[];
+                end: number[];
+                contour: any;
+            }[];
+            contourPolygons: {
+                vertices: number[][];
+                contour: any;
+            }[];
+        };
+        thresholdData: any;
+    };
     initializeState(): void;
     updateState(opts: UpdateParameters<this>): void;
-    renderLayers(): Layer[];
-    updateAggregationState(opts: any): void;
+    renderLayers(): LayersList;
+    updateAggregationState(opts: UpdateParameters<this>): void;
     private _updateAccessors;
     private _resetResults;
     private _generateContours;

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,EAChB,YAAY,EACb,MAAM,eAAe,CAAC;AAKvB,OAAO,oBAAoB,EAAE,EAAC,yBAAyB,EAAC,MAAM,2BAA2B,CAAC;AAqC1F,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;AAEF,sFAAsF;AACtF,MAAM,CAAC,OAAO,OAAO,YAAY,CAC/B,KAAK,GAAG,GAAG,EACX,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,oBAAoB,CAAC,KAAK,EAAE,WAAW,GAAG,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;IACtF,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"}
+{"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,EAGL,QAAQ,EACR,gBAAgB,EAChB,YAAY,EACZ,UAAU,EACX,MAAM,eAAe,CAAC;AAKvB,OAAO,oBAAoB,EAAE,EAAC,yBAAyB,EAAC,MAAM,2BAA2B,CAAC;AAqC1F,gDAAgD;AAChD,oBAAY,iBAAiB,CAAC,KAAK,GAAG,OAAO,IAAI,kBAAkB,CAAC,KAAK,CAAC,GACxE,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;AAEF,sFAAsF;AACtF,MAAM,CAAC,OAAO,OAAO,YAAY,CAC/B,KAAK,GAAG,GAAG,EACX,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,oBAAoB,CAAC,KAAK,EAAE,WAAW,GAAG,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;IACtF,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,2CAAgB;IAEnC,KAAK,EAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG;QAC7C,WAAW,EAAE;YACX,eAAe,EAAE;gBACf,KAAK,EAAE,MAAM,EAAE,CAAC;gBAChB,GAAG,EAAE,MAAM,EAAE,CAAC;gBACd,OAAO,EAAE,GAAG,CAAC;aACd,EAAE,CAAC;YACJ,eAAe,EAAE;gBACf,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC;gBACrB,OAAO,EAAE,GAAG,CAAC;aACd,EAAE,CAAC;SACL,CAAC;QACF,aAAa,EAAE,GAAG,CAAC;KACpB,CAAC;IAEF,eAAe,IAAI,IAAI;IA2BvB,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAgB/C,YAAY,IAAI,UAAU;IA4C1B,sBAAsB,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAyEnD,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,9 +1,10 @@
 import { Accessor, AccessorFunction, Color, Position, Material, DefaultProps } from '@deck.gl/core/typed';
+import CPUAggregator from '../utils/cpu-aggregator';
 import AggregationLayer, { AggregationLayerProps } from '../aggregation-layer';
 import { Layer, UpdateParameters, GetPickingInfoParams, PickingInfo } from '@deck.gl/core/typed';
 import { AggregateAccessor } from '../types';
 /** All properties supported by CPUGridLayer. */
-export declare type CPUGridLayerProps<DataT = any> = _CPUGridLayerProps<DataT> & AggregationLayerProps<DataT>;
+export declare type CPUGridLayerProps<DataT = unknown> = _CPUGridLayerProps<DataT> & AggregationLayerProps<DataT>;
 /** Properties added by CPUGridLayer. */
 declare type _CPUGridLayerProps<DataT> = {
     /**
@@ -140,13 +141,17 @@ declare type _CPUGridLayerProps<DataT> = {
 /** Aggregate data into a grid-based heatmap. Aggregation is performed on CPU. */
 export default class CPUGridLayer<DataT = any, ExtraPropsT extends {} = {}> extends AggregationLayer<DataT, ExtraPropsT & Required<_CPUGridLayerProps<DataT>>> {
     static layerName: string;
-    static defaultProps: DefaultProps<CPUGridLayerProps<any>>;
+    static defaultProps: DefaultProps<CPUGridLayerProps<unknown>>;
+    state: AggregationLayer<DataT>['state'] & {
+        cpuAggregator: CPUAggregator;
+        aggregatorState: CPUAggregator['state'];
+    };
     initializeState(): void;
     updateState(opts: UpdateParameters<this>): void;
     getPickingInfo({ info }: GetPickingInfoParams): PickingInfo;
     _onGetSublayerColor(cell: any): any;
     _onGetSublayerElevation(cell: any): any;
-    _getSublayerUpdateTriggers(): any;
+    _getSublayerUpdateTriggers(): {};
     renderLayers(): Layer;
 }
 export {};

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":"AAsBA,OAAO,EAAC,QAAQ,EAAE,gBAAgB,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAKlG,OAAO,gBAAgB,EAAE,EAAC,qBAAqB,EAAC,MAAM,sBAAsB,CAAC;AAE7E,OAAO,EAAC,KAAK,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AACzF,OAAO,EAAC,iBAAiB,EAAC,MAAM,UAAU,CAAC;AA4C3C,gDAAgD;AAChD,oBAAY,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,GACpE,qBAAqB,CAAC,KAAK,CAAC,CAAC;AAE/B,wCAAwC;AACxC,aAAK,kBAAkB,CAAC,KAAK,IAAI;IAC/B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAEtC;;OAEG;IACH,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC;IAErB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAE1C;;;OAGG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAElC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;;;OAIG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAElC;;;;OAIG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAElC;;;;OAIG;IACH,cAAc,CAAC,EAAE,UAAU,GAAG,QAAQ,GAAG,UAAU,GAAG,SAAS,CAAC;IAEhE;;OAEG;IACH,kBAAkB,CAAC,EAAE,QAAQ,CAAC;IAG9B,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;IAElD;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;IAElD;;;OAGG;IACH,oBAAoB,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;IAEtD;;;OAGG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAEhD;;;OAGG;IACH,cAAc,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAEzC;;;OAGG;IACH,aAAa,CAAC,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;IAEhD;;;OAGG;IACH,kBAAkB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAE7C;;;OAGG;IACH,iBAAiB,CAAC,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;IAEpD;;;OAGG;IACH,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IAEtD;;;OAGG;IACH,oBAAoB,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IAE1D;;OAEG;IACH,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,OAAO,CAAC,CAAC;CAC7C,CAAC;AAEF,iFAAiF;AACjF,MAAM,CAAC,OAAO,OAAO,YAAY,CAC/B,KAAK,GAAG,GAAG,EACX,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,gBAAgB,CAAC,KAAK,EAAE,WAAW,GAAG,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;IAClF,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,uCAAgB;IAEnC,eAAe,IAAI,IAAI;IAkBvB,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAYxC,cAAc,CAAC,EAAC,IAAI,EAAC,EAAE,oBAAoB,GAAG,WAAW;IAKzD,mBAAmB,CAAC,IAAI,KAAA;IAKxB,uBAAuB,CAAC,IAAI,KAAA;IAI5B,0BAA0B;IAI1B,YAAY,IAAI,KAAK;CA8BtB"}
+{"version":3,"file":"cpu-grid-layer.d.ts","sourceRoot":"","sources":["../../src/cpu-grid-layer/cpu-grid-layer.ts"],"names":[],"mappings":"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"}

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

@@ -1,3 +1,11 @@
+export declare type GridHash = {
+    [key: string]: {
+        count: number;
+        points: unknown[];
+        lonIdx: number;
+        latIdx: number;
+    };
+};
 /**
  * Calculate density grid from an array of points
  * @param {Object} props - object containing :
@@ -16,8 +24,12 @@
  *
  * @returns {object} - grid data, cell dimension
  */
-export function pointToDensityGridDataCPU(props: {
-    data?: Iterable<any> | undefined;
-    cellSize?: any;
-}, aggregationParams: any): object;
+export declare function pointToDensityGridDataCPU(props: any, aggregationParams: any): {
+    gridHash: GridHash;
+    gridOffset: {
+        xOffset: number;
+        yOffset: number;
+    };
+    data: any[];
+};
 //# sourceMappingURL=grid-aggregator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"grid-aggregator.d.ts","sourceRoot":"","sources":["../../src/cpu-grid-layer/grid-aggregator.js"],"names":[],"mappings":"AAuBA;;;;;;;;;;;;;;;;;GAiBG;AACH;IAf4B,IAAI;IACL,QAAQ;4BAYtB,MAAM,CAWlB"}
+{"version":3,"file":"grid-aggregator.d.ts","sourceRoot":"","sources":["../../src/cpu-grid-layer/grid-aggregator.ts"],"names":[],"mappings":"AAuBA,oBAAY,QAAQ,GAAG;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,OAAO,EAAE,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,KAAA,EAAE,iBAAiB,KAAA;;;;;;;EASjE"}