Extend tests to check that a few node/way/relation are correctly read

Author: jocelynj

tests/reader.rs

@@ -1,4 +1,4 @@
-use osmpbfreader;
+use osmpbfreader::objects::{Node, NodeId, OsmId, Ref, Relation, RelationId, Tags, Way, WayId};
 use std::fs::File;
 
 #[derive(Debug, Default, PartialEq)]
@@ -29,30 +29,208 @@ const PBF_STATS_HIGHWAY: Stats = Stats {
     sum_relations_ids: 0,
 };
 
+fn check_items() -> (Vec<Node>, Vec<Way>, Vec<Relation>) {
+    let nodes: Vec<Node> = vec![
+        Node {
+            id: NodeId(1724610081),
+            tags: Tags::new(),
+            decimicro_lat: (10.2871538 * 1e7) as i32,
+            decimicro_lon: (-109.2143679 * 1e7) as i32,
+        },
+        Node {
+            id: NodeId(1724610082),
+            tags: Tags::new(),
+            decimicro_lat: (10.2872043 * 1e7) as i32,
+            decimicro_lon: (-109.2157633 * 1e7) as i32,
+        },
+        Node {
+            id: NodeId(2710971331),
+            tags: {
+                let mut tags = Tags::new();
+                tags.insert("historic".into(), "wreck".into());
+                tags.insert("seamark:type".into(), "wreck".into());
+                tags
+            },
+            decimicro_lat: (10.2873955 * 1e7) as i32,
+            decimicro_lon: (-109.2123449 * 1e7) as i32,
+        },
+        Node {
+            id: NodeId(12710481252),
+            tags: Tags::new(),
+            decimicro_lat: (10.2925456 * 1e7) as i32,
+            decimicro_lon: (-109.2212479 * 1e7) as i32,
+        },
+    ];
+    let ways: Vec<Way> = vec![
+        Way {
+            id: WayId(633118718),
+            tags: {
+                let mut tags = Tags::new();
+                tags.insert("natural".into(), "wood".into());
+                tags.insert("trees".into(), "coconut_palms".into());
+                tags
+            },
+            nodes: vec![
+                NodeId(5976744399),
+                NodeId(5976744400),
+                NodeId(5976744401),
+                NodeId(5976744402),
+                NodeId(5976744399),
+            ],
+        },
+        Way {
+            id: WayId(1253640658),
+            tags: {
+                let mut tags = Tags::new();
+                tags.insert("natural".into(), "wood".into());
+                tags
+            },
+            nodes: vec![
+                NodeId(11653090668),
+                NodeId(11653090669),
+                NodeId(11653090670),
+                NodeId(11653090668),
+            ],
+        },
+        Way {
+            id: WayId(1372754726),
+            tags: {
+                let mut tags = Tags::new();
+                tags.insert("aeroway".into(), "taxiway".into());
+                tags
+            },
+            nodes: vec![
+                NodeId(12710481236),
+                NodeId(12710481237),
+                NodeId(12710481238),
+                NodeId(12710481239),
+            ],
+        },
+    ];
+    let relations: Vec<Relation> = vec![
+        Relation {
+            id: RelationId(5883537),
+            tags: {
+                let mut tags = Tags::new();
+                tags.insert("natural".into(), "beach".into());
+                tags.insert("type".into(), "multipolygon".into());
+                tags
+            },
+            refs: vec![
+                Ref {
+                    member: OsmId::Way(WayId(392464137)),
+                    role: "inner".into(),
+                },
+                Ref {
+                    member: OsmId::Way(WayId(160415456)),
+                    role: "outer".into(),
+                },
+            ],
+        },
+        Relation {
+            id: RelationId(8803113),
+            tags: {
+                let mut tags = Tags::new();
+                tags.insert("place".into(), "islet".into());
+                tags.insert("type".into(), "multipolygon".into());
+                tags
+            },
+            refs: vec![Ref {
+                member: OsmId::Way(WayId(633118720)),
+                role: "outer".into(),
+            }],
+        },
+    ];
+
+    (nodes, ways, relations)
+}
+
+fn check_items_highway() -> (Vec<Node>, Vec<Way>, Vec<Relation>) {
+    let nodes: Vec<Node> = vec![
+        Node {
+            id: NodeId(12710481223),
+            tags: Tags::new(),
+            decimicro_lat: (10.2901053 * 1e7) as i32,
+            decimicro_lon: (-109.2103612 * 1e7) as i32,
+        },
+        Node {
+            id: NodeId(12710481226),
+            tags: Tags::new(),
+            decimicro_lat: (10.2897482 * 1e7) as i32,
+            decimicro_lon: (-109.2101919 * 1e7) as i32,
+        },
+    ];
+    let ways: Vec<Way> = vec![Way {
+        id: WayId(1372754721),
+        tags: {
+            let mut tags = Tags::new();
+            tags.insert("highway".into(), "residential".into());
+            tags.insert("name".into(), "Clipperton St".into());
+            tags
+        },
+        nodes: vec![
+            NodeId(12710481223),
+            NodeId(12710481226),
+            NodeId(12710481233),
+            NodeId(12710481224),
+            NodeId(12710481225),
+        ],
+    }];
+    let relations: Vec<Relation> = vec![];
+
+    (nodes, ways, relations)
+}
+
 #[test]
 fn read_pbf() {
     let file = File::open(PBF).unwrap();
     let mut pbf = osmpbfreader::OsmPbfReader::new(file);
     let mut stats = Stats::default();
 
+    let (exp_nodes, exp_ways, exp_relations) = check_items();
+    let mut num_found_nodes = 0;
+    let mut num_found_ways = 0;
+    let mut num_found_relations = 0;
+
     for obj in pbf.iter() {
         let obj = obj.unwrap();
         match obj {
             osmpbfreader::OsmObj::Node(n) => {
                 stats.num_nodes += 1;
                 stats.sum_nodes_ids += n.id.0;
+                for exp_node in &exp_nodes {
+                    if exp_node.id.0 == n.id.0 {
+                        num_found_nodes += 1;
+                        assert_eq!(&n, exp_node);
+                    }
+                }
             }
             osmpbfreader::OsmObj::Way(w) => {
                 stats.num_ways += 1;
                 stats.sum_ways_ids += w.id.0;
+                for exp_way in &exp_ways {
+                    if exp_way.id.0 == w.id.0 {
+                        num_found_ways += 1;
+                        assert_eq!(&w, exp_way);
+                    }
+                }
             }
             osmpbfreader::OsmObj::Relation(r) => {
                 stats.num_relations += 1;
                 stats.sum_relations_ids += r.id.0;
+                for exp_relation in &exp_relations {
+                    if exp_relation.id.0 == r.id.0 {
+                        num_found_relations += 1;
+                        assert_eq!(&r, exp_relation);
+                    }
+                }
             }
         }
     }
     assert_eq!(stats, PBF_STATS_ALL);
+    assert_eq!(num_found_nodes, exp_nodes.len());
+    assert_eq!(num_found_ways, exp_ways.len());
+    assert_eq!(num_found_relations, exp_relations.len());
 }
 
 #[test]
