Merge e7b26ee into 2078c98

visgl · Dec 18, 2019 · ef051e4 · ef051e4
2 parents 2078c98 + e7b26ee
commit ef051e4
Show file tree

Hide file tree

Showing 11 changed files with 445 additions and 482 deletions.
diff --git a/modules/aggregation-layers/src/contour-layer/contour-layer.js b/modules/aggregation-layers/src/contour-layer/contour-layer.js
@@ -223,12 +223,11 @@ export default class ContourLayer extends GridAggregationLayer {
   _updateAccessors(opts) {
     const {getWeight, aggregation} = opts.props;
     const {count} = this.state.weights;
-    if (this.state.gpuAggregation) {
+    if (count) {
       count.getWeight = getWeight;
       count.operation = AGGREGATION_OPERATION[aggregation];
-    } else {
-      this.setState({getValue: getValueFunc(aggregation, getWeight)});
     }
+    this.setState({getValue: getValueFunc(aggregation, getWeight)});
   }
 
   _resetResults() {

diff --git a/modules/aggregation-layers/src/screen-grid-layer/screen-grid-layer.js b/modules/aggregation-layers/src/screen-grid-layer/screen-grid-layer.js
@@ -230,12 +230,11 @@ export default class ScreenGridLayer extends GridAggregationLayer {
   _updateAccessors(opts) {
     const {getWeight, aggregation} = opts.props;
     const {count} = this.state.weights;
-    if (this.state.gpuAggregation) {
+    if (count) {
       count.getWeight = getWeight;
       count.operation = AGGREGATION_OPERATION[aggregation];
-    } else {
-      this.setState({getValue: getValueFunc(aggregation, getWeight)});
     }
+    this.setState({getValue: getValueFunc(aggregation, getWeight)});
   }
 
   _resetResults() {

diff --git a/modules/aggregation-layers/src/utils/grid-aggregation-utils.js b/modules/aggregation-layers/src/utils/grid-aggregation-utils.js
@@ -93,7 +93,7 @@ export function getGridParams(boundingBox, cellSize, viewport, coordinateSystem)
   const gridOffset = getGridOffset(
     boundingBox,
     cellSize,
-    coordinateSystem !== COORDINATE_SYSTEM.IDENTITY
+    coordinateSystem !== COORDINATE_SYSTEM.CARTESIAN
   );
 
   const boundingBoxAligned = alignBoundingBox(boundingBox, gridOffset, coordinateSystem, viewport);

diff --git a/test/browser.js b/test/browser.js
@@ -48,8 +48,8 @@ test('deck.gl', t => {
   require('./modules/json/json-render.spec');
   require('./modules/main/bundle');
   require('./modules/aggregation-layers/utils/gpu-grid-aggregator.spec');
+  require('./modules/aggregation-layers/gpu-cpu-aggregator.spec');
   require('./modules/aggregation-layers/gpu-grid-layer/gpu-grid-layer.spec');
-  // require('./modules/aggregation-layers/grid-aggregation-layer.spec');
   require('./modules/aggregation-layers/heatmap-layer/heatmap-layer.spec');
   require('./modules/core/lib/pick-layers.spec');