Skip to content

Commit d45f379

Browse files
GuillaumeGomezamatissart
authored andcommitted
Voronoi cities (#84)
* squeletton for voronoi implementation * update to geo-types 0.2 * remove failure warning * first working version but still lots of todos 😉 * update deps * fix code * changes * working version * Fully working version of voronoi * remove useless field * Fix nits * Greatly improvement run speed * new small optimizations * Update to last geos version * Remove useless code * only iterate over towns which share the same parent * Performance improvement * fix zones not matching their name * speed up * working version * cargo fmt * update ubuntu travis version * add test for voronoi * Add disable-voronoi option * Check intersection failure instead of unwraping * Fix tests * No more unwraps or expect * Use osm ids instead * Improvements on voronoi * add debug * Global performance improvement * Prevent file rereading * Don't flatten vectors * Prevent voronoi computation when parent is a country * Replace deprecated env_logger item * Use github link instead of local one * fmt * Apply comments * fmt * update to last geos version * clean up cargo file * Fix towns exclusion when only one city * Add filter langs option * Use new geos crate version * Don't keep unique zone when failures occur * fmt * cleanup * apply comments * Add comments
1 parent 65553e7 commit d45f379

File tree

12 files changed

+922
-358
lines changed

12 files changed

+922
-358
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
dist: xenial
12
language: rust
23
cache: cargo
34
matrix:

Cargo.lock

Lines changed: 265 additions & 290 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ env_logger = "0.6"
2121
geo = "0.12"
2222
geo-types = { version = "0.4", features = ["rstar"] }
2323
structopt = "0.2"
24+
structopt-derive = "0.1"
2425
osmpbfreader = "0.13"
2526
serde = {version = "1", features = ["rc"]}
2627
serde_derive = "1"
@@ -31,9 +32,10 @@ geojson = "0.15"
3132
failure = "0.1"
3233
failure_derive = "0.1"
3334
osm_boundaries_utils = "0.4"
34-
geos = "4"
35+
geos = { version = "5.0", features= ["geo"] }
3536
regex = "1"
3637
lazy_static = "1"
38+
ordered-float = "0.0.2"
3739
flate2 = "1.0"
3840
rayon = "1.0"
3941
include_dir = "0.2"

0 commit comments

Comments
 (0)