Merge branch 'master' into area_source

mglasgow · Mar 12, 2020 · 6f6aa95 · 6f6aa95
2 parents a65b256 + ae0225f
commit 6f6aa95
Show file tree

Hide file tree

Showing 49 changed files with 145 additions and 326 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@
 
 - - -
 
-[Turf](https://turfjs.org) is a [JavaScript library](https://en.wikipedia.org/wiki/JavaScript_library) for [spatial analysis](http://en.wikipedia.org/wiki/Spatial_analysis). It includes traditional spatial operations, helper functions for creating [GeoJSON](http://geojson.org) data, and data classification and statistics tools. Turf can be added to your website as a client-side plugin, or you can [run Turf server-side](https://www.npmjs.com/package/turf) with [Node.js](http://nodejs.org/) (see below).
+[Turf](https://turfjs.org) is a [JavaScript library](https://en.wikipedia.org/wiki/JavaScript_library) for [spatial analysis](http://en.wikipedia.org/wiki/Spatial_analysis). It includes traditional spatial operations, helper functions for creating [GeoJSON](http://geojson.org) data, and data classification and statistics tools. Turf can be added to your website as a client-side plugin, or you can [run Turf server-side](https://www.npmjs.com/package/@turf/turf) with [Node.js](http://nodejs.org/) (see below).
 
 ## Installation
 

diff --git a/examples/create-react-app/package.json b/examples/create-react-app/package.json
@@ -1,14 +1,16 @@
 {
   "private": true,
   "name": "create-react-app",
-  "main": "src/index.js",
   "scripts": {
-    "test": "react-scripts build"
-  },
-  "devDependencies": {
-    "react-scripts": "*"
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject"
   },
   "dependencies": {
+    "react": "*",
+    "react-dom": "*",
+    "react-scripts": "*",
     "@turf/turf": "*"
   }
 }
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
     "documentation": "*",
     "eslint": "*",
     "eslint-config-mourner": "*",
+    "esm": "^3.2.25",
     "fs-extra": "*",
     "lerna": "2.8.0",
     "load-json-file": "*",

diff --git a/packages/turf-buffer/package.json b/packages/turf-buffer/package.json
@@ -13,9 +13,9 @@
   ],
   "scripts": {
     "pretest": "rollup -c ../../rollup.config.js",
-    "test": "node -r @std/esm test.js",
-    "posttest": "node -r @std/esm ../../scripts/validate-es5-dependencies.js",
-    "bench": "node -r @std/esm bench.js",
+    "test": "node -r esm test.js",
+    "posttest": "node -r esm ../../scripts/validate-es5-dependencies.js",
+    "bench": "node -r esm bench.js",
     "docs": "node ../../scripts/generate-readmes"
   },
   "repository": {
@@ -43,7 +43,6 @@
   },
   "homepage": "https://github.com/Turfjs/turf",
   "devDependencies": {
-    "@std/esm": "*",
     "@turf/truncate": "*",
     "benchmark": "*",
     "load-json-file": "*",
@@ -59,9 +58,5 @@
     "@turf/projection": "6.x",
     "d3-geo": "1.7.1",
     "turf-jsts": "*"
-  },
-  "@std/esm": {
-    "esm": "js",
-    "cjs": true
   }
 }
diff --git a/packages/turf-dissolve/package.json b/packages/turf-dissolve/package.json
@@ -14,9 +14,9 @@
   ],
   "scripts": {
     "pretest": "rollup -c ../../rollup.config.js",
-    "test": "node -r @std/esm test.js",
-    "posttest": "node -r @std/esm ../../scripts/validate-es5-dependencies.js",
-    "bench": "node -r @std/esm bench.js",
+    "test": "node -r esm test.js",
+    "posttest": "node -r esm ../../scripts/validate-es5-dependencies.js",
+    "bench": "node -r esm bench.js",
     "docs": "node ../../scripts/generate-readmes"
   },
   "repository": {
@@ -37,7 +37,6 @@
   },
   "homepage": "https://github.com/Turfjs/turf",
   "devDependencies": {
-    "@std/esm": "*",
     "benchmark": "*",
     "load-json-file": "*",
     "rollup": "*",
@@ -54,9 +53,5 @@
     "@turf/union": "^5.1.5",
     "geojson-rbush": "3.x",
     "get-closest": "*"
-  },
-  "@std/esm": {
-    "esm": "js",
-    "cjs": true
   }
 }
