@deck.gl/aggregation-layers 8.7.0-alpha.1 → 8.7.0-alpha.10

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.7.0-alpha.1",
+  "version": "8.7.0-alpha.10",
   "publishConfig": {
     "access": "public"
   },
@@ -30,12 +30,12 @@
   },
   "dependencies": {
     "@luma.gl/shadertools": "^8.5.10",
-    "@math.gl/web-mercator": "^3.5.4",
+    "@math.gl/web-mercator": "^3.5.6",
     "d3-hexbin": "^0.2.1"
   },
   "peerDependencies": {
     "@deck.gl/core": "^8.0.0",
     "@deck.gl/layers": "^8.0.0"
   },
-  "gitHead": "dbaa3941a41f3ddceecad4d2d2879515d97d2510"
+  "gitHead": "b6c48fb68b66755743c28776a0642b56a2df086a"
 }

package/src/contour-layer/marching-squares-codes.js

@@ -27,18 +27,48 @@ const NE_TRIANGLE = [OFFSET.E, OFFSET.NE, OFFSET.N];
 const NW_TRIANGLE = [OFFSET.NW, OFFSET.W, OFFSET.N];
 
 // Trapezoids
-const SW_TRAPEZOID = [[-HALF, ONE6TH], [-HALF, -ONE6TH], [-ONE6TH, -HALF], [ONE6TH, -HALF]];
-const SE_TRAPEZOID = [[-ONE6TH, -HALF], [ONE6TH, -HALF], [HALF, -ONE6TH], [HALF, ONE6TH]];
-const NE_TRAPEZOID = [[HALF, -ONE6TH], [HALF, ONE6TH], [ONE6TH, HALF], [-ONE6TH, HALF]];
-const NW_TRAPEZOID = [[-HALF, ONE6TH], [-HALF, -ONE6TH], [ONE6TH, HALF], [-ONE6TH, HALF]];
+const SW_TRAPEZOID = [
+  [-HALF, ONE6TH],
+  [-HALF, -ONE6TH],
+  [-ONE6TH, -HALF],
+  [ONE6TH, -HALF]
+];
+const SE_TRAPEZOID = [
+  [-ONE6TH, -HALF],
+  [ONE6TH, -HALF],
+  [HALF, -ONE6TH],
+  [HALF, ONE6TH]
+];
+const NE_TRAPEZOID = [
+  [HALF, -ONE6TH],
+  [HALF, ONE6TH],
+  [ONE6TH, HALF],
+  [-ONE6TH, HALF]
+];
+const NW_TRAPEZOID = [
+  [-HALF, ONE6TH],
+  [-HALF, -ONE6TH],
+  [ONE6TH, HALF],
+  [-ONE6TH, HALF]
+];
 
 // Rectangles
 const S_RECTANGLE = [OFFSET.W, OFFSET.SW, OFFSET.SE, OFFSET.E];
 const E_RECTANGLE = [OFFSET.S, OFFSET.SE, OFFSET.NE, OFFSET.N];
 const N_RECTANGLE = [OFFSET.NW, OFFSET.W, OFFSET.E, OFFSET.NE];
 const W_RECTANGLE = [OFFSET.NW, OFFSET.SW, OFFSET.S, OFFSET.N];
-const EW_RECTANGEL = [[-HALF, ONE6TH], [-HALF, -ONE6TH], [HALF, -ONE6TH], [HALF, ONE6TH]];
-const SN_RECTANGEL = [[-ONE6TH, -HALF], [ONE6TH, -HALF], [ONE6TH, HALF], [-ONE6TH, HALF]];
+const EW_RECTANGEL = [
+  [-HALF, ONE6TH],
+  [-HALF, -ONE6TH],
+  [HALF, -ONE6TH],
+  [HALF, ONE6TH]
+];
+const SN_RECTANGEL = [
+  [-ONE6TH, -HALF],
+  [ONE6TH, -HALF],
+  [ONE6TH, HALF],
+  [-ONE6TH, HALF]
+];
 
 // Square
 const SQUARE = [OFFSET.NW, OFFSET.SW, OFFSET.SE, OFFSET.NE];
