Skip to content

Commit

Permalink
Merge branch 'master' into intersect-issue-820
Browse files Browse the repository at this point in the history
  • Loading branch information
stebogit committed Aug 4, 2017
2 parents ea9551d + 51c513d commit 9297684
Show file tree
Hide file tree
Showing 17 changed files with 147 additions and 373 deletions.
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ rollup.config.js
simplepolygon.js
types.js
test.example.js
skmeans.js
3 changes: 1 addition & 2 deletions packages/turf-clusters-kmeans/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
var meta = require('@turf/meta');
var clone = require('@turf/clone');
// https://wzrd.in/standalone/skmeans@latest
var skmeans = require('./skmeans');
var skmeans = require('skmeans');
var invariant = require('@turf/invariant');
var coordAll = meta.coordAll;
var featureEach = meta.featureEach;
Expand Down
6 changes: 3 additions & 3 deletions packages/turf-clusters-kmeans/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
"types": "index.d.ts",
"files": [
"index.js",
"index.d.ts",
"skmeans.js"
"index.d.ts"
],
"scripts": {
"test": "node test.js",
Expand Down Expand Up @@ -52,6 +51,7 @@
"dependencies": {
"@turf/clone": "^4.6.1",
"@turf/invariant": "^4.6.0",
"@turf/meta": "^4.6.0"
"@turf/meta": "^4.6.0",
"skmeans": "0.9.7"
}
}
273 changes: 0 additions & 273 deletions packages/turf-clusters-kmeans/skmeans.js

This file was deleted.

44 changes: 44 additions & 0 deletions packages/turf-clusters-kmeans/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,24 @@
"@turf/bbox" "^3.14.0"
"@turf/helpers" "^3.13.0"

"@turf/centroid@^4.6.1":
version "4.6.1"
resolved "https://registry.yarnpkg.com/@turf/centroid/-/centroid-4.6.1.tgz#6ffe203746aa33dec17d41c22aa5691342e46496"
dependencies:
"@turf/helpers" "^4.6.0"
"@turf/meta" "^4.6.0"

"@turf/clone@^4.6.1":
version "4.6.1"
resolved "https://registry.yarnpkg.com/@turf/clone/-/clone-4.6.1.tgz#e4136d9dca48a7065a61454009275c63a9f68121"

"@turf/clusters@^4.6.1":
version "4.6.1"
resolved "https://registry.yarnpkg.com/@turf/clusters/-/clusters-4.6.1.tgz#be4548b735bfa1d4b42eca20e27a5f6e6e891fac"
dependencies:
"@turf/helpers" "^4.6.0"
"@turf/meta" "^4.6.0"

"@turf/[email protected]":
version "4.1.0"
resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-4.1.0.tgz#013a9c53db6a9386e47c7ab445d93ca2035c4b81"
Expand All @@ -23,10 +41,28 @@
version "3.13.0"
resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-3.13.0.tgz#d06078a1464cf56cdb7ea624ea1e13a71b88b806"

"@turf/helpers@^4.6.0":
version "4.6.0"
resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-4.6.0.tgz#12398733b8ae28420df6166fa44c7ee8ffd6414c"

"@turf/invariant@^4.6.0":
version "4.6.0"
resolved "https://registry.yarnpkg.com/@turf/invariant/-/invariant-4.6.0.tgz#ba61401d537543f81ccfc588e12bb0d8e653dd80"

"@turf/meta@^3.14.0":
version "3.14.0"
resolved "https://registry.yarnpkg.com/@turf/meta/-/meta-3.14.0.tgz#8d3050c1a0f44bf406a633b6bd28c510f7bcee27"

"@turf/meta@^4.6.0":
version "4.6.0"
resolved "https://registry.yarnpkg.com/@turf/meta/-/meta-4.6.0.tgz#0d3f9a218e58d1c5e5deedf467c3321dd61203f3"

"@turf/random@^4.5.2":
version "4.5.2"
resolved "https://registry.yarnpkg.com/@turf/random/-/random-4.5.2.tgz#965353691cd64261c341cb4dc071c618b8f05e51"
dependencies:
geojson-random "^0.2.2"

balanced-match@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
Expand Down Expand Up @@ -130,6 +166,10 @@ function-bind@^1.0.2, function-bind@^1.1.0, function-bind@~1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"

geojson-random@^0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/geojson-random/-/geojson-random-0.2.2.tgz#ab4838f126adc5e16f8f94e655def820f9119dbc"

glob@~7.1.2:
version "7.1.2"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
Expand Down Expand Up @@ -330,6 +370,10 @@ robust-sum@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/robust-sum/-/robust-sum-1.0.0.tgz#16646e525292b4d25d82757a286955e0bbfa53d9"

skmeans@^0.9.7:
version "0.9.7"
resolved "https://registry.yarnpkg.com/skmeans/-/skmeans-0.9.7.tgz#72670cebb728508f56e29c0e10d11e623529ce5d"

slide@^1.1.5:
version "1.1.6"
resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
Expand Down
Loading

0 comments on commit 9297684

Please sign in to comment.