Fix for rectangle and square grid dimensions (#2106)

* Use non-haversine distance calc * remove unused import * fix up non-haversine * Update turf/squareGrid test files as well * prettier * Fix the square grid tests properly * prettier again * update @turf/interpolate test output (because of square-grid changes) * update @turf/square-grid test output Co-authored-by: Matt Fedderly <mfedderly@palantir.com> Co-authored-by: mfedderly <mdfedderly@mdfedderly.com>
Turfjs · Aug 5, 2021 · 446b27b · 446b27b
1 parent cd86447
commit 446b27b
Show file tree

Hide file tree

Showing 20 changed files with 103,181 additions and 17,477 deletions.
diff --git a/packages/turf-interpolate/test/out/data-1km.geojson b/packages/turf-interpolate/test/out/data-1km.geojson
diff --git a/packages/turf-interpolate/test/out/data-500m.geojson b/packages/turf-interpolate/test/out/data-500m.geojson
diff --git a/packages/turf-interpolate/test/out/data-weight-2.geojson b/packages/turf-interpolate/test/out/data-weight-2.geojson
diff --git a/packages/turf-rectangle-grid/index.ts b/packages/turf-rectangle-grid/index.ts
@@ -1,7 +1,7 @@
 import intersect from "@turf/boolean-intersects";
-import distance from "@turf/distance";
 import {
   BBox,
+  convertLength,
   Feature,
   featureCollection,
   FeatureCollection,
@@ -54,17 +54,14 @@ function rectangleGrid<P = Properties>(
   const east = bbox[2];
   const north = bbox[3];
 
-  const xFraction = cellWidth / distance([west, south], [east, south], options);
-  const cellWidthDeg = xFraction * (east - west);
-  const yFraction =
-    cellHeight / distance([west, south], [west, north], options);
-  const cellHeightDeg = yFraction * (north - south);
-
-  // rows & columns
   const bboxWidth = east - west;
+  const cellWidthDeg = convertLength(cellWidth, options.units, "degrees");
+
   const bboxHeight = north - south;
-  const columns = Math.floor(bboxWidth / cellWidthDeg);
-  const rows = Math.floor(bboxHeight / cellHeightDeg);
+  const cellHeightDeg = convertLength(cellHeight, options.units, "degrees");
+
+  const columns = Math.floor(Math.abs(bboxWidth) / cellWidthDeg);
+  const rows = Math.floor(Math.abs(bboxHeight) / cellHeightDeg);
 
   // if the grid does not fill the bbox perfectly, center it.
   const deltaX = (bboxWidth - columns * cellWidthDeg) / 2;

diff --git a/packages/turf-rectangle-grid/test/in/global-grid.json b/packages/turf-rectangle-grid/test/in/global-grid.json
@@ -0,0 +1,6 @@
+{
+  "bbox": [-180, -90, 180, 90],
+  "cellWidth": 10,
+  "cellHeight": 10,
+  "units": "degrees"
+}
diff --git a/packages/turf-rectangle-grid/test/in/victoria-20x100-km.json b/packages/turf-rectangle-grid/test/in/victoria-20x100-km.json
@@ -1,5 +1,5 @@
 {
-  "bbox": [141, -34, 150, -39],
+  "bbox": [141, -39, 150, -34],
   "cellWidth": 20,
   "cellHeight": 100,
   "units": "kilometers"