@deck.gl/aggregation-layers 8.6.0-alpha.3 → 8.6.1

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/aggregation-layers",
   "description": "deck.gl layers that aggregate the input data into alternative representations",
   "license": "MIT",
-  "version": "8.6.0-alpha.3",
+  "version": "8.6.1",
   "publishConfig": {
     "access": "public"
   },
@@ -29,7 +29,7 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
   },
   "dependencies": {
-    "@luma.gl/shadertools": "^8.5.5",
+    "@luma.gl/shadertools": "^8.5.10",
     "@math.gl/web-mercator": "^3.5.4",
     "d3-hexbin": "^0.2.1"
   },
@@ -37,5 +37,5 @@
     "@deck.gl/core": "^8.0.0",
     "@deck.gl/layers": "^8.0.0"
   },
-  "gitHead": "b43ac51af23cb186e3cbb2ed9c69fddd16483745"
+  "gitHead": "9611fa7fc206cf2970ac4dfdb35a50677b0afa3c"
 }

package/src/gpu-grid-layer/gpu-grid-cell-layer-vertex.glsl.js

@@ -95,7 +95,6 @@ float linearScale(vec2 domain, vec2 range, float value) {
 }
 
 void main(void) {
-
   vec2 clrDomain = colorDomainValid ? colorDomain : vec2(colorData.maxMinCount.a, colorData.maxMinCount.r);
   vec4 color = quantizeScale(clrDomain, colorRange, colors.r);
 
@@ -121,6 +120,7 @@ void main(void) {
 
   vec3 centroidPosition = vec3(instancePositionXFP64[0], instancePositionYFP64[0], elevation);
   vec3 centroidPosition64Low = vec3(instancePositionXFP64[1], instancePositionYFP64[1], 0.0);
+  geometry.worldPosition = centroidPosition;
   vec3 pos = vec3(project_size(positions.xy + offset) * dotRadius, 0.);
 
   // Set color to be rendered to picking fbo (also used to check for selection highlight).

package/src/heatmap-layer/heatmap-layer.js

@@ -114,8 +114,9 @@ export default class HeatmapLayer extends AggregationLayer {
     const {props, oldProps} = opts;
     const changeFlags = this._getChangeFlags(opts);
 
-    if (changeFlags.viewportChanged) {
-      changeFlags.boundsChanged = this._updateBounds();
+    if (changeFlags.dataChanged || changeFlags.viewportChanged) {
+      // if data is changed, do not debounce and immediately update the weight map
+      changeFlags.boundsChanged = this._updateBounds(changeFlags.dataChanged);
       this._updateTextureRenderingBounds();
     }
 

package/src/hexagon-layer/hexagon-layer.js

@@ -66,9 +66,6 @@ const defaultProps = {
 };
 
 export default class HexagonLayer extends AggregationLayer {
-  shouldUpdateState({changeFlags}) {
-    return changeFlags.somethingChanged;
-  }
   initializeState() {
     const cpuAggregator = new CPUAggregator({
       getAggregator: props => props.hexagonAggregator,
@@ -78,7 +75,7 @@ export default class HexagonLayer extends AggregationLayer {
     this.state = {
       cpuAggregator,
       aggregatorState: cpuAggregator.state,
-      hexagonVertices: null
+      vertices: null
     };
     const attributeManager = this.getAttributeManager();
     attributeManager.add({
@@ -90,47 +87,25 @@ export default class HexagonLayer extends AggregationLayer {
 
   updateState(opts) {
     super.updateState(opts);
-    const {cpuAggregator, hexagonVertices: oldVertices} = this.state;
 
     if (opts.changeFlags.propsOrDataChanged) {
-      this.setState({
-        // make a copy of the internal state of cpuAggregator for testing
-        aggregatorState: cpuAggregator.updateState(opts, {
-          viewport: this.context.viewport,
-          attributes: this.getAttributes()
-        })
+      const aggregatorState = this.state.cpuAggregator.updateState(opts, {
+        viewport: this.context.viewport,
+        attributes: this.getAttributes()
       });
-    }
-
-    // if user provided custom aggregator and returns hexagonVertices,
-    // Need to recalculate radius and angle based on vertices
-    const {hexagonVertices} = cpuAggregator.state.layerData || {};
-
-    if (hexagonVertices && oldVertices !== hexagonVertices) {
-      const vertices = this.convertLatLngToMeterOffset(hexagonVertices);
-      if (vertices) {
+      if (this.state.aggregatorState.layerData !== aggregatorState.layerData) {
+        // if user provided custom aggregator and returns hexagonVertices,
+        // Need to recalculate radius and angle based on vertices
+        const {hexagonVertices} = aggregatorState.layerData || {};
         this.setState({
-          hexagonVertices,
-          vertices
+          vertices: hexagonVertices && this.convertLatLngToMeterOffset(hexagonVertices)
         });
       }
-    } else {
-      // update radius angle by viewport
-      this.updateRadiusAngle();
-    }
-  }
-
-  updateRadiusAngle(vertices) {
-    const {viewport} = this.context;
-    const {unitsPerMeter} = viewport.getDistanceScales();
-    const {cpuAggregator} = this.state;
-
-    if (cpuAggregator.state.layerData && cpuAggregator.state.layerData.radiusCommon) {
-      const {radiusCommon} = cpuAggregator.state.layerData;
-      const radius = radiusCommon / unitsPerMeter[0];
 
-      // convert radius in common to meter
-      this.setState({angle: 90, radius});
+      this.setState({
+        // make a copy of the internal state of cpuAggregator for testing
+        aggregatorState
+      });
     }
   }
 
@@ -183,12 +158,19 @@ export default class HexagonLayer extends AggregationLayer {
 
   renderLayers() {
     const {elevationScale, extruded, coverage, material, transitions} = this.props;
-    const {angle, radius, cpuAggregator, vertices} = this.state;
+    const {aggregatorState, vertices} = this.state;
 
     const SubLayerClass = this.getSubLayerClass('hexagon-cell', ColumnLayer);
     const updateTriggers = this._getSublayerUpdateTriggers();
 
-    const geometry = vertices && vertices.length ? {vertices, radius: 1} : {radius, angle};
+    const geometry = vertices
+      ? {vertices, radius: 1}
+      : {
+          // default geometry
+          radius: aggregatorState.layerData.radiusCommon || 1,
+          radiusUnits: 'common',
+          angle: 90
+        };
     return new SubLayerClass(
       {
         ...geometry,
@@ -210,7 +192,7 @@ export default class HexagonLayer extends AggregationLayer {
         updateTriggers
       }),
       {
-        data: cpuAggregator.state.layerData.data
+        data: aggregatorState.layerData.data
       }
     );
   }