export GPUAggregator

visgl · May 13, 2024 · 21358eb · 21358eb
1 parent 9106b95
commit 21358eb
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/modules/aggregation-layers/src/index.ts b/modules/aggregation-layers/src/index.ts
@@ -33,6 +33,8 @@ export {default as _CPUAggregator} from './utils/cpu-aggregator';
 export {default as _AggregationLayer} from './aggregation-layer';
 export {default as _BinSorter} from './utils/bin-sorter';
 
+export {GPUAggregator} from './aggregation-layer-v9/gpu-aggregator/gpu-aggregator';
+
 // types
 export type {ContourLayerProps} from './contour-layer/contour-layer';
 export type {HeatmapLayerProps} from './heatmap-layer/heatmap-layer';
@@ -41,3 +43,8 @@ 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';
+
+export type {
+  GPUAggregationProps,
+  GPUAggregatorSettings
+} from './aggregation-layer-v9/gpu-aggregator/gpu-aggregator';
diff --git a/modules/main/src/index.ts b/modules/main/src/index.ts
@@ -120,7 +120,8 @@ export {
   GridLayer,
   GPUGridLayer,
   AGGREGATION_OPERATION,
-  HeatmapLayer
+  HeatmapLayer,
+  GPUAggregator
 } from '@deck.gl/aggregation-layers';
 
 export {

diff --git a/test/modules/aggregation-layers/aggregation-layer-v9/gpu-aggregator.spec.ts b/test/modules/aggregation-layers/aggregation-layer-v9/gpu-aggregator.spec.ts
@@ -1,6 +1,6 @@
 import test from 'tape-promise/tape';
 import {Attribute} from '@deck.gl/core';
-import {GPUAggregator} from '@deck.gl/aggregation-layers/aggregation-layer-v9/gpu-aggregator/gpu-aggregator';
+import {GPUAggregator} from '@deck.gl/aggregation-layers';
 import {device} from '@deck.gl/test-utils';
 
 import {IncomeSurvey} from './data-sample';

diff --git a/test/modules/aggregation-layers/aggregation-layer-v9/test-utils.ts b/test/modules/aggregation-layers/aggregation-layer-v9/test-utils.ts
@@ -1,7 +1,14 @@
 import {BinaryAttribute} from '@deck.gl/core';
 import {luma} from '@luma.gl/core';
 
-export function binaryAttributeToArray(accessor: BinaryAttribute, length: number): number[] {
+export function binaryAttributeToArray(
+  accessor: BinaryAttribute | null,
+  length: number
+): number[] | null {
+  if (!accessor) {
+    return null;
+  }
+
   let value = accessor.value;
   if (!value) {
     const buffer = accessor.buffer;