Merge pull request #4 from ArnaudOggy/update_gtfs_parser

Manage pathways refactoring

src/gtfs/mod.rs

@@ -296,7 +296,7 @@ where
     collections.comments = comments;
     read::manage_stop_times(&mut collections, file_handler)?;
     read::manage_frequencies(&mut collections, file_handler)?;
-    collections.pathways = read::read_pathways(&mut collections, file_handler)?;
+    read::manage_pathways(&mut collections, file_handler)?;
     collections.levels = read_utils::read_opt_collection(file_handler, "levels.txt")?;
     collections.sanitize()?;
 

src/gtfs/read.rs

@@ -676,10 +676,7 @@ where
     Ok((stopareas, stoppoints, stoplocations))
 }
 
-pub fn read_pathways<H>(
-    collections: &mut Collections,
-    file_handler: &mut H,
-) -> Result<CollectionWithId<objects::Pathway>>
+pub fn manage_pathways<H>(collections: &mut Collections, file_handler: &mut H) -> Result<()>
 where
     for<'a> &'a mut H: FileHandler,
 {
@@ -688,7 +685,6 @@ where
     match reader {
         None => {
             info!("Skipping {}", file);
-            Ok(CollectionWithId::new(vec![])?)
         }
         Some(reader) => {
             info!("Reading {}", file);
@@ -730,9 +726,10 @@ where
                     }));
                 pathways.push(pathway);
             }
-            Ok(CollectionWithId::new(pathways)?)
+            collections.pathways = CollectionWithId::new(pathways)?;
         }
     }
+    Ok(())
 }
 
 pub fn read_transfers<H>(
@@ -3035,8 +3032,8 @@ mod tests {
             collections.stop_points = stop_points;
             collections.stop_locations = stop_locations;
 
-            let pathways = super::read_pathways(&mut collections, &mut handler).unwrap();
-            assert_eq!(1, pathways.len());
+            super::manage_pathways(&mut collections, &mut handler).unwrap();
+            assert_eq!(1, collections.pathways.len());
         })
     }
     #[test]

src/ntfs/mod.rs

@@ -204,7 +204,7 @@ pub fn read<P: AsRef<path::Path>>(path: P) -> Result<Model> {
     read::manage_geometries(&mut collections, path)?;
     read::manage_feed_infos(&mut collections, path)?;
     read::manage_stops(&mut collections, path)?;
-    collections.pathways = read::read_pathways(&mut collections, path)?;
+    read::manage_pathways(&mut collections, path)?;
     read::manage_stop_times(&mut collections, path)?;
     read::manage_codes(&mut collections, path)?;
     read::manage_comments(&mut collections, path)?;

src/ntfs/read.rs

@@ -618,15 +618,12 @@ pub fn manage_companies_on_vj(collections: &mut Collections) -> Result<()> {
     Ok(())
 }
 
-pub fn read_pathways(
-    collections: &mut Collections,
-    path: &path::Path,
-) -> Result<CollectionWithId<Pathway>> {
+pub fn manage_pathways(collections: &mut Collections, path: &path::Path) -> Result<()> {
     let file = "pathways.txt";
     let pathway_path = path.join(file);
     if !pathway_path.exists() {
         info!("Skipping {}", file);
-        return Ok(CollectionWithId::new(vec![])?);
+        return Ok(());
     }
 
     info!("Reading {}", file);
@@ -671,7 +668,8 @@ pub fn read_pathways(
         pathways.push(pathway);
     }
 
-    Ok(CollectionWithId::new(pathways)?)
+    collections.pathways = CollectionWithId::new(pathways)?;
+    Ok(())
 }
 
 #[cfg(test)]