remove legacy aggregation code

visgl · Aug 23, 2024 · f8f76b8 · f8f76b8
1 parent 9da9072
commit f8f76b8
Show file tree

Hide file tree

Showing 60 changed files with 38 additions and 6,253 deletions.
diff --git a/...aggregation-layer-v9/aggregation-layer.ts → ...on-layers/src/common/aggregation-layer.ts b/...aggregation-layer-v9/aggregation-layer.ts → ...on-layers/src/common/aggregation-layer.ts
diff --git a/...rs/src/aggregation-layer-v9/aggregator.ts → ...gregation-layers/src/common/aggregator.ts b/...rs/src/aggregation-layer-v9/aggregator.ts → ...gregation-layers/src/common/aggregator.ts
diff --git a/...tion-layer-v9/cpu-aggregator/aggregate.ts → ...rs/src/common/cpu-aggregator/aggregate.ts b/...tion-layer-v9/cpu-aggregator/aggregate.ts → ...rs/src/common/cpu-aggregator/aggregate.ts
diff --git a/...layer-v9/cpu-aggregator/cpu-aggregator.ts → ...c/common/cpu-aggregator/cpu-aggregator.ts b/...layer-v9/cpu-aggregator/cpu-aggregator.ts → ...c/common/cpu-aggregator/cpu-aggregator.ts
diff --git a/...tion-layer-v9/cpu-aggregator/sort-bins.ts → ...rs/src/common/cpu-aggregator/sort-bins.ts b/...tion-layer-v9/cpu-aggregator/sort-bins.ts → ...rs/src/common/cpu-aggregator/sort-bins.ts
diff --git a/...ayer-v9/cpu-aggregator/vertex-accessor.ts → .../common/cpu-aggregator/vertex-accessor.ts b/...ayer-v9/cpu-aggregator/vertex-accessor.ts → .../common/cpu-aggregator/vertex-accessor.ts
diff --git a/...regation-layer-v9/gpu-aggregator/utils.ts → ...layers/src/common/gpu-aggregator/utils.ts b/...regation-layer-v9/gpu-aggregator/utils.ts → ...layers/src/common/gpu-aggregator/utils.ts
diff --git a/...aggregator/webgl-aggregation-transform.ts → ...aggregator/webgl-aggregation-transform.ts b/...aggregator/webgl-aggregation-transform.ts → ...aggregator/webgl-aggregation-transform.ts
diff --git a/...yer-v9/gpu-aggregator/webgl-aggregator.ts → ...common/gpu-aggregator/webgl-aggregator.ts b/...yer-v9/gpu-aggregator/webgl-aggregator.ts → ...common/gpu-aggregator/webgl-aggregator.ts
diff --git a/...yer-v9/gpu-aggregator/webgl-bin-sorter.ts → ...common/gpu-aggregator/webgl-bin-sorter.ts b/...yer-v9/gpu-aggregator/webgl-bin-sorter.ts → ...common/gpu-aggregator/webgl-bin-sorter.ts
diff --git a/modules/aggregation-layers/src/contour-layer/contour-layer.ts b/modules/aggregation-layers/src/contour-layer/contour-layer.ts
@@ -16,11 +16,11 @@ import {
   DefaultProps
 } from '@deck.gl/core';
 import {PathLayer, SolidPolygonLayer} from '@deck.gl/layers';
-import {WebGLAggregator} from '../aggregation-layer-v9/gpu-aggregator/webgl-aggregator';
-import {CPUAggregator} from '../aggregation-layer-v9/cpu-aggregator/cpu-aggregator';
-import AggregationLayer from '../aggregation-layer-v9/aggregation-layer';
-import {AggregationLayerProps} from '../aggregation-layer-v9/aggregation-layer';
-import {AggregationOperation} from '../aggregation-layer-v9/aggregator';
+import {WebGLAggregator} from '../common/gpu-aggregator/webgl-aggregator';
+import {CPUAggregator} from '../common/cpu-aggregator/cpu-aggregator';
+import AggregationLayer from '../common/aggregation-layer';
+import {AggregationLayerProps} from '../common/aggregation-layer';
+import {AggregationOperation} from '../common/aggregator';
 import {generateContours, Contour, ContourLine, ContourPolygon} from './contour-utils';
 import {getAggregatorValueReader} from './value-reader';
 import {Matrix4} from '@math.gl/core';

diff --git a/modules/aggregation-layers/src/contour-layer/value-reader.ts b/modules/aggregation-layers/src/contour-layer/value-reader.ts
@@ -1,6 +1,6 @@
-import {Aggregator} from '../aggregation-layer-v9/aggregator';
-import {WebGLAggregator} from '../aggregation-layer-v9/gpu-aggregator/webgl-aggregator';
-import {CPUAggregator} from '../aggregation-layer-v9/cpu-aggregator/cpu-aggregator';
+import {Aggregator} from '../common/aggregator';
+import {WebGLAggregator} from '../common/gpu-aggregator/webgl-aggregator';
+import {CPUAggregator} from '../common/cpu-aggregator/cpu-aggregator';
 import type {TypedArray} from '@luma.gl/core';
 
 type ValueReader = (x: number, y: number) => number;

diff --git a/modules/aggregation-layers/src/cpu-grid-layer/cpu-grid-layer.ts b/modules/aggregation-layers/src/cpu-grid-layer/cpu-grid-layer.ts