diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 1f5fc52..b9a5be1 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -3,7 +3,7 @@ name: Build and publish Docker image on: push: branches: - - "master" + - "*" tags: - "v*" diff --git a/Cargo.lock b/Cargo.lock index c99842f..909e5ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -201,7 +201,7 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "cosmogony" -version = "0.14.5" +version = "0.14.6" dependencies = [ "anyhow", "flate2", @@ -216,7 +216,7 @@ dependencies = [ [[package]] name = "cosmogony_builder" -version = "0.14.5" +version = "0.14.6" dependencies = [ "anyhow", "approx", diff --git a/Cargo.toml b/Cargo.toml index 8c46dab..50b0e6a 100644 --- 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 ", "Antoine Desbordes "] license = "Apache-2.0" repository = "https://github.com/osm-without-borders/cosmogony" diff --git a/cosmogony/Cargo.toml b/cosmogony/Cargo.toml index ddc4786..e5a4ff6 100644 --- 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 ", "Antoine Desbordes "] license = "Apache-2.0" repository = "https://github.com/osm-without-borders/cosmogony" diff --git a/src/additional_zones.rs b/src/additional_zones.rs index ade758b..4424939 100644 --- 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 index cad6486..9141dd1 100644 --- 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,