Skip to content

Fix some tests #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix some tests #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/changesets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,13 +404,4 @@ impl<R: Read> Iterator for ChangesetTagReader<R> {
#[cfg(test)]
mod tests {
use super::*;

#[test]
fn changeset_files() {
let mut osc = ChangesetTagReader::from_filename(
"/home/amanda/code/rust/osmio/changeset-examples.osm.bz2",
)
.unwrap();
dbg!(osc.next_tag().unwrap());
}
}
3 changes: 3 additions & 0 deletions src/stringpbf/node_id_pos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@ type NodeIdPos = (ObjId, (Lat, Lon));
/// file
///
/// ```
/// # fn test() -> anyhow::Result<()> {
/// let mut reader =
/// osmio::stringpbf::PBFNodePositionReader::from_filename("region-latest.osm.pbf")?;
/// let (nid, (lat, lon)) = reader.next().unwrap();
/// # Ok(())
/// # }
/// ```
pub struct PBFNodePositionReader<R: Read> {
filereader: FileReader<R>,
Expand Down
14 changes: 5 additions & 9 deletions src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,8 @@ fn area_ways() {
};
}

let not_closed_input = r#"
<?xml version="1.0" encoding="utf-8"?>
<osm version="0.6" generator="osmio/0.4.0">\
let not_closed_input = r#"<?xml version="1.0" encoding="utf-8"?>
<osm version="0.6" generator="osmio/0.4.0">
<node id="1" lat="0" lon="0" />
<node id="2" lat="1" lon="0" />
<node id="3" lat="1" lon="1" />
Expand All @@ -120,8 +119,7 @@ fn area_ways() {
</osm>"#;
assert_closed_area!(not_closed_input, false, false);

let closed_area_input = r#"
<?xml version="1.0" encoding="utf-8"?>
let closed_area_input = r#"<?xml version="1.0" encoding="utf-8"?>
<osm version="0.6" generator="osmio/0.4.0">\
<node id="1" lat="0" lon="0" />
<node id="2" lat="1" lon="0" />
Expand All @@ -135,8 +133,7 @@ fn area_ways() {
</osm>"#;
assert_closed_area!(closed_area_input, true, true);

let closed_nonarea_input = r#"
<?xml version="1.0" encoding="utf-8"?>
let closed_nonarea_input = r#"<?xml version="1.0" encoding="utf-8"?>
<osm version="0.6" generator="osmio/0.4.0">\
<node id="1" lat="0" lon="0" />
<node id="2" lat="1" lon="0" />
Expand All @@ -151,8 +148,7 @@ fn area_ways() {
</osm>"#;
assert_closed_area!(closed_nonarea_input, true, false);

let closed_explicit_area_input = r#"
<?xml version="1.0" encoding="utf-8"?>
let closed_explicit_area_input = r#"<?xml version="1.0" encoding="utf-8"?>
<osm version="0.6" generator="osmio/0.4.0">\
<node id="1" lat="0" lon="0" />
<node id="2" lat="1" lon="0" />
Expand Down
18 changes: 13 additions & 5 deletions src/xml/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,9 +419,12 @@ impl<W: Write> OSMWriter<W> for XMLWriter<W> {
fn close(&mut self) -> Result<(), OSMWriteError> {
self.ensure_header()?;

write!(self.writer, "\n</osm>")?;
if self.is_open(){
write!(self.writer, "\n</osm>")?;

self._state = State::Closed;
}

self._state = State::Closed;

Ok(())
}
Expand All @@ -448,7 +451,9 @@ impl<W: Write> OSMWriter<W> for XMLWriter<W> {
" visible=\"{}\"",
if obj.deleted() { "false" } else { "true" }
)?;
write!(self.writer, " version=\"{}\"", obj.version().unwrap())?;
if let Some(version) = obj.version() {
write!(self.writer, " version=\"{}\"", version)?;
}
if let Some(user) = obj.user() {
write!(self.writer, " user=\"")?;
write_xml_escaped(&mut self.writer, user)?;
Expand Down Expand Up @@ -493,7 +498,7 @@ impl<W: Write> OSMWriter<W> for XMLWriter<W> {
if !member.2.is_empty() {
write_xml_escaped(&mut self.writer, member.2)?;
}
write!(self.writer, "\"/>")?;
write!(self.writer, "\" />")?;
}
}

Expand Down Expand Up @@ -589,6 +594,9 @@ mod tests {
._lat_lon((Lat(0), Lon(0)))
.build()
.unwrap(),
format!("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<osm version=\"0.6\" generator=\"osmio/{}\">\n\t<node id=\"1\" visible=\"true\" version=\"2\" user=\"&amp;foo\" uid=\"1\" changeset=\"1\" timestamp=\"1970-01-01T00:11:40Z\" lat=\"0\" lon=\"0\" />\n</osm>\n</osm>", crate::version())
format!("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<osm version=\"0.6\" generator=\"osmio/{}\">\n\t<node id=\"1\" visible=\"true\" version=\"2\" user=\"&amp;foo\" uid=\"1\" changeset=\"1\" timestamp=\"1970-01-01T00:11:40Z\" lat=\"0\" lon=\"0\" />\n</osm>", crate::version())
);
}

#[cfg(test)]
mod test;
115 changes: 69 additions & 46 deletions src/xml/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#![cfg(test)]
use std::io::Cursor;
use smol_str::SmolStr;

use crate::obj_types::{StringNode, StringNodeBuilder, StringOSMObj, StringRelation, StringRelationBuilder, StringWay, StringWayBuilder};
use crate::{Lat, Lon, OSMObjBase, OSMObjectType};

use super::{XMLReader, XMLWriter};
use super::super::{OSMReader, OSMWriter};
use std::iter::Iterator;
Expand All @@ -23,18 +28,17 @@ fn test_parsing1() {
assert!(!obj.is_none());
let obj = obj.unwrap();
match obj {
OSMObj::Node(n) => {
assert_eq!(n.id, 298884269);
assert_eq!(n.version, 1);
assert_eq!(n.deleted, false);
assert_eq!(n.changeset_id, 676636);
assert_eq!(n.timestamp.to_iso_string(), "2008-09-21T21:37:45Z");
assert_eq!(n.uid, 46882);
assert_eq!(n.user, "SvenHRO");
assert_eq!(n.lat, Some(54.0901746));
assert_eq!(n.lon, Some(12.2482632));
assert_eq!(n.tags.len(), 1);
assert_eq!(n.tags["mytag"], "myvalue");
StringOSMObj::Node(n) => {
assert_eq!(n._id, 298884269);
assert_eq!(n._version, Some(1));
assert_eq!(n._deleted, false);
assert_eq!(n._changeset_id, Some(676636));
assert_eq!(n._timestamp.unwrap().to_iso_string(), "2008-09-21T21:37:45Z");
assert_eq!(n._uid, Some(46882));
assert_eq!(n._user, Some(SmolStr::from("SvenHRO")));
assert_eq!(n._lat_lon, Some((Lat::try_from(54.0901746).unwrap(), Lon::try_from(12.2482632).unwrap())));
assert_eq!(n._tags.len(), 1);
assert_eq!(n._tags[0], (SmolStr::from("mytag"), SmolStr::from("myvalue")));

},
_ => { assert!(false); },
Expand Down Expand Up @@ -84,8 +88,8 @@ fn test_parsing2() {
let mut reader = XMLReader::new(Cursor::new(sample1));

match reader.next() {
Some(OSMObj::Node(n)) => {
assert_eq!(n.id, 298884269);
Some(StringOSMObj::Node(n)) => {
assert_eq!(n._id, 298884269);
//assert_eq!(n.version, 1);
//assert_eq!(n.deleted, false);
//assert_eq!(n.changeset_id, 676636);
Expand All @@ -102,72 +106,91 @@ fn test_parsing2() {
}

match reader.next() {
Some(OSMObj::Node(_)) => {
Some(StringOSMObj::Node(_)) => {
},
_ => { assert!(false); },
}

match reader.next() {
Some(OSMObj::Node(n)) => {
assert_eq!(n.deleted, true);
Some(StringOSMObj::Node(n)) => {
assert_eq!(n._deleted, true);
},
_ => { assert!(false); },
}

match reader.next() {
Some(OSMObj::Node(_)) => {
Some(StringOSMObj::Node(_)) => {
},
_ => { assert!(false); },
}

match reader.next() {
Some(OSMObj::Way(w)) => {
assert_eq!(w.nodes, vec![292403538, 298884289, 261728686]);
assert_eq!(w.tags.len(), 2);
assert_eq!(w.tags["highway"], "unclassified");
Some(StringOSMObj::Way(w)) => {
assert_eq!(w.nodes(), vec![292403538, 298884289, 261728686]);
assert_eq!(w._tags.len(), 2);
assert_eq!(w.tag("highway"), Some("unclassified"));
},
_ => { assert!(false); },
}

match reader.next() {
Some(OSMObj::Relation(r)) => {
assert_eq!(r.members, vec![('n', 294942404, "".to_string()), ('n', 364933006, "".to_string()), ('w', 4579143, "".to_string()), ('n', 249673494, "".to_string())]);
assert_eq!(r.tags.len(), 6);
assert_eq!(r.tags["ref"], "123");
Some(StringOSMObj::Relation(r)) => {
assert_eq!(r._members, vec![(OSMObjectType::Node, 294942404, "".into()), (OSMObjectType::Node, 364933006, "".into()), (OSMObjectType::Way, 4579143, "".into()), (OSMObjectType::Node, 249673494, "".into())]);
assert_eq!(r._tags.len(), 6);
assert_eq!(r.tag("ref"), Some("123"));
},
_ => { assert!(false); },
}
}

#[test]
fn test_writer_empty() {
let output_cursor = Cursor::new(Vec::new());
let mut xml_writer = XMLWriter::new(output_cursor);
let mut output_cursor = Vec::new();
let mut xml_writer = XMLWriter::new(&mut output_cursor);

xml_writer.close();
drop(xml_writer);

let output = String::from_utf8(xml_writer.into_inner().into_inner()).unwrap();
assert_eq!(output, format!("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<osm version=\"0.6\" generator=\"osmio/{}\" />", version()));
let output = String::from_utf8(output_cursor).unwrap();
assert_eq!(output, format!("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<osm version=\"0.6\" generator=\"osmio/{}\">\n</osm>", version()));
}

#[test]
fn test_writer() {
let output_cursor = Cursor::new(Vec::new());
let mut xml_writer = XMLWriter::new(output_cursor);

let mut tags = HashMap::new();
tags.insert("highway".to_string(), "nevar".to_string());
xml_writer.write_obj(&OSMObj::Node(Node{ id: 1, version: 1, deleted: false, changeset_id: 1, user: "Username".to_string(), uid: 2, lat: Some(1.), lon: Some(2.), timestamp: TimestampFormat::ISOString("900 CE".to_string()), tags: tags.clone() })).ok();

xml_writer.write_obj(&OSMObj::Way(Way{ id: 2, version: 1, deleted: false, changeset_id: 1, user: "Username".to_string(), uid: 2, timestamp: TimestampFormat::ISOString("900 CE".to_string()), tags: tags.clone(), nodes: vec![1, 2, 3] })).ok();

xml_writer.write_obj(&OSMObj::Relation(Relation{ id: 2, version: 1, deleted: false, changeset_id: 1, user: "Username".to_string(), uid: 2, timestamp: TimestampFormat::ISOString("900 CE".to_string()), tags: tags.clone(), members: vec![('n', 1, "".to_string()), ('w', 2, "".to_string() ) ]})).ok();
let mut output_cursor = Vec::new();
let mut xml_writer = XMLWriter::new(&mut output_cursor);

let mut node = StringNodeBuilder::default()._id(1)._version(1)._deleted(false)._changeset_id(1)._uid(2)._timestamp(TimestampFormat::ISOString("900 CE".to_string())).build().unwrap();
node.set_lat_lon((1.,2.));
node.set_user("Username");
node.set_tag("highway", "nevar");
xml_writer.write_obj(&StringOSMObj::Node(node)).ok();

let mut way = StringWayBuilder::default()._id(2).build().unwrap();
way.set_version(1);
way.set_deleted(false);
way.set_changeset_id(1);
way.set_user("Username");
way.set_uid(2);
way.set_timestamp(TimestampFormat::ISOString("900 CE".to_string()));
way.set_tag("highway", "nevar");
way.set_nodes(vec![1, 2, 3]);
xml_writer.write_obj(&StringOSMObj::Way(way)).ok();

let mut relation = StringRelationBuilder::default()._id(2).build().unwrap();
relation.set_version(1);
relation.set_deleted(false);
relation.set_changeset_id(1);
relation.set_user("Username");
relation.set_uid(2);
relation.set_timestamp(TimestampFormat::ISOString("900 CE".to_string()));
relation.set_tag("highway", "nevar");
relation.set_members(vec![(OSMObjectType::Node, 1, ""),(OSMObjectType::Way, 2, "")]);
xml_writer.write_obj(&StringOSMObj::Relation(relation)).ok();

xml_writer.close();
drop(xml_writer);

let output = String::from_utf8(xml_writer.into_inner().into_inner()).unwrap();
let output = String::from_utf8(output_cursor).unwrap();
//println!("{}", output);
assert_eq!(output, format!("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<osm version=\"0.6\" generator=\"osmio/{}\">\n <node id=\"1\" version=\"1\" user=\"Username\" uid=\"2\" changeset=\"1\" timestamp=\"900 CE\" lat=\"1\" lon=\"2\" visible=\"true\">\n <tag k=\"highway\" v=\"nevar\" />\n </node>\n <way id=\"2\" version=\"1\" user=\"Username\" uid=\"2\" changeset=\"1\" timestamp=\"900 CE\" visible=\"true\">\n <nd ref=\"1\" />\n <nd ref=\"2\" />\n <nd ref=\"3\" />\n <tag k=\"highway\" v=\"nevar\" />\n </way>\n <relation id=\"2\" version=\"1\" user=\"Username\" uid=\"2\" changeset=\"1\" timestamp=\"900 CE\" visible=\"true\">\n <member type=\"node\" ref=\"1\" role=\"\" />\n <member type=\"way\" ref=\"2\" role=\"\" />\n <tag k=\"highway\" v=\"nevar\" />\n </relation>\n</osm>", version()));


}
assert_eq!(output, format!("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<osm version=\"0.6\" generator=\"osmio/{}\">\n\t<node id=\"1\" visible=\"true\" version=\"1\" user=\"Username\" uid=\"2\" changeset=\"1\" timestamp=\"900 CE\" lat=\"1\" lon=\"2\">\n\t\t<tag k=\"highway\" v=\"nevar\" />\n\t</node>\n\t<way id=\"2\" visible=\"true\" version=\"1\" user=\"Username\" uid=\"2\" changeset=\"1\" timestamp=\"900 CE\">\n\t\t<nd ref=\"1\" />\n\t\t<nd ref=\"2\" />\n\t\t<nd ref=\"3\" />\n\t\t<tag k=\"highway\" v=\"nevar\" />\n\t</way>\n\t<relation id=\"2\" visible=\"true\" version=\"1\" user=\"Username\" uid=\"2\" changeset=\"1\" timestamp=\"900 CE\">\n\t\t<member type=\"node\" ref=\"1\" role=\"\" />\n\t\t<member type=\"way\" ref=\"2\" role=\"\" />\n\t\t<tag k=\"highway\" v=\"nevar\" />\n\t</relation>\n</osm>", version()));
}