Separate parallel reader

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "osmpbfreader"
-version = "0.19.1"
+version = "0.20.0"
 authors = ["Guillaume Pinot <texitoi@texitoi.eu>"]
 description = "Read OpenStreetMap PBF files in rust."
 documentation = "https://docs.rs/osmpbfreader"

examples/count.rs

@@ -12,15 +12,15 @@ extern crate osmpbfreader;
 
 fn count<F: Fn(&osmpbfreader::Tags) -> bool>(filter: F, filename: &std::ffi::OsStr) {
     let r = std::fs::File::open(std::path::Path::new(filename)).unwrap();
-    let mut pbf = osmpbfreader::OsmPbfReader::new(r);
+    let mut pbf = osmpbfreader::ParReader::new(r);
     let mut nb_nodes = 0;
     let mut sum_lon = 0.;
     let mut sum_lat = 0.;
     let mut nb_ways = 0;
     let mut nb_way_nodes = 0;
     let mut nb_rels = 0;
     let mut nb_rel_refs = 0;
-    for obj in pbf.par_iter().map(Result::unwrap) {
+    for obj in pbf.iter().map(Result::unwrap) {
         if !filter(obj.tags()) {
             continue;
         }

examples/count_with_deps.rs

@@ -12,7 +12,7 @@ extern crate osmpbfreader;
 
 fn count<F: Fn(&osmpbfreader::Tags) -> bool>(filter: F, filename: &std::ffi::OsStr) {
     let r = std::fs::File::open(std::path::Path::new(filename)).unwrap();
-    let mut pbf = osmpbfreader::OsmPbfReader::new(r);
+    let mut pbf = osmpbfreader::Reader::new(r);
     let objs = pbf.get_objs_and_deps(|obj| filter(obj.tags())).unwrap();
     let mut nb_nodes = 0;
     let mut sum_lon = 0.;

examples/relation.rs

@@ -15,7 +15,7 @@ fn main() {
     let filename = std::env::args_os().nth(1).unwrap();
     let path = std::path::Path::new(&filename);
     let r = std::fs::File::open(path).unwrap();
-    let mut pbf = osmpbfreader::OsmPbfReader::new(r);
+    let mut pbf = osmpbfreader::Reader::new(r);
     let objects = pbf.get_objs_and_deps(wanted).unwrap();
     println!(
         "The relation Paris is composed of {:?} items",

examples/tutorial.rs

@@ -11,7 +11,7 @@ fn main() {
     let filename = std::env::args_os().nth(1).unwrap();
     let path = std::path::Path::new(&filename);
     let r = std::fs::File::open(path).unwrap();
-    let mut pbf = osmpbfreader::OsmPbfReader::new(r);
+    let mut pbf = osmpbfreader::Reader::new(r);
     let mut nb = 0;
     for _obj in pbf.iter().map(Result::unwrap) {
         nb += 1;

src/lib.rs

@@ -18,7 +18,7 @@
 //! availlable.
 //!
 //! ```rust
-//! let mut pbf = osmpbfreader::OsmPbfReader::new(std::io::Cursor::new([]));
+//! let mut pbf = osmpbfreader::Reader::new(std::io::Cursor::new([]));
 //! let objs = pbf.get_objs_and_deps(|obj| {
 //!     obj.is_way() && obj.tags().contains_key("highway")
 //! })
@@ -35,7 +35,7 @@
 //!
 //! ```rust
 //! use std::process::exit;
-//! let mut pbf = osmpbfreader::OsmPbfReader::new(std::io::empty());
+//! let mut pbf = osmpbfreader::Reader::new(std::io::empty());
 //! for obj in pbf.iter() {
 //!     // error handling:
 //!     let obj = obj.unwrap_or_else(|e| {println!("{:?}", e); exit(1)});
@@ -49,8 +49,8 @@
 //!
 //! ```rust
 //! use std::process::exit;
-//! let mut pbf = osmpbfreader::OsmPbfReader::new(std::io::empty());
-//! for obj in pbf.par_iter() {
+//! let mut pbf = osmpbfreader::ParReader::new(std::io::empty());
+//! for obj in pbf.iter() {
 //!     // error handling:
 //!     let obj = obj.unwrap_or_else(|e| {println!("{:?}", e); exit(1)});
 //!
@@ -67,7 +67,7 @@
 //!
 //! ```rust
 //! use osmpbfreader::{primitive_block_from_blob, groups};
-//! let mut pbf = osmpbfreader::OsmPbfReader::new(std::io::empty());
+//! let mut pbf = osmpbfreader::Reader::new(std::io::empty());
 //! for block in pbf.blobs().map(|b| primitive_block_from_blob(&b.unwrap())) {
 //!     let block = block.unwrap();
 //!     for group in block.primitivegroup.iter() {
@@ -98,10 +98,12 @@
 pub use error::Error;
 pub use error::Result;
 pub use objects::*;
-pub use reader::{primitive_block_from_blob, OsmPbfReader, StoreObjs};
+pub use par_reader::ParReader;
+pub use reader::{primitive_block_from_blob, Reader};
 
 pub mod blobs;
 pub mod objects;
+pub mod par_reader;
 pub mod reader;
 
 #[allow(missing_docs)]
@@ -110,6 +112,7 @@ pub mod blocks;
 pub mod error;
 #[allow(missing_docs)]
 pub mod groups;
+mod store_objs;
 
 mod pbf {
     include!(concat!(env!("OUT_DIR"), "/mod.rs"));