type improvements

modules/aggregation-layers/src/aggregation-layer-v9/cpu-aggregator/cpu-aggregator.ts

@@ -1,28 +1,28 @@
-import type {Aggregator, AggregationProps} from '../aggregator';
+import type {Aggregator, AggregationProps, AggregatedBin} from '../aggregator';
 import {_deepEqual as deepEqual, BinaryAttribute} from '@deck.gl/core';
 import {sortBins, packBinIds} from './sort';
 import {aggregateChannel} from './aggregate';
 import {VertexAccessor, evaluateVertexAccessor} from './vertex-accessor';
 
-/** Settings used to construct a new CPUAggregator */
-export type CPUAggregatorSettings = {
+/** Options used to construct a new CPUAggregator */
+export type CPUAggregatorOptions = {
   /** Size of bin IDs */
   dimensions: number;
   /** Accessor to map each data point to a bin ID.
    * If dimensions=1, bin ID should be a number;
    * If dimensions>1, bin ID should be an array with [dimensions] elements;
    * The data point will be skipped if bin ID is null.
    */
-  getBin: VertexAccessor<number | number[] | null, any>;
+  getBin: VertexAccessor<number[] | null, any>;
   /** Accessor to map each data point to a weight value, defined per channel */
   getValue: VertexAccessor<number>[];
 };
 
-/** Options used to run CPU aggregation, can be changed at any time */
+/** Props used to run CPU aggregation, can be changed at any time */
 export type CPUAggregationProps = AggregationProps & {};
 
 export type Bin = {
-  id: number | number[];
+  id: number[];
   index: number;
   /** list of data point indices */
   points: number[];
@@ -40,8 +40,8 @@ export class CPUAggregator implements Aggregator {
     attributes: {}
   };
 
-  protected getBinId: CPUAggregatorSettings['getBin'];
-  protected getValue: CPUAggregatorSettings['getValue'];
+  protected getBinId: CPUAggregatorOptions['getBin'];
+  protected getValue: CPUAggregatorOptions['getValue'];
   /** Dirty flag
    * If true, redo sorting
    * If array, redo aggregation on the specified channel
@@ -52,7 +52,7 @@ export class CPUAggregator implements Aggregator {
   protected binIds: Float32Array | null = null;
   protected results: {value: Float32Array; domain: [min: number, max: number]}[] = [];
 
-  constructor({dimensions, getBin, getValue}: CPUAggregatorSettings) {
+  constructor({dimensions, getBin, getValue}: CPUAggregatorOptions) {
     this.dimensions = dimensions;
     this.numChannels = getValue.length;
     this.getBinId = getBin;
@@ -164,16 +164,12 @@ export class CPUAggregator implements Aggregator {
   }
 
   /** Returns the information for a given bin. */
-  getBin(index: number): {
-    /** The original id */
-    id: number | number[];
-    /** Aggregated values by channel */
-    value: number[];
-    /** Count of data points in this bin */
-    count: number;
-    /** List of data point indices that fall into this bin. */
-    points?: number[];
-  } | null {
+  getBin(index: number):
+    | (AggregatedBin & {
+        /** List of data point indices that fall into this bin. */
+        points?: number[];
+      })
+    | null {
     const bin = this.bins[index];
     if (!bin) {
       return null;

modules/aggregation-layers/src/aggregation-layer-v9/cpu-aggregator/sort.ts

@@ -6,7 +6,7 @@ export function sortBins({
   getBinId
 }: {
   pointCount: number;
-  getBinId: (index: number) => number | number[] | null;
+  getBinId: (index: number) => number[] | null;
 }): Bin[] {
   const binsById: Map<string, Bin> = new Map();
 

modules/aggregation-layers/src/index.ts

@@ -51,5 +51,5 @@ export type {
 } from './aggregation-layer-v9/gpu-aggregator/gpu-aggregator';
 export type {
   CPUAggregationProps,
-  CPUAggregatorSettings
+  CPUAggregatorOptions
 } from './aggregation-layer-v9/cpu-aggregator/cpu-aggregator';

test/modules/aggregation-layers/aggregation-layer-v9/cpu-aggregator.spec.ts

@@ -13,7 +13,7 @@ test('CPUAggregator#1D', t => {
     dimensions: 1,
     getBin: {
       sources: ['age'],
-      getValue: ({age}, index, {ageGroupSize}) => Math.floor(age / ageGroupSize)
+      getValue: ({age}, index, {ageGroupSize}) => [Math.floor(age / ageGroupSize)]
     },
     getValue: [
       {getValue: () => 1},
@@ -83,7 +83,7 @@ test('CPUAggregator#1D', t => {
   // {age: 44, household: 4, income: 500, education: 4},
   t.deepEqual(
     aggregator.getBin(5),
-    {id: 8, count: 3, value: [3, 250, 5], points: [16, 17, 18]},
+    {id: [8], count: 3, value: [3, 250, 5], points: [16, 17, 18]},
     'getBin()'
   );
 
@@ -94,7 +94,7 @@ test('CPUAggregator#1D', t => {
   t.end();
 });
 
-test.only('CPUAggregator#2D', t => {
+test('CPUAggregator#2D', t => {
   // An aggregator that calculates:
   // [0] total count [1] average income, grouped by [age, education]
   const aggregator = new CPUAggregator({