diff --git a/packages/turf-distance/index.ts b/packages/turf-distance/index.ts
@@ -1,6 +1,6 @@
 import { getCoord } from '@turf/invariant';
 import {
-    radiansToLength, isObject, degreesToRadians,
+    radiansToLength, degreesToRadians,
     Coord, Units
 } from '@turf/helpers';
 

diff --git a/packages/turf-ellipse/package.json b/packages/turf-ellipse/package.json
@@ -13,9 +13,9 @@
   ],
   "scripts": {
     "pretest": "rollup -c ../../rollup.config.js",
-    "test": "node -r @std/esm test.js",
-    "posttest": "node -r @std/esm ../../scripts/validate-es5-dependencies.js",
-    "bench": "node -r @std/esm bench.js",
+    "test": "node -r esm test.js",
+    "posttest": "node -r esm ../../scripts/validate-es5-dependencies.js",
+    "bench": "node -r esm bench.js",
     "docs": "node ../../scripts/generate-readmes"
   },
   "repository": {
@@ -37,7 +37,6 @@
   "homepage": "https://github.com/Turfjs/turf",
   "devDependencies": {
     "@mapbox/geojsonhint": "*",
-    "@std/esm": "*",
     "@turf/bbox-polygon": "6.x",
     "@turf/circle": "6.x",
     "@turf/destination": "6.x",
@@ -54,9 +53,5 @@
     "@turf/invariant": "6.x",
     "@turf/rhumb-destination": "6.x",
     "@turf/transform-rotate": "^5.1.5"
-  },
-  "@std/esm": {
-    "esm": "js",
-    "cjs": true
   }
 }
diff --git a/packages/turf-envelope/package.json b/packages/turf-envelope/package.json
@@ -13,9 +13,9 @@
   ],
   "scripts": {
     "pretest": "rollup -c ../../rollup.config.js",
-    "test": "node -r @std/esm test.js",
-    "posttest": "node -r @std/esm ../../scripts/validate-es5-dependencies.js",
-    "bench": "node -r @std/esm bench.js",
+    "test": "node -r esm test.js",
+    "posttest": "node -r esm ../../scripts/validate-es5-dependencies.js",
+    "bench": "node -r esm bench.js",
     "docs": "node ../../scripts/generate-readmes"
   },
   "repository": {
@@ -36,7 +36,6 @@
   },
   "homepage": "https://github.com/Turfjs/turf",
   "devDependencies": {
-    "@std/esm": "*",
     "benchmark": "*",
     "load-json-file": "*",
     "rollup": "*",
@@ -46,9 +45,5 @@
     "@turf/bbox": "6.x",
     "@turf/bbox-polygon": "6.x",
     "@turf/helpers": "6.x"
-  },
-  "@std/esm": {
-    "esm": "js",
-    "cjs": true
   }
 }
diff --git a/packages/turf-explode/package.json b/packages/turf-explode/package.json
@@ -13,9 +13,9 @@
   ],
   "scripts": {
     "pretest": "rollup -c ../../rollup.config.js",
-    "test": "node -r @std/esm test.js",
-    "posttest": "node -r @std/esm ../../scripts/validate-es5-dependencies.js",
-    "bench": "node -r @std/esm bench.js",
+    "test": "node -r esm test.js",
+    "posttest": "node -r esm ../../scripts/validate-es5-dependencies.js",
+    "bench": "node -r esm bench.js",
     "docs": "node ../../scripts/generate-readmes"
   },
   "repository": {
@@ -35,7 +35,6 @@
   },
   "homepage": "https://github.com/Turfjs/turf",
   "devDependencies": {
-    "@std/esm": "*",
     "benchmark": "*",
     "geojson-fixtures": "*",
     "load-json-file": "*",
@@ -46,9 +45,5 @@
   "dependencies": {
     "@turf/helpers": "6.x",
     "@turf/meta": "6.x"
-  },
-  "@std/esm": {
-    "esm": "js",
-    "cjs": true
   }
 }