@@ -131,16 +161,28 @@ export const ISOLINES_CODE_OFFSET_MAP = {
   3: [[OFFSET.W, OFFSET.E]],
   4: [[OFFSET.N, OFFSET.E]],
   5: {
-    0: [[OFFSET.W, OFFSET.S], [OFFSET.N, OFFSET.E]],
-    1: [[OFFSET.W, OFFSET.N], [OFFSET.S, OFFSET.E]]
+    0: [
+      [OFFSET.W, OFFSET.S],
+      [OFFSET.N, OFFSET.E]
+    ],
+    1: [
+      [OFFSET.W, OFFSET.N],
+      [OFFSET.S, OFFSET.E]
+    ]
   },
   6: [[OFFSET.N, OFFSET.S]],
   7: [[OFFSET.W, OFFSET.N]],
   8: [[OFFSET.W, OFFSET.N]],
   9: [[OFFSET.N, OFFSET.S]],
   10: {
-    0: [[OFFSET.W, OFFSET.N], [OFFSET.S, OFFSET.E]],
-    1: [[OFFSET.W, OFFSET.S], [OFFSET.N, OFFSET.E]]
+    0: [
+      [OFFSET.W, OFFSET.N],
+      [OFFSET.S, OFFSET.E]
+    ],
+    1: [
+      [OFFSET.W, OFFSET.S],
+      [OFFSET.N, OFFSET.E]
+    ]
   },
   11: [[OFFSET.N, OFFSET.E]],
   12: [[OFFSET.W, OFFSET.E]],

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

@@ -126,8 +126,7 @@ void main(void) {
   // Set color to be rendered to picking fbo (also used to check for selection highlight).
   picking_setPickingColor(instancePickingColors);
 
-  vec4 position_commonspace;
-  gl_Position = project_position_to_clipspace(centroidPosition, centroidPosition64Low, pos, position_commonspace);
+  gl_Position = project_position_to_clipspace(centroidPosition, centroidPosition64Low, pos, geometry.position);
 
   // Light calculations
   // Worldspace is the linear space after Mercator projection
@@ -135,7 +134,7 @@ void main(void) {
   vec3 normals_commonspace = project_normal(normals);
 
    if (extruded) {
-    vec3 lightColor = lighting_getLightColor(color.rgb, project_uCameraPosition, position_commonspace.xyz, normals_commonspace);
+    vec3 lightColor = lighting_getLightColor(color.rgb, project_uCameraPosition, geometry.position.xyz, normals_commonspace);
     vColor = vec4(lightColor, color.a * opacity) / 255.;
   } else {
     vColor = vec4(color.rgb, color.a * opacity) / 255.;

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

@@ -202,7 +202,9 @@ export default class HeatmapLayer extends AggregationLayer {
     triPositionBuffer?.delete();
     triTexCoordBuffer?.delete();
     colorTexture?.delete();
-    updateTimer && clearTimeout(updateTimer);
+    if (updateTimer) {
+      clearTimeout(updateTimer);
+    }
   }
 
   // PRIVATE
@@ -270,9 +272,7 @@ export default class HeatmapLayer extends AggregationLayer {
     this.setState({textureSize, format, type, weightsScale});
     if (!floatTargetSupport) {
       log.warn(
-        `HeatmapLayer: ${
-          this.id
-        } rendering to float texture not supported, fallingback to low precession format`
+        `HeatmapLayer: ${this.id} rendering to float texture not supported, fallingback to low precession format`
       )();
     }
   }
@@ -414,12 +414,8 @@ export default class HeatmapLayer extends AggregationLayer {
 
   _updateTextureRenderingBounds() {
     // Just render visible portion of the texture
-    const {
-      triPositionBuffer,
-      triTexCoordBuffer,
-      normalizedCommonBounds,
-      viewportCorners
-    } = this.state;
+    const {triPositionBuffer, triTexCoordBuffer, normalizedCommonBounds, viewportCorners} =
+      this.state;
 
     const {viewport} = this.context;
 

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

@@ -57,15 +57,8 @@ export default class TriangleLayer extends Layer {
   draw({uniforms}) {
     const {model} = this.state;
 
-    const {
-      texture,
-      maxTexture,
-      colorTexture,
-      intensity,
-      threshold,
-      aggregationMode,
-      colorDomain
-    } = this.props;
+    const {texture, maxTexture, colorTexture, intensity, threshold, aggregationMode, colorDomain} =
+      this.props;
 
     model
       .setUniforms({

package/src/utils/aggregation-operation-utils.js

@@ -104,6 +104,9 @@ function wrapAccessor(accessor, context = {}) {
 export function wrapGetValueFunc(getValue, context = {}) {
   return pts => {
     context.indices = pts.map(pt => pt.index);
-    return getValue(pts.map(pt => pt.source), context);
+    return getValue(
+      pts.map(pt => pt.source),
+      context
+    );
   };
 }