Merge pull request #410 from ArnaudOggy/fix_kv1_orphan_routes

[Fix] [kv12ntfs] Skip routes (and lines) if no vj above (instead of fail process)
hove-io · Oct 14, 2019 · 81e7ecd · 81e7ecd
2 parents ceee671 + c3d37e4
commit 81e7ecd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/kv1/read.rs b/src/kv1/read.rs
@@ -701,7 +701,7 @@ fn make_routes(collections: &mut Collections, jopas: &[Jopa]) -> Result<()> {
         .collect();
     for ((line_id, direction), jopa) in jopas_map {
         let id = jopa.route_id();
-        let (origin, destination) = get_route_origin_destination(collections, &id)?;
+        let (origin, destination) = skip_fail!(get_route_origin_destination(collections, &id));
         let name = format!("{} - {}", origin.name, destination.name);
         let destination_stop_area = collections
             .stop_areas
@@ -763,9 +763,9 @@ fn make_lines(collections: &mut Collections, lines: &CollectionWithId<Kv1Line>)
             .filter(|r| r.line_id == l.id)
             .collect();
         let backward_route = route_name_by_direction(&corresponding_routes, "backward");
-        let forward_route = route_name_by_direction(&corresponding_routes, "forward")
+        let forward_route = skip_fail!(route_name_by_direction(&corresponding_routes, "forward")
             .or(backward_route)
-            .ok_or_else(|| format_err!("no routes found with line_id={}", l.id,))?;
+            .ok_or_else(|| format_err!("no routes found with line_id={}", l.id,)));
 
         collections
             .lines

diff --git a/tests/fixtures/kv12ntfs/input/JOPAXXXXXX.TMI b/tests/fixtures/kv12ntfs/input/JOPAXXXXXX.TMI
@@ -4,3 +4,4 @@ JOPA|1|I|SYNTUS|2029|90016|SRVC|2|
 JOPA|1|I|SYNTUS|2029|90049|SRVC|1|
 JOPA|1|I|SYNTUS|2030|00011|SRVC|1|
 JOPA|1|I|SYNTUS|3170|0001|SRVC|1|
+JOPA|1|I|SYNTUS|6736|6001|SRVC|2|
diff --git a/tests/fixtures/kv12ntfs/input/LINEXXXXXX.TMI b/tests/fixtures/kv12ntfs/input/LINEXXXXXX.TMI
@@ -2,3 +2,4 @@
 LINE|1|I|SYNTUS|2029|29|29|0|MO Lijn_2029|BUS||
 LINE|1|I|SYNTUS|2030|30|30|0|MO Lijn_2030|BUS||
 LINE|1|I|SYNTUS|3170|170|170|0|VE Lijn_3170|METRO||
+LINE|1|I|SYNTUS|6736|M36|M36|0|AL Lijn_6736|BUS||