ScreenGridLayer: skip aggregation when data is empty (#3412)

visgl · Aug 7, 2019 · beac261 · beac261
1 parent 1fb672d
commit beac261
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
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
@@ -114,7 +114,13 @@ export default class ScreenGridLayer extends Layer {
     const changeFlags = this._getAggregationChangeFlags(opts);
 
     if (changeFlags) {
-      this._updateAggregation(changeFlags);
+      if (changeFlags.cellSizeChanged || changeFlags.viewportChanged) {
+        this._updateGridParams();
+      }
+      const {pointCount} = this.state;
+      if (pointCount > 0) {
+        this._updateAggregation(changeFlags);
+      }
     }
   }
 
@@ -282,7 +288,7 @@ export default class ScreenGridLayer extends Layer {
       }
     }
     weights.color.values = colorWeights;
-    this.setState({positions});
+    this.setState({positions, pointCount});
   }
 
   // Set a binding point for the aggregation uniform block index
@@ -316,10 +322,6 @@ export default class ScreenGridLayer extends Layer {
 
   _updateAggregation(changeFlags) {
     const attributeManager = this.getAttributeManager();
-    if (changeFlags.cellSizeChanged || changeFlags.viewportChanged) {
-      this._updateGridParams();
-      attributeManager.invalidateAll();
-    }
     const {cellSizePixels, gpuAggregation} = this.props;
 
     const {positions, weights} = this.state;
@@ -391,6 +393,8 @@ export default class ScreenGridLayer extends Layer {
   }
 
   _updateGridParams() {
+    const attributeManager = this.getAttributeManager();
+    attributeManager.invalidateAll();
     const {width, height} = this.context.viewport;
     const {cellSizePixels} = this.props;
     const {gl} = this.context;

diff --git a/modules/aggregation-layers/src/utils/gpu-grid-aggregation/gpu-grid-aggregator.js b/modules/aggregation-layers/src/utils/gpu-grid-aggregation/gpu-grid-aggregator.js
@@ -214,7 +214,7 @@ export default class GPUGridAggregator {
       return this.runAggregationOnGPU(aggregationParams);
     }
     if (useGPU) {
-      log.info('GPUGridAggregator: GPU Aggregation not supported, falling back to CPU')();
+      log.warn('GPUGridAggregator: GPU Aggregation not supported, falling back to CPU')();
     }
     return this.runAggregationOnCPU(aggregationParams);
   }