remove suburb node

osm-without-borders · Jan 30, 2024 · fbe4bda · fbe4bda
1 parent ecaa549
commit fbe4bda
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cosmogony_builder"
-version = "0.14.5"
+version = "0.14.6"
 authors = ["Adrien Matissart <a.matissart@qwantresearch.com>", "Antoine Desbordes <antoine.desbordes@gmail.com>"]
 license = "Apache-2.0"
 repository = "https://github.com/osm-without-borders/cosmogony"

diff --git a/cosmogony/Cargo.toml b/cosmogony/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cosmogony"
-version = "0.14.5"
+version = "0.14.6"
 authors = ["Adrien Matissart <a.matissart@qwantresearch.com>", "Antoine Desbordes <antoine.desbordes@gmail.com>"]
 license = "Apache-2.0"
 repository = "https://github.com/osm-without-borders/cosmogony"

diff --git a/src/additional_zones.rs b/src/additional_zones.rs
@@ -46,8 +46,7 @@ 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))
-                | place.tags.get("capital").map_or(false, |v| v == "yes")
+            place.admin_level.is_none() | place.tags.get("capital").map_or(false, |v| v == "yes")
         })
         .filter_map(|place| {
             place.zone_type?;

diff --git a/src/lib.rs b/src/lib.rs
@@ -45,7 +45,7 @@ pub fn is_place(obj: &OsmObj) -> bool {
     match *obj {
         OsmObj::Node(ref node) => matches!(
             node.tags.get("place").and_then(|s| ZoneType::parse(s)),
-            Some(ZoneType::City | ZoneType::Suburb)
+            Some(ZoneType::City)
         ),
         _ => false,
     }
@@ -56,7 +56,7 @@ pub fn is_additional_place(obj: &OsmObj) -> bool {
         OsmObj::Node(ref node) => {
             matches!(
                 node.tags.get("place").and_then(|s| ZoneType::parse(s)),
-                Some(ZoneType::City | ZoneType::Suburb)
+                Some(ZoneType::City)
             ) | node.tags.get("capital").map_or(false, |v| v == "yes")
         }
         _ => false,