address comments

visgl · Aug 23, 2024 · 91be89f · 91be89f
1 parent f8f76b8
commit 91be89f
Show file tree

Hide file tree

Showing 30 changed files with 34 additions and 36 deletions.
diff --git a/modules/aggregation-layers/src/common/aggregation-layer.ts b/modules/aggregation-layers/src/common/aggregation-layer.ts
@@ -7,7 +7,7 @@ import {
   Attribute,
   AttributeManager
 } from '@deck.gl/core';
-import {Aggregator} from './aggregator';
+import {Aggregator} from './aggregator/aggregator';
 
 export type AggregationLayerProps<DataT> = CompositeLayerProps & {
   data: LayerDataSource<DataT>;

diff --git a/...gregation-layers/src/common/aggregator.ts → ...ayers/src/common/aggregator/aggregator.ts b/...gregation-layers/src/common/aggregator.ts → ...ayers/src/common/aggregator/aggregator.ts
diff --git a/...rs/src/common/cpu-aggregator/aggregate.ts → ...on/aggregator/cpu-aggregator/aggregate.ts b/...rs/src/common/cpu-aggregator/aggregate.ts → ...on/aggregator/cpu-aggregator/aggregate.ts
diff --git a/...c/common/cpu-aggregator/cpu-aggregator.ts → ...gregator/cpu-aggregator/cpu-aggregator.ts b/...c/common/cpu-aggregator/cpu-aggregator.ts → ...gregator/cpu-aggregator/cpu-aggregator.ts
diff --git a/...rs/src/common/cpu-aggregator/sort-bins.ts → ...on/aggregator/cpu-aggregator/sort-bins.ts b/...rs/src/common/cpu-aggregator/sort-bins.ts → ...on/aggregator/cpu-aggregator/sort-bins.ts
diff --git a/.../common/cpu-aggregator/vertex-accessor.ts → ...regator/cpu-aggregator/vertex-accessor.ts b/.../common/cpu-aggregator/vertex-accessor.ts → ...regator/cpu-aggregator/vertex-accessor.ts
diff --git a/...layers/src/common/gpu-aggregator/utils.ts → ...common/aggregator/gpu-aggregator/utils.ts b/...layers/src/common/gpu-aggregator/utils.ts → ...common/aggregator/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/...common/gpu-aggregator/webgl-aggregator.ts → ...egator/gpu-aggregator/webgl-aggregator.ts b/...common/gpu-aggregator/webgl-aggregator.ts → ...egator/gpu-aggregator/webgl-aggregator.ts
diff --git a/...common/gpu-aggregator/webgl-bin-sorter.ts → ...egator/gpu-aggregator/webgl-bin-sorter.ts b/...common/gpu-aggregator/webgl-bin-sorter.ts → ...egator/gpu-aggregator/webgl-bin-sorter.ts
diff --git a/modules/aggregation-layers/src/common/aggregator/index.ts b/modules/aggregation-layers/src/common/aggregator/index.ts
@@ -0,0 +1,6 @@
+export {CPUAggregator} from './cpu-aggregator/cpu-aggregator';
+export {WebGLAggregator} from './gpu-aggregator/webgl-aggregator';
+
+export type {Aggregator, AggregatedBin, AggregationOperation, AggregationProps} from './aggregator';
+export type {CPUAggregatorProps} from './cpu-aggregator/cpu-aggregator';
+export type {WebGLAggregatorProps} from './gpu-aggregator/webgl-aggregator';
diff --git a/modules/aggregation-layers/src/types.ts → ...es/aggregation-layers/src/common/types.ts b/modules/aggregation-layers/src/types.ts → ...es/aggregation-layers/src/common/types.ts
diff --git a/...gregation-layers/src/utils/color-utils.ts → ...on-layers/src/common/utils/color-utils.ts b/...gregation-layers/src/utils/color-utils.ts → ...on-layers/src/common/utils/color-utils.ts
diff --git a/...ggregation-layers/src/utils/prop-utils.ts → ...ion-layers/src/common/utils/prop-utils.ts b/...ggregation-layers/src/utils/prop-utils.ts → ...ion-layers/src/common/utils/prop-utils.ts
diff --git a/...gregation-layers/src/utils/scale-utils.js → ...on-layers/src/common/utils/scale-utils.js b/...gregation-layers/src/utils/scale-utils.js → ...on-layers/src/common/utils/scale-utils.js
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,9 @@ import {
   DefaultProps
 } from '@deck.gl/core';
 import {PathLayer, SolidPolygonLayer} from '@deck.gl/layers';
-import {WebGLAggregator} from '../common/gpu-aggregator/webgl-aggregator';
-import {CPUAggregator} from '../common/cpu-aggregator/cpu-aggregator';
+import {WebGLAggregator, CPUAggregator, AggregationOperation} from '../common/aggregator/index';
 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,4 @@
-import {Aggregator} from '../common/aggregator';
-import {WebGLAggregator} from '../common/gpu-aggregator/webgl-aggregator';
-import {CPUAggregator} from '../common/cpu-aggregator/cpu-aggregator';
+import {Aggregator, CPUAggregator, WebGLAggregator} from '../common/aggregator/index';
 import type {TypedArray} from '@luma.gl/core';
 
 type ValueReader = (x: number, y: number) => number;

diff --git a/modules/aggregation-layers/src/grid-layer/grid-cell-layer.ts b/modules/aggregation-layers/src/grid-layer/grid-cell-layer.ts
@@ -6,7 +6,7 @@ import {Texture} from '@luma.gl/core';
 import {UpdateParameters, Color} from '@deck.gl/core';
 import {ColumnLayer} from '@deck.gl/layers';
 import {CubeGeometry} from '@luma.gl/engine';
-import {colorRangeToTexture} from '../utils/color-utils';
+import {colorRangeToTexture} from '../common/utils/color-utils';
 import vs from './grid-cell-layer-vertex.glsl';
 
 /** Proprties added by GridCellLayer. */

diff --git a/modules/aggregation-layers/src/grid-layer/grid-layer.ts b/modules/aggregation-layers/src/grid-layer/grid-layer.ts
@@ -19,12 +19,10 @@ import {
   DefaultProps
 } from '@deck.gl/core';
 import {getDistanceScales} from '@math.gl/web-mercator';
-import {WebGLAggregator} from '../common/gpu-aggregator/webgl-aggregator';
-import {CPUAggregator} from '../common/cpu-aggregator/cpu-aggregator';
+import {WebGLAggregator, CPUAggregator, AggregationOperation} from '../common/aggregator/index';
 import AggregationLayer from '../common/aggregation-layer';
-import {AggregationOperation} from '../common/aggregator';
-import {AggregateAccessor} from '../types';
-import {defaultColorRange} from '../utils/color-utils';
+import {AggregateAccessor} from '../common/types';
+import {defaultColorRange} from '../common/utils/color-utils';
 
 import {GridCellLayer} from './grid-cell-layer';
 

diff --git a/modules/aggregation-layers/src/heatmap-layer/aggregation-layer.ts b/modules/aggregation-layers/src/heatmap-layer/aggregation-layer.ts
@@ -27,7 +27,7 @@ import {
   CompositeLayerProps,
   Attribute
 } from '@deck.gl/core';
-import {filterProps} from '../utils/prop-utils';
+import {filterProps} from '../common/utils/prop-utils';
 
 export type AggregationLayerProps<DataT> = CompositeLayerProps & {
   data: LayerDataSource<DataT>;

diff --git a/modules/aggregation-layers/src/heatmap-layer/heatmap-layer.ts b/modules/aggregation-layers/src/heatmap-layer/heatmap-layer.ts
@@ -46,7 +46,7 @@ import {
 } from '@deck.gl/core';
 import TriangleLayer from './triangle-layer';
 import AggregationLayer, {AggregationLayerProps} from './aggregation-layer';
-import {defaultColorRange, colorRangeToFlatArray} from '../utils/color-utils';
+import {defaultColorRange, colorRangeToFlatArray} from '../common/utils/color-utils';
 import weightsVs from './weights-vs.glsl';
 import weightsFs from './weights-fs.glsl';
 import maxVs from './max-vs.glsl';

diff --git a/modules/aggregation-layers/src/hexagon-layer/hexagon-cell-layer.ts b/modules/aggregation-layers/src/hexagon-layer/hexagon-cell-layer.ts
@@ -5,7 +5,7 @@
 import {Texture} from '@luma.gl/core';
 import {UpdateParameters, Color} from '@deck.gl/core';
 import {ColumnLayer} from '@deck.gl/layers';
-import {colorRangeToTexture} from '../utils/color-utils';
+import {colorRangeToTexture} from '../common/utils/color-utils';
 import vs from './hexagon-cell-layer-vertex.glsl';
 
 /** Proprties added by HexagonCellLayer. */

diff --git a/modules/aggregation-layers/src/hexagon-layer/hexagon-layer.ts b/modules/aggregation-layers/src/hexagon-layer/hexagon-layer.ts
@@ -19,12 +19,10 @@ import {
   DefaultProps
 } from '@deck.gl/core';
 import {getDistanceScales} from '@math.gl/web-mercator';
-import {WebGLAggregator} from '../common/gpu-aggregator/webgl-aggregator';
-import {CPUAggregator} from '../common/cpu-aggregator/cpu-aggregator';
+import {WebGLAggregator, CPUAggregator, AggregationOperation} from '../common/aggregator/index';
 import AggregationLayer from '../common/aggregation-layer';
-import {AggregationOperation} from '../common/aggregator';
-import {AggregateAccessor} from '../types';
-import {defaultColorRange} from '../utils/color-utils';
+import {AggregateAccessor} from '../common/types';
+import {defaultColorRange} from '../common/utils/color-utils';
 
 import HexagonCellLayer from './hexagon-cell-layer';
 import {pointToHexbin, HexbinVertices, getHexbinCentroid, pointToHexbinGLSL} from './hexbin';

diff --git a/modules/aggregation-layers/src/index.ts b/modules/aggregation-layers/src/index.ts
@@ -25,8 +25,7 @@ export {default as GridLayer} from './grid-layer/grid-layer';
 export {default as HeatmapLayer} from './heatmap-layer/heatmap-layer';
 
 export {default as _AggregationLayer} from './common/aggregation-layer';
-export {WebGLAggregator} from './common/gpu-aggregator/webgl-aggregator';
-export {CPUAggregator} from './common/cpu-aggregator/cpu-aggregator';
+export {WebGLAggregator, CPUAggregator} from './common/aggregator/index';
 
 // types
 export type {ContourLayerProps, ContourLayerPickingInfo} from './contour-layer/contour-layer';
@@ -38,6 +37,10 @@ export type {
   ScreenGridLayerPickingInfo
 } from './screen-grid-layer/screen-grid-layer';
 
-export type {Aggregator, AggregationOperation, AggregationProps} from './common/aggregator';
-export type {WebGLAggregatorProps} from './common/gpu-aggregator/webgl-aggregator';
-export type {CPUAggregatorProps} from './common/cpu-aggregator/cpu-aggregator';
+export type {
+  Aggregator,
+  AggregationOperation,
+  AggregationProps,
+  WebGLAggregatorProps,
+  CPUAggregatorProps
+} from './common/aggregator/index';
diff --git a/modules/aggregation-layers/src/screen-grid-layer/screen-grid-cell-layer.ts b/modules/aggregation-layers/src/screen-grid-layer/screen-grid-cell-layer.ts
@@ -21,7 +21,7 @@
 import {Texture} from '@luma.gl/core';
 import {Model, Geometry} from '@luma.gl/engine';
 import {Layer, picking, UpdateParameters, DefaultProps, Color} from '@deck.gl/core';
-import {defaultColorRange, colorRangeToTexture} from '../utils/color-utils';
+import {defaultColorRange, colorRangeToTexture} from '../common/utils/color-utils';
 import vs from './screen-grid-layer-vertex.glsl';
 import fs from './screen-grid-layer-fragment.glsl';
 import {ShaderModule} from '@luma.gl/shadertools';

diff --git a/modules/aggregation-layers/src/screen-grid-layer/screen-grid-layer.ts b/modules/aggregation-layers/src/screen-grid-layer/screen-grid-layer.ts
@@ -31,10 +31,8 @@ import {
   UpdateParameters,
   DefaultProps
 } from '@deck.gl/core';
-import {WebGLAggregator} from '../common/gpu-aggregator/webgl-aggregator';
-import {CPUAggregator} from '../common/cpu-aggregator/cpu-aggregator';
+import {WebGLAggregator, CPUAggregator, AggregationOperation} from '../common/aggregator/index';
 import AggregationLayer from '../common/aggregation-layer';
-import {AggregationOperation} from '../common/aggregator';
 import ScreenGridCellLayer from './screen-grid-cell-layer';
 
 const defaultProps: DefaultProps<ScreenGridLayerProps> = {

diff --git a/test/modules/aggregation-layers/common/cpu-aggregator/vertex-accessor.spec.ts b/test/modules/aggregation-layers/common/cpu-aggregator/vertex-accessor.spec.ts
@@ -3,7 +3,7 @@ import {Attribute} from '@deck.gl/core';
 import {
   VertexAccessor,
   evaluateVertexAccessor
-} from '@deck.gl/aggregation-layers/common/cpu-aggregator/vertex-accessor';
+} from '@deck.gl/aggregation-layers/common/aggregator/cpu-aggregator/vertex-accessor';
 import {device} from '@deck.gl/test-utils';
 
 test('evaluateVertexAccessor#sources', t => {

diff --git a/...regation-layers/utils/color-utils.spec.ts → ...n-layers/common/utils/color-utils.spec.ts b/...regation-layers/utils/color-utils.spec.ts → ...n-layers/common/utils/color-utils.spec.ts
@@ -1,5 +1,5 @@
 import test from 'tape-promise/tape';
-import {colorRangeToFlatArray} from '@deck.gl/aggregation-layers/utils/color-utils';
+import {colorRangeToFlatArray} from '@deck.gl/aggregation-layers/common/utils/color-utils';
 
 test('color-utils#colorRangeToFlatArray', t => {
   const TESTS = [

diff --git a/...regation-layers/utils/scale-utils.spec.ts → ...n-layers/common/utils/scale-utils.spec.ts b/...regation-layers/utils/scale-utils.spec.ts → ...n-layers/common/utils/scale-utils.spec.ts
@@ -4,7 +4,7 @@ import {
   getQuantileScale,
   getOrdinalScale,
   getLinearScale
-} from '@deck.gl/aggregation-layers/utils/scale-utils';
+} from '@deck.gl/aggregation-layers/common/utils/scale-utils';
 
 const RANGE = [100, 200, 300, 400, 500, 600, 700, 800, 900, 1000];
 const LINEAR_SCALE_TEST_CASES = [

diff --git a/test/modules/aggregation-layers/index.ts b/test/modules/aggregation-layers/index.ts
@@ -27,9 +27,8 @@ import './hexagon-layer.spec';
 import './hexbin.spec';
 import './screen-grid-layer.spec';
 import './screengrid-cell-layer.spec';
-import './utils/color-utils.spec';
-import './utils/scale-utils.spec';
-
+import './common/utils/color-utils.spec';
+import './common/utils/scale-utils.spec';
 import './common/webgl-aggregator.spec';
 import './common/cpu-aggregator/cpu-aggregator.spec';
 import './common/cpu-aggregator/vertex-accessor.spec';