diff --git a/packages/turf-flatten/package.json b/packages/turf-flatten/package.json
@@ -13,9 +13,9 @@
   ],
   "scripts": {
     "pretest": "rollup -c ../../rollup.config.js",
-    "test": "node -r @std/esm test.js",
-    "posttest": "node -r @std/esm ../../scripts/validate-es5-dependencies.js",
-    "bench": "node -r @std/esm bench.js",
+    "test": "node -r esm test.js",
+    "posttest": "node -r esm ../../scripts/validate-es5-dependencies.js",
+    "bench": "node -r esm bench.js",
     "docs": "node ../../scripts/generate-readmes"
   },
   "repository": {
@@ -40,7 +40,6 @@
   },
   "homepage": "https://github.com/Turfjs/turf",
   "devDependencies": {
-    "@std/esm": "*",
     "benchmark": "*",
     "load-json-file": "*",
     "rollup": "*",
@@ -50,9 +49,5 @@
   "dependencies": {
     "@turf/helpers": "6.x",
     "@turf/meta": "6.x"
-  },
-  "@std/esm": {
-    "esm": "js",
-    "cjs": true
   }
 }
diff --git a/packages/turf-flip/package.json b/packages/turf-flip/package.json
@@ -13,9 +13,9 @@
   ],
   "scripts": {
     "pretest": "rollup -c ../../rollup.config.js",
-    "test": "node -r @std/esm test.js",
-    "posttest": "node -r @std/esm ../../scripts/validate-es5-dependencies.js",
-    "bench": "node -r @std/esm bench.js",
+    "test": "node -r esm test.js",
+    "posttest": "node -r esm ../../scripts/validate-es5-dependencies.js",
+    "bench": "node -r esm bench.js",
     "docs": "node ../../scripts/generate-readmes"
   },
   "repository": {
@@ -35,7 +35,6 @@
   },
   "homepage": "https://github.com/Turfjs/turf",
   "devDependencies": {
-    "@std/esm": "*",
     "benchmark": "*",
     "load-json-file": "*",
     "rollup": "*",
@@ -46,9 +45,5 @@
     "@turf/clone": "6.x",
     "@turf/helpers": "6.x",
     "@turf/meta": "6.x"
-  },
-  "@std/esm": {
-    "esm": "js",
-    "cjs": true
   }
 }
diff --git a/packages/turf-great-circle/package.json b/packages/turf-great-circle/package.json
@@ -14,9 +14,9 @@
   ],
   "scripts": {
     "pretest": "rollup -c ../../rollup.config.js",
-    "test": "node -r @std/esm test.js",
-    "posttest": "node -r @std/esm ../../scripts/validate-es5-dependencies.js",
-    "bench": "node -r @std/esm bench.js",
+    "test": "node -r esm test.js",
+    "posttest": "node -r esm ../../scripts/validate-es5-dependencies.js",
+    "bench": "node -r esm bench.js",
     "docs": "node ../../scripts/generate-readmes"
   },
   "repository": {
@@ -42,7 +42,6 @@
   },
   "homepage": "https://github.com/Turfjs/turf",
   "devDependencies": {
-    "@std/esm": "*",
     "@turf/truncate": "6.x",
     "benchmark": "*",
     "load-json-file": "*",
@@ -53,9 +52,5 @@
   "dependencies": {
     "@turf/helpers": "6.x",
     "@turf/invariant": "6.x"
-  },
-  "@std/esm": {
-    "esm": "js",
-    "cjs": true
   }
 }
