Add new feature 'full-metadata' to dump all available metadata from pbf file

Cargo.toml

@@ -14,6 +14,8 @@ edition = "2021"
 [features]
 # Enables serde serialization/deserialization for all OpenStreetMap data structures
 serde = ["dep:serde", "flat_map/serde1", "smartstring/serde"]
+# Enables dumping of full metadata from pbf file
+full-metadata = []
 
 [dependencies]
 byteorder = "1.3"

src/blobs.rs

@@ -9,12 +9,16 @@
 
 use std::iter;
 
+#[cfg(feature = "full-metadata")]
+use crate::blocks::OsmObjInfos as OsmBlockObjInfos;
 use crate::blocks::{
     self, Nodes as BlockNodes, OsmObjs as OsmBlockObjs, Relations as BlockRelations,
     Ways as BlockWays,
 };
 use crate::fileformat::Blob;
 use crate::objects::OsmObj;
+#[cfg(feature = "full-metadata")]
+use crate::objects::OsmObjInfo;
 use crate::osmformat::PrimitiveBlock;
 
 macro_rules! wrap {
@@ -40,6 +44,8 @@ macro_rules! wrap {
 }
 
 wrap!(OsmBlobObjs, OsmBlockObjs => OsmObj);
+#[cfg(feature = "full-metadata")]
+wrap!(OsmBlobObjInfos, OsmBlockObjInfos => OsmObjInfo);
 wrap!(OsmBlobRelations, BlockRelations => super::Relation);
 wrap!(OsmBlobWays, BlockWays => super::Way);
 wrap!(OsmBlobNodes, BlockNodes => super::Node);
@@ -73,6 +79,41 @@ pub fn result_blob_into_iter(result: crate::Result<Blob>) -> OsmObjs<OsmBlobObjs
     }
 }
 
+/// An iterator on `Result<OsmObjInfo>`.
+#[cfg(feature = "full-metadata")]
+pub struct OsmObjInfos<T: Iterator>(OsmObjInfosImpl<T>);
+
+#[allow(clippy::type_complexity)]
+#[cfg(feature = "full-metadata")]
+enum OsmObjInfosImpl<T: Iterator> {
+    OkIter(iter::Map<T, fn(<T as Iterator>::Item) -> crate::Result<<T as Iterator>::Item>>),
+    ErrIter(iter::Once<crate::Result<<T as Iterator>::Item>>),
+}
+
+#[cfg(feature = "full-metadata")]
+impl<T: Iterator> Iterator for OsmObjInfos<T> {
+    type Item = crate::Result<<T as Iterator>::Item>;
+    fn next(&mut self) -> Option<Self::Item> {
+        match self.0 {
+            OsmObjInfosImpl::OkIter(ref mut iter) => iter.next(),
+            OsmObjInfosImpl::ErrIter(ref mut iter) => iter.next(),
+        }
+    }
+}
+
+/// Transforms a `Result<blob>` into a `Iterator<Item = Result<OsmObjInfo>>`.
+#[cfg(feature = "full-metadata")]
+pub fn result_blob_into_iter_with_metadata(
+    result: crate::Result<Blob>,
+) -> OsmObjInfos<OsmBlobObjInfos> {
+    match result.and_then(|b| crate::reader::primitive_block_from_blob(&b)) {
+        Ok(block) => OsmObjInfos(OsmObjInfosImpl::OkIter(
+            OsmBlobObjInfos::new(block, blocks::iter_with_metadata).map(Ok),
+        )),
+        Err(e) => OsmObjInfos(OsmObjInfosImpl::ErrIter(iter::once(Err(e)))),
+    }
+}
+
 /// Transforms a `Result<blob>` into a `Iterator<Item = Result<Node>>`.
 pub fn result_blob_into_node_iter(result: crate::Result<Blob>) -> OsmObjs<OsmBlobNodes> {
     match result.and_then(|b| crate::reader::primitive_block_from_blob(&b)) {

src/blocks.rs

@@ -8,6 +8,8 @@
 //! Iterators of OpenStreetMap objects from a block.
 
 use crate::groups;
+#[cfg(feature = "full-metadata")]
+use crate::objects::OsmObjInfo;
 use crate::objects::{Node, OsmObj, Relation, Way};
 use crate::osmformat::PrimitiveBlock;
 use pub_iterator_type::pub_iterator_type;
@@ -22,6 +24,18 @@ pub fn iter(block: &PrimitiveBlock) -> OsmObjs {
     OsmObjs(Box::new(block.primitivegroup.iter().flat_map(f)))
 }
 
+#[cfg(feature = "full-metadata")]
+pub_iterator_type! {
+    #[doc="Iterator on the `OsmObjInfo` of a `PrimitiveBlock`."]
+    OsmObjInfos['a] = Box<dyn Iterator<Item = OsmObjInfo> + 'a>
+}
+
+#[cfg(feature = "full-metadata")]
+pub fn iter_with_metadata(block: &PrimitiveBlock) -> OsmObjInfos {
+    let f = move |g| groups::iter_with_metadata(g, block);
+    OsmObjInfos(Box::new(block.primitivegroup.iter().flat_map(f)))
+}
+
 pub_iterator_type! {
     #[doc="Iterator on the `Node` of a `PrimitiveBlock`."]
     Nodes['a] = Box<dyn Iterator<Item = Node> + 'a>