Merge pull request #159 from osm-without-borders/add_suburb_node

Test no voronoi on suburb place node

Author: sdrll

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cosmogony_builder"
-version = "0.14.0"
+version = "0.14.2"
 authors = ["Adrien Matissart <[email protected]>", "Antoine Desbordes <[email protected]>"]
 license = "Apache-2.0"
 repository = "https://github.com/osm-without-borders/cosmogony"

cosmogony/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cosmogony"
-version = "0.14.0"
+version = "0.14.2"
 authors = ["Adrien Matissart <[email protected]>", "Antoine Desbordes <[email protected]>"]
 license = "Apache-2.0"
 repository = "https://github.com/osm-without-borders/cosmogony"

src/additional_zones.rs

@@ -45,6 +45,9 @@ pub fn compute_additional_places(
 
     let candidate_parent_zones = place_zones
         .par_iter()
+        .filter(|place| {
+            place.admin_level.is_none() && place.zone_type == Option::from(ZoneType::Suburb)
+        })
         .filter_map(|place| {
             place.zone_type?;
             get_parent(place, zones, &zones_rtree).map(|parent| (parent, place))
@@ -59,7 +62,7 @@ pub fn compute_additional_places(
                         );
                     }
 
-                    // Ensuring zones are stricly increasing also ensures there will be no
+                    // Ensuring zones are strictly increasing also ensures there will be no
                     // duplicates, for example by adding an admin label which is inside its
                     // boundary.
                     parent_zone > place.zone_type.unwrap_or(parent_zone)
@@ -360,7 +363,7 @@ fn compute_voronoi(
     voronoi_polygons
         .into_par_iter()
         .filter_map(|voronoi| {
-            // WARNING: This clone should not be necessary, but segfaults occured. Thread-safety issue in geos ?
+            // WARNING: This clone should not be necessary, but segfaults occurred. Thread-safety issue in geos ?
             let geos_points = geos_points.clone();
 
             // Since GEOS doesn't return voronoi geometries in the same order as the given points...