Add role label as zone center (#80)

* add label role as admin wcenter

* add test

* relation.refs otherwise we never enter the second find

* fmt + version 0.5.2

Author: jbgriesner

Cargo.lock

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

Cargo.toml

@@ -216,10 +216,11 @@ impl Zone {
             result.boundary = build_boundary(relation, objects);
             result.bbox = result.boundary.as_ref().and_then(|b| b.bounding_rect());
 
-            let center = relation
-                .refs
+            let refs = &relation.refs;
+            let center = refs
                 .iter()
                 .find(|r| r.role == "admin_centre")
+                .or(refs.iter().find(|r| r.role == "label"))
                 .and_then(|r| objects.get(&r.member))
                 .and_then(|o| o.node());
 

src/zone.rs

@@ -4,6 +4,9 @@ use cosmogony::{Cosmogony, Zone, ZoneIndex, ZoneType};
 use std::collections::BTreeMap;
 use std::process::{Command, Output};
 
+use geo_types::Point;
+type Coord = Point<f64>;
+
 fn launch_command_line(args: Vec<&str>) -> Output {
     let cosmogony_bin = concat!(env!("OUT_DIR"), "/../../../cosmogony");
     Command::new(cosmogony_bin)
@@ -265,3 +268,28 @@ fn test_lux_zone_types() {
         Some(&"Laksembɛg".to_string())
     );
 }
+
+#[test]
+fn test_center_label() {
+    let ottawa_test_file = concat!(
+        env!("OUT_DIR"),
+        "/../../../../../tests/data/gatineau.osm.pbf"
+    );
+    let cosmogony = cosmogony::build_cosmogony(ottawa_test_file.into(), true, Some("ca".into()))
+        .expect("invalid cosmogony");
+
+    let gati = cosmogony
+        .zones
+        .iter()
+        .find(|z| z.name == "Gatineau" && z.zone_type == Some(ZoneType::City))
+        .unwrap();
+
+    assert_eq!(gati.osm_id, "relation:5356213");
+    assert_eq!(gati.admin_level, Some(8));
+    assert!(gati.center.is_some());
+    let gati_center = gati.center.unwrap();
+    assert_eq!(
+        gati_center,
+        Coord::new(-75.72326699999999, 45.457240999999996)
+    );
+}

tests/cosmogony_lux_test.rs renamed to tests/cosmogony_test.rs

@@ -15,3 +15,7 @@ Expected relations:
 * `admin_level = 8`: 104 (and a few incomplete ones. One of them only have the admin center missing out)
 * `admin_level = 9`: 79 (and a few incomplete ones)
 * `admin_level = 10`: 2 (and many incomplete ones)
+
+## gatineau pbf
+
+This PBF contains a single relation that has no "admin_center" role node but a "label" one.