diff --git a/packages/turf-interpolate/package.json b/packages/turf-interpolate/package.json
@@ -13,9 +13,9 @@
   ],
   "scripts": {
     "pretest": "rollup -c ../../rollup.config.js",
-    "test": "node -r @std/esm test.js",
-    "posttest": "node -r @std/esm ../../scripts/validate-es5-dependencies.js",
-    "bench": "node -r @std/esm bench.js",
+    "test": "node -r esm test.js",
+    "posttest": "node -r esm ../../scripts/validate-es5-dependencies.js",
+    "bench": "node -r esm bench.js",
     "docs": "node ../../scripts/generate-readmes"
   },
   "repository": {
@@ -37,7 +37,6 @@
   },
   "homepage": "https://github.com/Turfjs/turf",
   "devDependencies": {
-    "@std/esm": "*",
     "@turf/truncate": "6.x",
     "benchmark": "*",
     "chromatism": "*",
@@ -58,9 +57,5 @@
     "@turf/point-grid": "6.x",
     "@turf/square-grid": "^5.1.5",
     "@turf/triangle-grid": "^5.1.5"
-  },
-  "@std/esm": {
-    "esm": "js",
-    "cjs": true
   }
 }
diff --git a/packages/turf-isobands/package.json b/packages/turf-isobands/package.json
@@ -14,9 +14,9 @@
   ],
   "scripts": {
     "pretest": "rollup -c ../../rollup.config.js",
-    "test": "node -r @std/esm test.js",
-    "posttest": "node -r @std/esm ../../scripts/validate-es5-dependencies.js",
-    "bench": "node -r @std/esm bench.js",
+    "test": "node -r esm test.js",
+    "posttest": "node -r esm ../../scripts/validate-es5-dependencies.js",
+    "bench": "node -r esm bench.js",
     "docs": "node ../../scripts/generate-readmes"
   },
   "repository": {
@@ -42,7 +42,6 @@
   },
   "homepage": "https://github.com/Turfjs/turf",
   "devDependencies": {
-    "@std/esm": "*",
     "@turf/envelope": "^5.1.5",
     "@turf/point-grid": "6.x",
     "@turf/random": "6.x",
@@ -65,9 +64,5 @@
     "@turf/invariant": "6.x",
     "@turf/meta": "6.x",
     "object-assign": "*"
-  },
-  "@std/esm": {
-    "esm": "js",
-    "cjs": true
   }
 }
diff --git a/packages/turf-isolines/package.json b/packages/turf-isolines/package.json
@@ -14,8 +14,8 @@
   ],
   "scripts": {
     "pretest": "rollup -c ../../rollup.config.js",
-    "test": "node -r @std/esm test.js",
-    "bench": "node -r @std/esm bench.js",
+    "test": "node -r esm test.js",
+    "bench": "node -r esm bench.js",
     "docs": "node ../../scripts/generate-readmes"
   },
   "repository": {
@@ -40,7 +40,6 @@
   },
   "homepage": "https://github.com/Turfjs/turf",
   "devDependencies": {
-    "@std/esm": "0.21.x",
     "@turf/envelope": "^5.1.5",
     "@turf/point-grid": "6.x",
     "@turf/random": "6.x",
@@ -59,9 +58,5 @@
     "@turf/invariant": "6.x",
     "@turf/meta": "6.x",
     "object-assign": "*"
-  },
-  "@std/esm": {
-    "esm": "js",
-    "cjs": true
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ @@
     - - -
-    [Turf](https://turfjs.org) is a [JavaScript library](https://en.wikipedia.org/wiki/JavaScript_library) for [spatial analysis](http://en.wikipedia.org/wiki/Spatial_analysis). It includes traditional spatial operations, helper functions for creating [GeoJSON](http://geojson.org) data, and data classification and statistics tools. Turf can be added to your website as a client-side plugin, or you can [run Turf server-side](https://www.npmjs.com/package/turf) with [Node.js](http://nodejs.org/) (see below).
+    [Turf](https://turfjs.org) is a [JavaScript library](https://en.wikipedia.org/wiki/JavaScript_library) for [spatial analysis](http://en.wikipedia.org/wiki/Spatial_analysis). It includes traditional spatial operations, helper functions for creating [GeoJSON](http://geojson.org) data, and data classification and statistics tools. Turf can be added to your website as a client-side plugin, or you can [run Turf server-side](https://www.npmjs.com/package/@turf/turf) with [Node.js](http://nodejs.org/) (see below).
     ## Installation
@@ Expand Down @@