fix: blur in grid calculation

riatelab · Oct 21, 2022 · 5104b0f · 5104b0f
1 parent ed22e25
commit 5104b0f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 280 deletions.
diff --git a/src/helpers/grid.js b/src/helpers/grid.js
@@ -22,15 +22,14 @@ export function grid({
   output = "dots", // dots or squares
   blur = 0, // blur value with d3.blur2()
 } = {}) {
-
   // ---------------
   // Build empty grid
   // ---------------
 
   let x = d3.range(0 + step / 2, width, step);
   let y = d3.range(0 + step / 2, height, step).reverse();
-  const grid_width = x.length;
-  const grid_height = y.length;
+  const grid_height = x.length;
+  const grid_width = y.length;
 
   // Dot grid
   let grid = x.map((x, i) => y.map((y) => [x, y])).flat();
@@ -95,6 +94,22 @@ export function grid({
 
     let squarevalues = [];
 
+    // squaregrid.forEach((square) => {
+    //   let squareval = [];
+    //   dots.forEach((dot) => {
+    //     if (
+    //       turf.booleanPointInPolygon(
+    //         { type: "Point", coordinates: dot[1] },
+    //         { type: "Polygon", coordinates: [square] }
+    //       )
+    //     ) {
+    //       squareval.push(val.get(dot[0]));
+    //     }
+    //   });
+
+    //   squarevalues.push(d3.sum(squareval));
+    // });
+
     squaregrid.forEach((square) => {
       let squareval = [];
       let squareval_a = [];
@@ -112,15 +127,13 @@ export function grid({
           } else {
             squareval.push(val.get(dot[0]));
           }
-          squareval.push(val.get(dot[0]));
         }
       });
       if (ratio) {
         squarevalues.push(d3.sum(squareval_a) / d3.sum(squareval_b));
       } else {
         squarevalues.push(d3.sum(squareval));
       }
-      squarevalues.push(d3.sum(squareval));
     });
 
     const squarevalues2 = d3.blur2(

diff --git a/src/helpers/grid_save.js b/src/helpers/grid_save.js