@@ -61,24 +239,50 @@ fn read_pbf_par_iter() {
     let mut pbf = osmpbfreader::OsmPbfReader::new(file);
     let mut stats = Stats::default();
 
+    let (exp_nodes, exp_ways, exp_relations) = check_items();
+    let mut num_found_nodes = 0;
+    let mut num_found_ways = 0;
+    let mut num_found_relations = 0;
+
     for obj in pbf.par_iter() {
         let obj = obj.unwrap();
         match obj {
             osmpbfreader::OsmObj::Node(n) => {
                 stats.num_nodes += 1;
                 stats.sum_nodes_ids += n.id.0;
+                for exp_node in &exp_nodes {
+                    if exp_node.id.0 == n.id.0 {
+                        num_found_nodes += 1;
+                        assert_eq!(&n, exp_node);
+                    }
+                }
             }
             osmpbfreader::OsmObj::Way(w) => {
                 stats.num_ways += 1;
                 stats.sum_ways_ids += w.id.0;
+                for exp_way in &exp_ways {
+                    if exp_way.id.0 == w.id.0 {
+                        num_found_ways += 1;
+                        assert_eq!(&w, exp_way);
+                    }
+                }
             }
             osmpbfreader::OsmObj::Relation(r) => {
                 stats.num_relations += 1;
                 stats.sum_relations_ids += r.id.0;
+                for exp_relation in &exp_relations {
+                    if exp_relation.id.0 == r.id.0 {
+                        num_found_relations += 1;
+                        assert_eq!(&r, exp_relation);
+                    }
+                }
             }
         }
     }
     assert_eq!(stats, PBF_STATS_ALL);
+    assert_eq!(num_found_nodes, exp_nodes.len());
+    assert_eq!(num_found_ways, exp_ways.len());
+    assert_eq!(num_found_relations, exp_relations.len());
 }
 
 #[test]
@@ -88,6 +292,11 @@ fn read_pbf_highway() {
     let mut stats = Stats::default();
     let mut sum_ids = 0;
 
+    let (exp_nodes, exp_ways, exp_relations) = check_items_highway();
+    let mut num_found_nodes = 0;
+    let mut num_found_ways = 0;
+    let mut num_found_relations = 0;
+
     let objs = pbf
         .get_objs_and_deps(|obj| obj.is_way() && obj.tags().contains_key("highway"))
         .unwrap();
@@ -97,14 +306,34 @@ fn read_pbf_highway() {
             osmpbfreader::OsmObj::Node(n) => {
                 stats.num_nodes += 1;
                 stats.sum_nodes_ids += n.id.0;
+                for exp_node in &exp_nodes {
+                    if exp_node.id.0 == n.id.0 {
+                        num_found_nodes += 1;
+                        assert_eq!(n, exp_node);
+                    }
+                }
             }
             osmpbfreader::OsmObj::Way(w) => {
                 stats.num_ways += 1;
                 stats.sum_ways_ids += w.id.0;
+                assert!(w.tags.contains_key("highway"));
+                for exp_way in &exp_ways {
+                    if exp_way.id.0 == w.id.0 {
+                        num_found_ways += 1;
+                        assert_eq!(w, exp_way);
+                    }
+                }
             }
             osmpbfreader::OsmObj::Relation(r) => {
                 stats.num_relations += 1;
                 stats.sum_relations_ids += r.id.0;
+                assert!(r.tags.contains_key("highway"));
+                for exp_relation in &exp_relations {
+                    if exp_relation.id.0 == r.id.0 {
+                        num_found_relations += 1;
+                        assert_eq!(r, exp_relation);
+                    }
+                }
             }
         }
     }
@@ -113,4 +342,7 @@ fn read_pbf_highway() {
         + PBF_STATS_HIGHWAY.sum_ways_ids
         + PBF_STATS_HIGHWAY.sum_relations_ids;
     assert_eq!(sum_ids, exp_sum_ids);
+    assert_eq!(num_found_nodes, exp_nodes.len());
+    assert_eq!(num_found_ways, exp_ways.len());
+    assert_eq!(num_found_relations, exp_relations.len());
 }