@turf/hex-grid 7.0.0-alpha.2 → 7.0.0

package/README.md

@@ -57,26 +57,21 @@ Returns **[FeatureCollection][11]<[Polygon][9]>** a hexagonal grid
 
 [11]: https://tools.ietf.org/html/rfc7946#section-3.3
 
-<!-- This file is automatically generated. Please don't edit it directly:
-if you find an error, edit the source file (likely index.js), and re-run
-./scripts/generate-readmes in the turf project. -->
+<!-- This file is automatically generated. Please don't edit it directly. If you find an error, edit the source file of the module in question (likely index.js or index.ts), and re-run "yarn docs" from the root of the turf project. -->
 
 ---
 
-This module is part of the [Turfjs project](http://turfjs.org/), an open source
-module collection dedicated to geographic algorithms. It is maintained in the
-[Turfjs/turf](https://github.com/Turfjs/turf) repository, where you can create
-PRs and issues.
+This module is part of the [Turfjs project](https://turfjs.org/), an open source module collection dedicated to geographic algorithms. It is maintained in the [Turfjs/turf](https://github.com/Turfjs/turf) repository, where you can create PRs and issues.
 
 ### Installation
 
-Install this module individually:
+Install this single module individually:
 
 ```sh
 $ npm install @turf/hex-grid
 ```
 
-Or install the Turf module that includes it as a function:
+Or install the all-encompassing @turf/turf module that includes all modules as functions:
 
 ```sh
 $ npm install @turf/turf

package/dist/cjs/index.cjs

@@ -0,0 +1,122 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+
+// index.ts
+var _distance = require('@turf/distance');
+var _intersect = require('@turf/intersect');
+var _helpers = require('@turf/helpers');
+function hexGrid(bbox, cellSide, options = {}) {
+  const clonedProperties = JSON.stringify(options.properties || {});
+  const [west, south, east, north] = bbox;
+  const centerY = (south + north) / 2;
+  const centerX = (west + east) / 2;
+  const xFraction = cellSide * 2 / _distance.distance.call(void 0, [west, centerY], [east, centerY], options);
+  const cellWidth = xFraction * (east - west);
+  const yFraction = cellSide * 2 / _distance.distance.call(void 0, [centerX, south], [centerX, north], options);
+  const cellHeight = yFraction * (north - south);
+  const radius = cellWidth / 2;
+  const hex_width = radius * 2;
+  const hex_height = Math.sqrt(3) / 2 * cellHeight;
+  const box_width = east - west;
+  const box_height = north - south;
+  const x_interval = 3 / 4 * hex_width;
+  const y_interval = hex_height;
+  const x_span = (box_width - hex_width) / (hex_width - radius / 2);
+  const x_count = Math.floor(x_span);
+  const x_adjust = (x_count * x_interval - radius / 2 - box_width) / 2 - radius / 2 + x_interval / 2;
+  const y_count = Math.floor((box_height - hex_height) / hex_height);
+  let y_adjust = (box_height - y_count * hex_height) / 2;
+  const hasOffsetY = y_count * hex_height - box_height > hex_height / 2;
+  if (hasOffsetY) {
+    y_adjust -= hex_height / 4;
+  }
+  const cosines = [];
+  const sines = [];
+  for (let i = 0; i < 6; i++) {
+    const angle = 2 * Math.PI / 6 * i;
+    cosines.push(Math.cos(angle));
+    sines.push(Math.sin(angle));
+  }
+  const results = [];
+  for (let x = 0; x <= x_count; x++) {
+    for (let y = 0; y <= y_count; y++) {
+      const isOdd = x % 2 === 1;
+      if (y === 0 && isOdd)
+        continue;
+      if (y === 0 && hasOffsetY)
+        continue;
+      const center_x = x * x_interval + west - x_adjust;
+      let center_y = y * y_interval + south + y_adjust;
+      if (isOdd) {
+        center_y -= hex_height / 2;
+      }
+      if (options.triangles === true) {
+        hexTriangles(
+          [center_x, center_y],
+          cellWidth / 2,
+          cellHeight / 2,
+          JSON.parse(clonedProperties),
+          cosines,
+          sines
+        ).forEach(function(triangle) {
+          if (options.mask) {
+            if (_intersect.intersect.call(void 0, _helpers.featureCollection.call(void 0, [options.mask, triangle])))
+              results.push(triangle);
+          } else {
+            results.push(triangle);
+          }
+        });
+      } else {
+        const hex = hexagon(
+          [center_x, center_y],
+          cellWidth / 2,
+          cellHeight / 2,
+          JSON.parse(clonedProperties),
+          cosines,
+          sines
+        );
+        if (options.mask) {
+          if (_intersect.intersect.call(void 0, _helpers.featureCollection.call(void 0, [options.mask, hex])))
+            results.push(hex);
+        } else {
+          results.push(hex);
+        }
+      }
+    }
+  }
+  return _helpers.featureCollection.call(void 0, results);
+}
+__name(hexGrid, "hexGrid");
+function hexagon(center, rx, ry, properties, cosines, sines) {
+  const vertices = [];
+  for (let i = 0; i < 6; i++) {
+    const x = center[0] + rx * cosines[i];
+    const y = center[1] + ry * sines[i];
+    vertices.push([x, y]);
+  }
+  vertices.push(vertices[0].slice());
+  return _helpers.polygon.call(void 0, [vertices], properties);
+}
+__name(hexagon, "hexagon");
+function hexTriangles(center, rx, ry, properties, cosines, sines) {
+  const triangles = [];
+  for (let i = 0; i < 6; i++) {
+    const vertices = [];
+    vertices.push(center);
+    vertices.push([center[0] + rx * cosines[i], center[1] + ry * sines[i]]);
+    vertices.push([
+      center[0] + rx * cosines[(i + 1) % 6],
+      center[1] + ry * sines[(i + 1) % 6]
+    ]);
+    vertices.push(center);
+    triangles.push(_helpers.polygon.call(void 0, [vertices], properties));
+  }
+  return triangles;
+}
+__name(hexTriangles, "hexTriangles");
+var turf_hex_grid_default = hexGrid;
+
+
+
+exports.default = turf_hex_grid_default; exports.hexGrid = hexGrid;
+//# sourceMappingURL=index.cjs.map

package/dist/cjs/index.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../index.ts"],"names":[],"mappings":";;;;AAAA,SAAS,gBAAgB;AACzB,SAAS,iBAAiB;AAQ1B,SAAS,SAAS,yBAAgC;AA2BlD,SAAS,QACP,MACA,UACA,UAKI,CAAC,GAC0B;AAE/B,QAAM,mBAAmB,KAAK,UAAU,QAAQ,cAAc,CAAC,CAAC;AAEhE,QAAM,CAAC,MAAM,OAAO,MAAM,KAAK,IAAI;AACnC,QAAM,WAAW,QAAQ,SAAS;AAClC,QAAM,WAAW,OAAO,QAAQ;AAGhC,QAAM,YACH,WAAW,IAAK,SAAS,CAAC,MAAM,OAAO,GAAG,CAAC,MAAM,OAAO,GAAG,OAAO;AACrE,QAAM,YAAY,aAAa,OAAO;AACtC,QAAM,YACH,WAAW,IAAK,SAAS,CAAC,SAAS,KAAK,GAAG,CAAC,SAAS,KAAK,GAAG,OAAO;AACvE,QAAM,aAAa,aAAa,QAAQ;AACxC,QAAM,SAAS,YAAY;AAE3B,QAAM,YAAY,SAAS;AAC3B,QAAM,aAAc,KAAK,KAAK,CAAC,IAAI,IAAK;AAExC,QAAM,YAAY,OAAO;AACzB,QAAM,aAAa,QAAQ;AAE3B,QAAM,aAAc,IAAI,IAAK;AAC7B,QAAM,aAAa;AAGnB,QAAM,UAAU,YAAY,cAAc,YAAY,SAAS;AAC/D,QAAM,UAAU,KAAK,MAAM,MAAM;AAEjC,QAAM,YACH,UAAU,aAAa,SAAS,IAAI,aAAa,IAClD,SAAS,IACT,aAAa;AAGf,QAAM,UAAU,KAAK,OAAO,aAAa,cAAc,UAAU;AAEjE,MAAI,YAAY,aAAa,UAAU,cAAc;AAErD,QAAM,aAAa,UAAU,aAAa,aAAa,aAAa;AACpE,MAAI,YAAY;AACd,gBAAY,aAAa;AAAA,EAC3B;AAGA,QAAM,UAAU,CAAC;AACjB,QAAM,QAAQ,CAAC;AACf,WAAS,IAAI,GAAG,IAAI,GAAG,KAAK;AAC1B,UAAM,QAAU,IAAI,KAAK,KAAM,IAAK;AACpC,YAAQ,KAAK,KAAK,IAAI,KAAK,CAAC;AAC5B,UAAM,KAAK,KAAK,IAAI,KAAK,CAAC;AAAA,EAC5B;AAEA,QAAM,UAAU,CAAC;AACjB,WAAS,IAAI,GAAG,KAAK,SAAS,KAAK;AACjC,aAAS,IAAI,GAAG,KAAK,SAAS,KAAK;AACjC,YAAM,QAAQ,IAAI,MAAM;AACxB,UAAI,MAAM,KAAK;AAAO;AACtB,UAAI,MAAM,KAAK;AAAY;AAE3B,YAAM,WAAW,IAAI,aAAa,OAAO;AACzC,UAAI,WAAW,IAAI,aAAa,QAAQ;AAExC,UAAI,OAAO;AACT,oBAAY,aAAa;AAAA,MAC3B;AAEA,UAAI,QAAQ,cAAc,MAAM;AAC9B;AAAA,UACE,CAAC,UAAU,QAAQ;AAAA,UACnB,YAAY;AAAA,UACZ,aAAa;AAAA,UACb,KAAK,MAAM,gBAAgB;AAAA,UAC3B;AAAA,UACA;AAAA,QACF,EAAE,QAAQ,SAAU,UAAU;AAC5B,cAAI,QAAQ,MAAM;AAChB,gBAAI,UAAU,kBAAkB,CAAC,QAAQ,MAAM,QAAQ,CAAC,CAAC;AACvD,sBAAQ,KAAK,QAAQ;AAAA,UACzB,OAAO;AACL,oBAAQ,KAAK,QAAQ;AAAA,UACvB;AAAA,QACF,CAAC;AAAA,MACH,OAAO;AACL,cAAM,MAAM;AAAA,UACV,CAAC,UAAU,QAAQ;AAAA,UACnB,YAAY;AAAA,UACZ,aAAa;AAAA,UACb,KAAK,MAAM,gBAAgB;AAAA,UAC3B;AAAA,UACA;AAAA,QACF;AACA,YAAI,QAAQ,MAAM;AAChB,cAAI,UAAU,kBAAkB,CAAC,QAAQ,MAAM,GAAG,CAAC,CAAC;AAClD,oBAAQ,KAAK,GAAG;AAAA,QACpB,OAAO;AACL,kBAAQ,KAAK,GAAG;AAAA,QAClB;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,SAAO,kBAAkB,OAAO;AAClC;AAjHS;AA+HT,SAAS,QACP,QACA,IACA,IACA,YACA,SACA,OACA;AACA,QAAM,WAAW,CAAC;AAClB,WAAS,IAAI,GAAG,IAAI,GAAG,KAAK;AAC1B,UAAM,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC;AACpC,UAAM,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC;AAClC,aAAS,KAAK,CAAC,GAAG,CAAC,CAAC;AAAA,EACtB;AAEA,WAAS,KAAK,SAAS,CAAC,EAAE,MAAM,CAAC;AACjC,SAAO,QAAQ,CAAC,QAAQ,GAAG,UAAU;AACvC;AAjBS;AA+BT,SAAS,aACP,QACA,IACA,IACA,YACA,SACA,OACA;AACA,QAAM,YAAY,CAAC;AACnB,WAAS,IAAI,GAAG,IAAI,GAAG,KAAK;AAC1B,UAAM,WAAW,CAAC;AAClB,aAAS,KAAK,MAAM;AACpB,aAAS,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC;AACtE,aAAS,KAAK;AAAA,MACZ,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC;AAAA,MACpC,OAAO,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC;AAAA,IACpC,CAAC;AACD,aAAS,KAAK,MAAM;AACpB,cAAU,KAAK,QAAQ,CAAC,QAAQ,GAAG,UAAU,CAAC;AAAA,EAChD;AACA,SAAO;AACT;AArBS;AAwBT,IAAO,wBAAQ","sourcesContent":["import { distance } from \"@turf/distance\";\nimport { intersect } from \"@turf/intersect\";\nimport {\n  Feature,\n  FeatureCollection,\n  GeoJsonProperties,\n  Polygon,\n  BBox,\n} from \"geojson\";\nimport { polygon, featureCollection, Units } from \"@turf/helpers\";\n\n/**\n * Takes a bounding box and the diameter of the cell and returns a {@link FeatureCollection} of flat-topped\n * hexagons or triangles ({@link Polygon} features) aligned in an \"odd-q\" vertical grid as\n * described in [Hexagonal Grids](http://www.redblobgames.com/grids/hexagons/).\n *\n * @name hexGrid\n * @param {BBox} bbox extent in [minX, minY, maxX, maxY] order\n * @param {number} cellSide length of the side of the the hexagons or triangles, in units. It will also coincide with the\n * radius of the circumcircle of the hexagons.\n * @param {Object} [options={}] Optional parameters\n * @param {string} [options.units='kilometers'] used in calculating cell size, can be degrees, radians, miles, or kilometers\n * @param {Object} [options.properties={}] passed to each hexagon or triangle of the grid\n * @param {Feature<Polygon>} [options.mask] if passed a Polygon or MultiPolygon, the grid Points will be created only inside it\n * @param {boolean} [options.triangles=false] whether to return as triangles instead of hexagons\n * @returns {FeatureCollection<Polygon>} a hexagonal grid\n * @example\n * var bbox = [-96,31,-84,40];\n * var cellSide = 50;\n * var options = {units: 'miles'};\n *\n * var hexgrid = turf.hexGrid(bbox, cellSide, options);\n *\n * //addToMap\n * var addToMap = [hexgrid];\n */\nfunction hexGrid<P extends GeoJsonProperties = GeoJsonProperties>(\n  bbox: BBox,\n  cellSide: number,\n  options: {\n    units?: Units;\n    triangles?: boolean;\n    properties?: P;\n    mask?: Feature<Polygon>;\n  } = {}\n): FeatureCollection<Polygon, P> {\n  // Issue => https://github.com/Turfjs/turf/issues/1284\n  const clonedProperties = JSON.stringify(options.properties || {});\n\n  const [west, south, east, north] = bbox;\n  const centerY = (south + north) / 2;\n  const centerX = (west + east) / 2;\n\n  // https://github.com/Turfjs/turf/issues/758\n  const xFraction =\n    (cellSide * 2) / distance([west, centerY], [east, centerY], options);\n  const cellWidth = xFraction * (east - west);\n  const yFraction =\n    (cellSide * 2) / distance([centerX, south], [centerX, north], options);\n  const cellHeight = yFraction * (north - south);\n  const radius = cellWidth / 2;\n\n  const hex_width = radius * 2;\n  const hex_height = (Math.sqrt(3) / 2) * cellHeight;\n\n  const box_width = east - west;\n  const box_height = north - south;\n\n  const x_interval = (3 / 4) * hex_width;\n  const y_interval = hex_height;\n\n  // adjust box_width so all hexagons will be inside the bbox\n  const x_span = (box_width - hex_width) / (hex_width - radius / 2);\n  const x_count = Math.floor(x_span);\n\n  const x_adjust =\n    (x_count * x_interval - radius / 2 - box_width) / 2 -\n    radius / 2 +\n    x_interval / 2;\n\n  // adjust box_height so all hexagons will be inside the bbox\n  const y_count = Math.floor((box_height - hex_height) / hex_height);\n\n  let y_adjust = (box_height - y_count * hex_height) / 2;\n\n  const hasOffsetY = y_count * hex_height - box_height > hex_height / 2;\n  if (hasOffsetY) {\n    y_adjust -= hex_height / 4;\n  }\n\n  // Precompute cosines and sines of angles used in hexagon creation for performance gain\n  const cosines = [];\n  const sines = [];\n  for (let i = 0; i < 6; i++) {\n    const angle = ((2 * Math.PI) / 6) * i;\n    cosines.push(Math.cos(angle));\n    sines.push(Math.sin(angle));\n  }\n\n  const results = [];\n  for (let x = 0; x <= x_count; x++) {\n    for (let y = 0; y <= y_count; y++) {\n      const isOdd = x % 2 === 1;\n      if (y === 0 && isOdd) continue;\n      if (y === 0 && hasOffsetY) continue;\n\n      const center_x = x * x_interval + west - x_adjust;\n      let center_y = y * y_interval + south + y_adjust;\n\n      if (isOdd) {\n        center_y -= hex_height / 2;\n      }\n\n      if (options.triangles === true) {\n        hexTriangles(\n          [center_x, center_y],\n          cellWidth / 2,\n          cellHeight / 2,\n          JSON.parse(clonedProperties),\n          cosines,\n          sines\n        ).forEach(function (triangle) {\n          if (options.mask) {\n            if (intersect(featureCollection([options.mask, triangle])))\n              results.push(triangle);\n          } else {\n            results.push(triangle);\n          }\n        });\n      } else {\n        const hex = hexagon(\n          [center_x, center_y],\n          cellWidth / 2,\n          cellHeight / 2,\n          JSON.parse(clonedProperties),\n          cosines,\n          sines\n        );\n        if (options.mask) {\n          if (intersect(featureCollection([options.mask, hex])))\n            results.push(hex);\n        } else {\n          results.push(hex);\n        }\n      }\n    }\n  }\n\n  return featureCollection(results) as FeatureCollection<Polygon, P>;\n}\n\n/**\n * Creates hexagon\n *\n * @private\n * @param {Array<number>} center of the hexagon\n * @param {number} rx half hexagon width\n * @param {number} ry half hexagon height\n * @param {Object} properties passed to each hexagon\n * @param {Array<number>} cosines precomputed\n * @param {Array<number>} sines precomputed\n * @returns {Feature<Polygon>} hexagon\n */\nfunction hexagon(\n  center: number[],\n  rx: number,\n  ry: number,\n  properties: GeoJsonProperties,\n  cosines: number[],\n  sines: number[]\n) {\n  const vertices = [];\n  for (let i = 0; i < 6; i++) {\n    const x = center[0] + rx * cosines[i];\n    const y = center[1] + ry * sines[i];\n    vertices.push([x, y]);\n  }\n  //first and last vertex must be the same\n  vertices.push(vertices[0].slice());\n  return polygon([vertices], properties);\n}\n\n/**\n * Creates triangles composing an hexagon\n *\n * @private\n * @param {Array<number>} center of the hexagon\n * @param {number} rx half triangle width\n * @param {number} ry half triangle height\n * @param {Object} properties passed to each triangle\n * @param {Array<number>} cosines precomputed\n * @param {Array<number>} sines precomputed\n * @returns {Array<Feature<Polygon>>} triangles\n */\nfunction hexTriangles(\n  center: number[],\n  rx: number,\n  ry: number,\n  properties: GeoJsonProperties,\n  cosines: number[],\n  sines: number[]\n) {\n  const triangles = [];\n  for (let i = 0; i < 6; i++) {\n    const vertices = [];\n    vertices.push(center);\n    vertices.push([center[0] + rx * cosines[i], center[1] + ry * sines[i]]);\n    vertices.push([\n      center[0] + rx * cosines[(i + 1) % 6],\n      center[1] + ry * sines[(i + 1) % 6],\n    ]);\n    vertices.push(center);\n    triangles.push(polygon([vertices], properties));\n  }\n  return triangles;\n}\n\nexport { hexGrid };\nexport default hexGrid;\n"]}

package/dist/cjs/index.d.cts

@@ -0,0 +1,36 @@
+import { GeoJsonProperties, BBox, Feature, Polygon, FeatureCollection } from 'geojson';
+import { Units } from '@turf/helpers';
+
+/**
+ * Takes a bounding box and the diameter of the cell and returns a {@link FeatureCollection} of flat-topped
+ * hexagons or triangles ({@link Polygon} features) aligned in an "odd-q" vertical grid as
+ * described in [Hexagonal Grids](http://www.redblobgames.com/grids/hexagons/).
+ *
+ * @name hexGrid
+ * @param {BBox} bbox extent in [minX, minY, maxX, maxY] order
+ * @param {number} cellSide length of the side of the the hexagons or triangles, in units. It will also coincide with the
+ * radius of the circumcircle of the hexagons.
+ * @param {Object} [options={}] Optional parameters
+ * @param {string} [options.units='kilometers'] used in calculating cell size, can be degrees, radians, miles, or kilometers
+ * @param {Object} [options.properties={}] passed to each hexagon or triangle of the grid
+ * @param {Feature<Polygon>} [options.mask] if passed a Polygon or MultiPolygon, the grid Points will be created only inside it
+ * @param {boolean} [options.triangles=false] whether to return as triangles instead of hexagons
+ * @returns {FeatureCollection<Polygon>} a hexagonal grid
+ * @example
+ * var bbox = [-96,31,-84,40];
+ * var cellSide = 50;
+ * var options = {units: 'miles'};
+ *
+ * var hexgrid = turf.hexGrid(bbox, cellSide, options);
+ *
+ * //addToMap
+ * var addToMap = [hexgrid];
+ */
+declare function hexGrid<P extends GeoJsonProperties = GeoJsonProperties>(bbox: BBox, cellSide: number, options?: {
+    units?: Units;
+    triangles?: boolean;
+    properties?: P;
+    mask?: Feature<Polygon>;
+}): FeatureCollection<Polygon, P>;
+
+export { hexGrid as default, hexGrid };

package/dist/{js → esm}/index.d.ts

@@ -1,5 +1,6 @@
-import { Feature, FeatureCollection, GeoJsonProperties, Polygon, BBox } from "geojson";
-import { Units } from "@turf/helpers";
+import { GeoJsonProperties, BBox, Feature, Polygon, FeatureCollection } from 'geojson';
+import { Units } from '@turf/helpers';
+
 /**
  * Takes a bounding box and the diameter of the cell and returns a {@link FeatureCollection} of flat-topped
  * hexagons or triangles ({@link Polygon} features) aligned in an "odd-q" vertical grid as
@@ -25,10 +26,11 @@ import { Units } from "@turf/helpers";
  * //addToMap
  * var addToMap = [hexgrid];
  */
-declare function hexGrid<P = GeoJsonProperties>(bbox: BBox, cellSide: number, options?: {
+declare function hexGrid<P extends GeoJsonProperties = GeoJsonProperties>(bbox: BBox, cellSide: number, options?: {
     units?: Units;
     triangles?: boolean;
     properties?: P;
     mask?: Feature<Polygon>;
 }): FeatureCollection<Polygon, P>;
-export default hexGrid;
+
+export { hexGrid as default, hexGrid };

package/dist/esm/index.js

@@ -0,0 +1,122 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+
+// index.ts
+import { distance } from "@turf/distance";
+import { intersect } from "@turf/intersect";
+import { polygon, featureCollection } from "@turf/helpers";
+function hexGrid(bbox, cellSide, options = {}) {
+  const clonedProperties = JSON.stringify(options.properties || {});
+  const [west, south, east, north] = bbox;
+  const centerY = (south + north) / 2;
+  const centerX = (west + east) / 2;
+  const xFraction = cellSide * 2 / distance([west, centerY], [east, centerY], options);
+  const cellWidth = xFraction * (east - west);
+  const yFraction = cellSide * 2 / distance([centerX, south], [centerX, north], options);
+  const cellHeight = yFraction * (north - south);
+  const radius = cellWidth / 2;
+  const hex_width = radius * 2;
+  const hex_height = Math.sqrt(3) / 2 * cellHeight;
+  const box_width = east - west;
+  const box_height = north - south;
+  const x_interval = 3 / 4 * hex_width;
+  const y_interval = hex_height;
+  const x_span = (box_width - hex_width) / (hex_width - radius / 2);
+  const x_count = Math.floor(x_span);
+  const x_adjust = (x_count * x_interval - radius / 2 - box_width) / 2 - radius / 2 + x_interval / 2;
+  const y_count = Math.floor((box_height - hex_height) / hex_height);
+  let y_adjust = (box_height - y_count * hex_height) / 2;
+  const hasOffsetY = y_count * hex_height - box_height > hex_height / 2;
+  if (hasOffsetY) {
+    y_adjust -= hex_height / 4;
+  }
+  const cosines = [];
+  const sines = [];
+  for (let i = 0; i < 6; i++) {
+    const angle = 2 * Math.PI / 6 * i;
+    cosines.push(Math.cos(angle));
+    sines.push(Math.sin(angle));
+  }
+  const results = [];
+  for (let x = 0; x <= x_count; x++) {
+    for (let y = 0; y <= y_count; y++) {
+      const isOdd = x % 2 === 1;
+      if (y === 0 && isOdd)
+        continue;
+      if (y === 0 && hasOffsetY)
+        continue;
+      const center_x = x * x_interval + west - x_adjust;
+      let center_y = y * y_interval + south + y_adjust;
+      if (isOdd) {
+        center_y -= hex_height / 2;
+      }
+      if (options.triangles === true) {
+        hexTriangles(
+          [center_x, center_y],
+          cellWidth / 2,
+          cellHeight / 2,
+          JSON.parse(clonedProperties),
+          cosines,
+          sines
+        ).forEach(function(triangle) {
+          if (options.mask) {
+            if (intersect(featureCollection([options.mask, triangle])))
+              results.push(triangle);
+          } else {
+            results.push(triangle);
+          }
+        });
+      } else {
+        const hex = hexagon(
+          [center_x, center_y],
+          cellWidth / 2,
+          cellHeight / 2,
+          JSON.parse(clonedProperties),
+          cosines,
+          sines
+        );
+        if (options.mask) {
+          if (intersect(featureCollection([options.mask, hex])))
+            results.push(hex);
+        } else {
+          results.push(hex);
+        }
+      }
+    }
+  }
+  return featureCollection(results);
+}
+__name(hexGrid, "hexGrid");
+function hexagon(center, rx, ry, properties, cosines, sines) {
+  const vertices = [];
+  for (let i = 0; i < 6; i++) {
+    const x = center[0] + rx * cosines[i];
+    const y = center[1] + ry * sines[i];
+    vertices.push([x, y]);
+  }
+  vertices.push(vertices[0].slice());
+  return polygon([vertices], properties);
+}
+__name(hexagon, "hexagon");
+function hexTriangles(center, rx, ry, properties, cosines, sines) {
+  const triangles = [];
+  for (let i = 0; i < 6; i++) {
+    const vertices = [];
+    vertices.push(center);
+    vertices.push([center[0] + rx * cosines[i], center[1] + ry * sines[i]]);
+    vertices.push([
+      center[0] + rx * cosines[(i + 1) % 6],
+      center[1] + ry * sines[(i + 1) % 6]
+    ]);
+    vertices.push(center);
+    triangles.push(polygon([vertices], properties));
+  }
+  return triangles;
+}
+__name(hexTriangles, "hexTriangles");
+var turf_hex_grid_default = hexGrid;
+export {
+  turf_hex_grid_default as default,
+  hexGrid
+};
+//# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../index.ts"],"sourcesContent":["import { distance } from \"@turf/distance\";\nimport { intersect } from \"@turf/intersect\";\nimport {\n  Feature,\n  FeatureCollection,\n  GeoJsonProperties,\n  Polygon,\n  BBox,\n} from \"geojson\";\nimport { polygon, featureCollection, Units } from \"@turf/helpers\";\n\n/**\n * Takes a bounding box and the diameter of the cell and returns a {@link FeatureCollection} of flat-topped\n * hexagons or triangles ({@link Polygon} features) aligned in an \"odd-q\" vertical grid as\n * described in [Hexagonal Grids](http://www.redblobgames.com/grids/hexagons/).\n *\n * @name hexGrid\n * @param {BBox} bbox extent in [minX, minY, maxX, maxY] order\n * @param {number} cellSide length of the side of the the hexagons or triangles, in units. It will also coincide with the\n * radius of the circumcircle of the hexagons.\n * @param {Object} [options={}] Optional parameters\n * @param {string} [options.units='kilometers'] used in calculating cell size, can be degrees, radians, miles, or kilometers\n * @param {Object} [options.properties={}] passed to each hexagon or triangle of the grid\n * @param {Feature<Polygon>} [options.mask] if passed a Polygon or MultiPolygon, the grid Points will be created only inside it\n * @param {boolean} [options.triangles=false] whether to return as triangles instead of hexagons\n * @returns {FeatureCollection<Polygon>} a hexagonal grid\n * @example\n * var bbox = [-96,31,-84,40];\n * var cellSide = 50;\n * var options = {units: 'miles'};\n *\n * var hexgrid = turf.hexGrid(bbox, cellSide, options);\n *\n * //addToMap\n * var addToMap = [hexgrid];\n */\nfunction hexGrid<P extends GeoJsonProperties = GeoJsonProperties>(\n  bbox: BBox,\n  cellSide: number,\n  options: {\n    units?: Units;\n    triangles?: boolean;\n    properties?: P;\n    mask?: Feature<Polygon>;\n  } = {}\n): FeatureCollection<Polygon, P> {\n  // Issue => https://github.com/Turfjs/turf/issues/1284\n  const clonedProperties = JSON.stringify(options.properties || {});\n\n  const [west, south, east, north] = bbox;\n  const centerY = (south + north) / 2;\n  const centerX = (west + east) / 2;\n\n  // https://github.com/Turfjs/turf/issues/758\n  const xFraction =\n    (cellSide * 2) / distance([west, centerY], [east, centerY], options);\n  const cellWidth = xFraction * (east - west);\n  const yFraction =\n    (cellSide * 2) / distance([centerX, south], [centerX, north], options);\n  const cellHeight = yFraction * (north - south);\n  const radius = cellWidth / 2;\n\n  const hex_width = radius * 2;\n  const hex_height = (Math.sqrt(3) / 2) * cellHeight;\n\n  const box_width = east - west;\n  const box_height = north - south;\n\n  const x_interval = (3 / 4) * hex_width;\n  const y_interval = hex_height;\n\n  // adjust box_width so all hexagons will be inside the bbox\n  const x_span = (box_width - hex_width) / (hex_width - radius / 2);\n  const x_count = Math.floor(x_span);\n\n  const x_adjust =\n    (x_count * x_interval - radius / 2 - box_width) / 2 -\n    radius / 2 +\n    x_interval / 2;\n\n  // adjust box_height so all hexagons will be inside the bbox\n  const y_count = Math.floor((box_height - hex_height) / hex_height);\n\n  let y_adjust = (box_height - y_count * hex_height) / 2;\n\n  const hasOffsetY = y_count * hex_height - box_height > hex_height / 2;\n  if (hasOffsetY) {\n    y_adjust -= hex_height / 4;\n  }\n\n  // Precompute cosines and sines of angles used in hexagon creation for performance gain\n  const cosines = [];\n  const sines = [];\n  for (let i = 0; i < 6; i++) {\n    const angle = ((2 * Math.PI) / 6) * i;\n    cosines.push(Math.cos(angle));\n    sines.push(Math.sin(angle));\n  }\n\n  const results = [];\n  for (let x = 0; x <= x_count; x++) {\n    for (let y = 0; y <= y_count; y++) {\n      const isOdd = x % 2 === 1;\n      if (y === 0 && isOdd) continue;\n      if (y === 0 && hasOffsetY) continue;\n\n      const center_x = x * x_interval + west - x_adjust;\n      let center_y = y * y_interval + south + y_adjust;\n\n      if (isOdd) {\n        center_y -= hex_height / 2;\n      }\n\n      if (options.triangles === true) {\n        hexTriangles(\n          [center_x, center_y],\n          cellWidth / 2,\n          cellHeight / 2,\n          JSON.parse(clonedProperties),\n          cosines,\n          sines\n        ).forEach(function (triangle) {\n          if (options.mask) {\n            if (intersect(featureCollection([options.mask, triangle])))\n              results.push(triangle);\n          } else {\n            results.push(triangle);\n          }\n        });\n      } else {\n        const hex = hexagon(\n          [center_x, center_y],\n          cellWidth / 2,\n          cellHeight / 2,\n          JSON.parse(clonedProperties),\n          cosines,\n          sines\n        );\n        if (options.mask) {\n          if (intersect(featureCollection([options.mask, hex])))\n            results.push(hex);\n        } else {\n          results.push(hex);\n        }\n      }\n    }\n  }\n\n  return featureCollection(results) as FeatureCollection<Polygon, P>;\n}\n\n/**\n * Creates hexagon\n *\n * @private\n * @param {Array<number>} center of the hexagon\n * @param {number} rx half hexagon width\n * @param {number} ry half hexagon height\n * @param {Object} properties passed to each hexagon\n * @param {Array<number>} cosines precomputed\n * @param {Array<number>} sines precomputed\n * @returns {Feature<Polygon>} hexagon\n */\nfunction hexagon(\n  center: number[],\n  rx: number,\n  ry: number,\n  properties: GeoJsonProperties,\n  cosines: number[],\n  sines: number[]\n) {\n  const vertices = [];\n  for (let i = 0; i < 6; i++) {\n    const x = center[0] + rx * cosines[i];\n    const y = center[1] + ry * sines[i];\n    vertices.push([x, y]);\n  }\n  //first and last vertex must be the same\n  vertices.push(vertices[0].slice());\n  return polygon([vertices], properties);\n}\n\n/**\n * Creates triangles composing an hexagon\n *\n * @private\n * @param {Array<number>} center of the hexagon\n * @param {number} rx half triangle width\n * @param {number} ry half triangle height\n * @param {Object} properties passed to each triangle\n * @param {Array<number>} cosines precomputed\n * @param {Array<number>} sines precomputed\n * @returns {Array<Feature<Polygon>>} triangles\n */\nfunction hexTriangles(\n  center: number[],\n  rx: number,\n  ry: number,\n  properties: GeoJsonProperties,\n  cosines: number[],\n  sines: number[]\n) {\n  const triangles = [];\n  for (let i = 0; i < 6; i++) {\n    const vertices = [];\n    vertices.push(center);\n    vertices.push([center[0] + rx * cosines[i], center[1] + ry * sines[i]]);\n    vertices.push([\n      center[0] + rx * cosines[(i + 1) % 6],\n      center[1] + ry * sines[(i + 1) % 6],\n    ]);\n    vertices.push(center);\n    triangles.push(polygon([vertices], properties));\n  }\n  return triangles;\n}\n\nexport { hexGrid };\nexport default hexGrid;\n"],"mappings":"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","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@turf/hex-grid",
-  "version": "7.0.0-alpha.2",
+  "version": "7.0.0",
   "description": "turf hex-grid module",
   "author": "Turf Authors",
   "contributors": [
@@ -32,50 +32,55 @@
     "points",
     "geojson"
   ],
-  "main": "dist/js/index.js",
-  "module": "dist/es/index.js",
+  "type": "module",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.js",
+  "types": "dist/esm/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "types": "./dist/js/index.d.ts",
-      "import": "./dist/es/index.js",
-      "require": "./dist/js/index.js"
+      "import": {
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.js"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.cts",
+        "default": "./dist/cjs/index.cjs"
+      }
     }
   },
-  "types": "dist/js/index.d.ts",
   "sideEffects": false,
   "files": [
     "dist"
   ],
   "scripts": {
-    "bench": "tsx bench.js",
-    "build": "npm-run-all build:*",
-    "build:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
-    "build:js": "tsc",
-    "docs": "tsx ../../scripts/generate-readmes",
-    "test": "npm-run-all test:*",
-    "test:tape": "tsx test.js",
-    "test:types": "tsc --esModuleInterop --noEmit --strict types.ts"
+    "bench": "tsx bench.ts",
+    "build": "tsup --config ../../tsup.config.ts",
+    "docs": "tsx ../../scripts/generate-readmes.ts",
+    "test": "npm-run-all --npm-path npm test:*",
+    "test:tape": "tsx test.ts",
+    "test:types": "tsc --esModuleInterop --module node16 --moduleResolution node16 --noEmit --strict types.ts"
   },
   "devDependencies": {
-    "@turf/bbox-polygon": "^7.0.0-alpha.2",
-    "@turf/truncate": "^7.0.0-alpha.2",
-    "@types/tape": "*",
-    "benchmark": "*",
-    "load-json-file": "*",
-    "npm-run-all": "*",
-    "tape": "*",
-    "tslint": "*",
-    "tsx": "*",
-    "typescript": "*",
-    "write-json-file": "*"
+    "@turf/bbox-polygon": "^7.0.0",
+    "@turf/truncate": "^7.0.0",
+    "@types/benchmark": "^2.1.5",
+    "@types/tape": "^4.2.32",
+    "benchmark": "^2.1.4",
+    "load-json-file": "^7.0.1",
+    "npm-run-all": "^4.1.5",
+    "tape": "^5.7.2",
+    "tsup": "^8.0.1",
+    "tsx": "^4.6.2",
+    "typescript": "^5.2.2",
+    "write-json-file": "^5.0.0"
   },
   "dependencies": {
-    "@turf/distance": "^7.0.0-alpha.2",
-    "@turf/helpers": "^7.0.0-alpha.2",
-    "@turf/intersect": "^7.0.0-alpha.2",
-    "@turf/invariant": "^7.0.0-alpha.2",
-    "tslib": "^2.3.0"
+    "@turf/distance": "^7.0.0",
+    "@turf/helpers": "^7.0.0",
+    "@turf/intersect": "^7.0.0",
+    "@turf/invariant": "^7.0.0",
+    "tslib": "^2.6.2"
   },
-  "gitHead": "dd35b52725945b4fa29a98d9a550733e06cc222e"
+  "gitHead": "3d3a7917025fbabe191dbddbc89754b86f9c7739"
 }

package/dist/es/index.js

@@ -1,156 +0,0 @@
-import distance from "@turf/distance";
-import intersect from "@turf/intersect";
-import { polygon, featureCollection } from "@turf/helpers";
-/**
- * Takes a bounding box and the diameter of the cell and returns a {@link FeatureCollection} of flat-topped
- * hexagons or triangles ({@link Polygon} features) aligned in an "odd-q" vertical grid as
- * described in [Hexagonal Grids](http://www.redblobgames.com/grids/hexagons/).
- *
- * @name hexGrid
- * @param {BBox} bbox extent in [minX, minY, maxX, maxY] order
- * @param {number} cellSide length of the side of the the hexagons or triangles, in units. It will also coincide with the
- * radius of the circumcircle of the hexagons.
- * @param {Object} [options={}] Optional parameters
- * @param {string} [options.units='kilometers'] used in calculating cell size, can be degrees, radians, miles, or kilometers
- * @param {Object} [options.properties={}] passed to each hexagon or triangle of the grid
- * @param {Feature<Polygon>} [options.mask] if passed a Polygon or MultiPolygon, the grid Points will be created only inside it
- * @param {boolean} [options.triangles=false] whether to return as triangles instead of hexagons
- * @returns {FeatureCollection<Polygon>} a hexagonal grid
- * @example
- * var bbox = [-96,31,-84,40];
- * var cellSide = 50;
- * var options = {units: 'miles'};
- *
- * var hexgrid = turf.hexGrid(bbox, cellSide, options);
- *
- * //addToMap
- * var addToMap = [hexgrid];
- */
-function hexGrid(bbox, cellSide, options = {}) {
-    // Issue => https://github.com/Turfjs/turf/issues/1284
-    const clonedProperties = JSON.stringify(options.properties || {});
-    const [west, south, east, north] = bbox;
-    const centerY = (south + north) / 2;
-    const centerX = (west + east) / 2;
-    // https://github.com/Turfjs/turf/issues/758
-    const xFraction = (cellSide * 2) / distance([west, centerY], [east, centerY], options);
-    const cellWidth = xFraction * (east - west);
-    const yFraction = (cellSide * 2) / distance([centerX, south], [centerX, north], options);
-    const cellHeight = yFraction * (north - south);
-    const radius = cellWidth / 2;
-    const hex_width = radius * 2;
-    const hex_height = (Math.sqrt(3) / 2) * cellHeight;
-    const box_width = east - west;
-    const box_height = north - south;
-    const x_interval = (3 / 4) * hex_width;
-    const y_interval = hex_height;
-    // adjust box_width so all hexagons will be inside the bbox
-    const x_span = (box_width - hex_width) / (hex_width - radius / 2);
-    const x_count = Math.floor(x_span);
-    const x_adjust = (x_count * x_interval - radius / 2 - box_width) / 2 -
-        radius / 2 +
-        x_interval / 2;
-    // adjust box_height so all hexagons will be inside the bbox
-    const y_count = Math.floor((box_height - hex_height) / hex_height);
-    let y_adjust = (box_height - y_count * hex_height) / 2;
-    const hasOffsetY = y_count * hex_height - box_height > hex_height / 2;
-    if (hasOffsetY) {
-        y_adjust -= hex_height / 4;
-    }
-    // Precompute cosines and sines of angles used in hexagon creation for performance gain
-    const cosines = [];
-    const sines = [];
-    for (let i = 0; i < 6; i++) {
-        const angle = ((2 * Math.PI) / 6) * i;
-        cosines.push(Math.cos(angle));
-        sines.push(Math.sin(angle));
-    }
-    const results = [];
-    for (let x = 0; x <= x_count; x++) {
-        for (let y = 0; y <= y_count; y++) {
-            const isOdd = x % 2 === 1;
-            if (y === 0 && isOdd)
-                continue;
-            if (y === 0 && hasOffsetY)
-                continue;
-            const center_x = x * x_interval + west - x_adjust;
-            let center_y = y * y_interval + south + y_adjust;
-            if (isOdd) {
-                center_y -= hex_height / 2;
-            }
-            if (options.triangles === true) {
-                hexTriangles([center_x, center_y], cellWidth / 2, cellHeight / 2, JSON.parse(clonedProperties), cosines, sines).forEach(function (triangle) {
-                    if (options.mask) {
-                        if (intersect(featureCollection([options.mask, triangle])))
-                            results.push(triangle);
-                    }
-                    else {
-                        results.push(triangle);
-                    }
-                });
-            }
-            else {
-                const hex = hexagon([center_x, center_y], cellWidth / 2, cellHeight / 2, JSON.parse(clonedProperties), cosines, sines);
-                if (options.mask) {
-                    if (intersect(featureCollection([options.mask, hex])))
-                        results.push(hex);
-                }
-                else {
-                    results.push(hex);
-                }
-            }
-        }
-    }
-    return featureCollection(results);
-}
-/**
- * Creates hexagon
- *
- * @private
- * @param {Array<number>} center of the hexagon
- * @param {number} rx half hexagon width
- * @param {number} ry half hexagon height
- * @param {Object} properties passed to each hexagon
- * @param {Array<number>} cosines precomputed
- * @param {Array<number>} sines precomputed
- * @returns {Feature<Polygon>} hexagon
- */
-function hexagon(center, rx, ry, properties, cosines, sines) {
-    const vertices = [];
-    for (let i = 0; i < 6; i++) {
-        const x = center[0] + rx * cosines[i];
-        const y = center[1] + ry * sines[i];
-        vertices.push([x, y]);
-    }
-    //first and last vertex must be the same
-    vertices.push(vertices[0].slice());
-    return polygon([vertices], properties);
-}
-/**
- * Creates triangles composing an hexagon
- *
- * @private
- * @param {Array<number>} center of the hexagon
- * @param {number} rx half triangle width
- * @param {number} ry half triangle height
- * @param {Object} properties passed to each triangle
- * @param {Array<number>} cosines precomputed
- * @param {Array<number>} sines precomputed
- * @returns {Array<Feature<Polygon>>} triangles
- */
-function hexTriangles(center, rx, ry, properties, cosines, sines) {
-    const triangles = [];
-    for (let i = 0; i < 6; i++) {
-        const vertices = [];
-        vertices.push(center);
-        vertices.push([center[0] + rx * cosines[i], center[1] + ry * sines[i]]);
-        vertices.push([
-            center[0] + rx * cosines[(i + 1) % 6],
-            center[1] + ry * sines[(i + 1) % 6],
-        ]);
-        vertices.push(center);
-        triangles.push(polygon([vertices], properties));
-    }
-    return triangles;
-}
-export default hexGrid;

package/dist/es/package.json

@@ -1 +0,0 @@
-{"type":"module"}

package/dist/js/index.js

@@ -1,159 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const distance_1 = tslib_1.__importDefault(require("@turf/distance"));
-const intersect_1 = tslib_1.__importDefault(require("@turf/intersect"));
-const helpers_1 = require("@turf/helpers");
-/**
- * Takes a bounding box and the diameter of the cell and returns a {@link FeatureCollection} of flat-topped
- * hexagons or triangles ({@link Polygon} features) aligned in an "odd-q" vertical grid as
- * described in [Hexagonal Grids](http://www.redblobgames.com/grids/hexagons/).
- *
- * @name hexGrid
- * @param {BBox} bbox extent in [minX, minY, maxX, maxY] order
- * @param {number} cellSide length of the side of the the hexagons or triangles, in units. It will also coincide with the
- * radius of the circumcircle of the hexagons.
- * @param {Object} [options={}] Optional parameters
- * @param {string} [options.units='kilometers'] used in calculating cell size, can be degrees, radians, miles, or kilometers
- * @param {Object} [options.properties={}] passed to each hexagon or triangle of the grid
- * @param {Feature<Polygon>} [options.mask] if passed a Polygon or MultiPolygon, the grid Points will be created only inside it
- * @param {boolean} [options.triangles=false] whether to return as triangles instead of hexagons
- * @returns {FeatureCollection<Polygon>} a hexagonal grid
- * @example
- * var bbox = [-96,31,-84,40];
- * var cellSide = 50;
- * var options = {units: 'miles'};
- *
- * var hexgrid = turf.hexGrid(bbox, cellSide, options);
- *
- * //addToMap
- * var addToMap = [hexgrid];
- */
-function hexGrid(bbox, cellSide, options = {}) {
-    // Issue => https://github.com/Turfjs/turf/issues/1284
-    const clonedProperties = JSON.stringify(options.properties || {});
-    const [west, south, east, north] = bbox;
-    const centerY = (south + north) / 2;
-    const centerX = (west + east) / 2;
-    // https://github.com/Turfjs/turf/issues/758
-    const xFraction = (cellSide * 2) / distance_1.default([west, centerY], [east, centerY], options);
-    const cellWidth = xFraction * (east - west);
-    const yFraction = (cellSide * 2) / distance_1.default([centerX, south], [centerX, north], options);
-    const cellHeight = yFraction * (north - south);
-    const radius = cellWidth / 2;
-    const hex_width = radius * 2;
-    const hex_height = (Math.sqrt(3) / 2) * cellHeight;
-    const box_width = east - west;
-    const box_height = north - south;
-    const x_interval = (3 / 4) * hex_width;
-    const y_interval = hex_height;
-    // adjust box_width so all hexagons will be inside the bbox
-    const x_span = (box_width - hex_width) / (hex_width - radius / 2);
-    const x_count = Math.floor(x_span);
-    const x_adjust = (x_count * x_interval - radius / 2 - box_width) / 2 -
-        radius / 2 +
-        x_interval / 2;
-    // adjust box_height so all hexagons will be inside the bbox
-    const y_count = Math.floor((box_height - hex_height) / hex_height);
-    let y_adjust = (box_height - y_count * hex_height) / 2;
-    const hasOffsetY = y_count * hex_height - box_height > hex_height / 2;
-    if (hasOffsetY) {
-        y_adjust -= hex_height / 4;
-    }
-    // Precompute cosines and sines of angles used in hexagon creation for performance gain
-    const cosines = [];
-    const sines = [];
-    for (let i = 0; i < 6; i++) {
-        const angle = ((2 * Math.PI) / 6) * i;
-        cosines.push(Math.cos(angle));
-        sines.push(Math.sin(angle));
-    }
-    const results = [];
-    for (let x = 0; x <= x_count; x++) {
-        for (let y = 0; y <= y_count; y++) {
-            const isOdd = x % 2 === 1;
-            if (y === 0 && isOdd)
-                continue;
-            if (y === 0 && hasOffsetY)
-                continue;
-            const center_x = x * x_interval + west - x_adjust;
-            let center_y = y * y_interval + south + y_adjust;
-            if (isOdd) {
-                center_y -= hex_height / 2;
-            }
-            if (options.triangles === true) {
-                hexTriangles([center_x, center_y], cellWidth / 2, cellHeight / 2, JSON.parse(clonedProperties), cosines, sines).forEach(function (triangle) {
-                    if (options.mask) {
-                        if (intersect_1.default(helpers_1.featureCollection([options.mask, triangle])))
-                            results.push(triangle);
-                    }
-                    else {
-                        results.push(triangle);
-                    }
-                });
-            }
-            else {
-                const hex = hexagon([center_x, center_y], cellWidth / 2, cellHeight / 2, JSON.parse(clonedProperties), cosines, sines);
-                if (options.mask) {
-                    if (intersect_1.default(helpers_1.featureCollection([options.mask, hex])))
-                        results.push(hex);
-                }
-                else {
-                    results.push(hex);
-                }
-            }
-        }
-    }
-    return helpers_1.featureCollection(results);
-}
-/**
- * Creates hexagon
- *
- * @private
- * @param {Array<number>} center of the hexagon
- * @param {number} rx half hexagon width
- * @param {number} ry half hexagon height
- * @param {Object} properties passed to each hexagon
- * @param {Array<number>} cosines precomputed
- * @param {Array<number>} sines precomputed
- * @returns {Feature<Polygon>} hexagon
- */
-function hexagon(center, rx, ry, properties, cosines, sines) {
-    const vertices = [];
-    for (let i = 0; i < 6; i++) {
-        const x = center[0] + rx * cosines[i];
-        const y = center[1] + ry * sines[i];
-        vertices.push([x, y]);
-    }
-    //first and last vertex must be the same
-    vertices.push(vertices[0].slice());
-    return helpers_1.polygon([vertices], properties);
-}
-/**
- * Creates triangles composing an hexagon
- *
- * @private
- * @param {Array<number>} center of the hexagon
- * @param {number} rx half triangle width
- * @param {number} ry half triangle height
- * @param {Object} properties passed to each triangle
- * @param {Array<number>} cosines precomputed
- * @param {Array<number>} sines precomputed
- * @returns {Array<Feature<Polygon>>} triangles
- */
-function hexTriangles(center, rx, ry, properties, cosines, sines) {
-    const triangles = [];
-    for (let i = 0; i < 6; i++) {
-        const vertices = [];
-        vertices.push(center);
-        vertices.push([center[0] + rx * cosines[i], center[1] + ry * sines[i]]);
-        vertices.push([
-            center[0] + rx * cosines[(i + 1) % 6],
-            center[1] + ry * sines[(i + 1) % 6],
-        ]);
-        vertices.push(center);
-        triangles.push(helpers_1.polygon([vertices], properties));
-    }
-    return triangles;
-}
-exports.default = hexGrid;