vehicle journey imports enhancement

6 files changed, 44 insertions, 38 deletions

diff --git a/spec/fixtures/stop_area_import_invalid.csv b/spec/fixtures/stop_area_import_invalid.csv
deleted file mode 100644
index 379c33012..000000000
--- a/spec/fixtures/stop_area_import_invalid.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-"id","name","longitude","latitude","area_type","parent_id","comment","country_code","street_name","mobility_restricted_suitability","stairs_availability","lift_availability","int_user_needs"
-,"StopArea1","0.1","0.1",,,"Comment",,,,,,
-,"StopArea2","0.2","0.2",,,"Comment",,,,,,
-,"StopArea3","0.3","0.3",,,"Comment",,,,,,
-,"StopArea4","0.4","0.4",,,"Comment",,,,,,
-,"StopArea5","0.5","0.5",,,"Comment",,,,,,
-,"StopArea6","0.6","0.6",,,"Comment",,,,,,
diff --git a/spec/fixtures/stop_area_import_valid.csv b/spec/fixtures/stop_area_import_valid.csv
deleted file mode 100644
index d3d2c6974..000000000
--- a/spec/fixtures/stop_area_import_valid.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-"id","name","longitude","latitude","area_type","parent_id","comment","country_code","street_name","mobility_restricted_suitability","stairs_availability","lift_availability","int_user_needs"
-,"StopArea1","0.1","0.1","Quay",,"Comment",,,,,,
-,"StopArea2","0.2","0.2","Quay",,"Comment",,,,,,
-,"StopArea3","0.3","0.3","Quay",,"Comment",,,,,,
-,"StopArea4","0.4","0.4","Quay",,"Comment",,,,,,
-,"StopArea5","0.5","0.5","Quay",,"Comment",,,,,,
-,"StopArea6","0.6","0.6","Quay",,"Comment",,,,,,
diff --git a/spec/fixtures/vehicle_journey_imports_valid.csv b/spec/fixtures/vehicle_journey_imports_valid.csv
index b20d58ab5..15f66a26f 100644
--- a/spec/fixtures/vehicle_journey_imports_valid.csv
+++ b/spec/fixtures/vehicle_journey_imports_valid.csv
@@ -1,6 +1,11 @@
-"stop area id","stop area name","import:VehicleJourney:1","import:VehicleJourney:2","import:VehicleJourney:3",""
-1,"Arrêt 1","9:00:00",,"11:10:00","12:10:00"
-2,"Arrêt 2","9:05:00","10:05:00","11:15:00","12:15:00"
-3,"Arrêt 3","9:10:00",,"11:20:00","12:20:00"
-4,"Arrêt 4","9:15:00","10:20:00","11:25:00","12:25:00"
-5,"Arrêt 5","9:20:00",,"11:30:00","12:30:00"
+;id course;import:VehicleJourney:1;import:VehicleJourney:2;import:VehicleJourney:3;
+;numéro;1;2;3;4
+;PMR (O(ui)|N(on)|vide si inconnu);Oui;;;
+;TAD (O(ui)|N(on)|vide si inconnu);Oui;;;
+;calendriers;;;;
+id arrêt;nom arrêt;;;;
+1;Arrêt 1;9:00:00;;11:10:00;12:10:00
+2;Arrêt 2;9:05:00;10:05:00;11:15:00;12:15:00
+3;Arrêt 3;9:10:00;;11:20:00;12:20:00
+4;Arrêt 4;9:15:00;10:20:00;11:25:00;12:25:00
+5;Arrêt 5;9:20:00;;11:30:00;12:30:00
diff --git a/spec/fixtures/vehicle_journey_imports_with_vj_invalid.csv b/spec/fixtures/vehicle_journey_imports_with_vj_invalid.csv
index 1b7aeb731..6ed6d90b2 100644
--- a/spec/fixtures/vehicle_journey_imports_with_vj_invalid.csv
+++ b/spec/fixtures/vehicle_journey_imports_with_vj_invalid.csv
@@ -1,6 +1,11 @@
-"stop area id","stop area name",invalid vj,"import:VehicleJourney:2","import:VehicleJourney:3"
-1,"Arrêt 1","9:00:00","10:05:00","11:10:00"
-2,"Arrêt 2","11:05:00",,"11:15:00"
-3,"Arrêt 3","11:10:00","10:20:00","11:20:00"
-4,"Arrêt 4","11:15:00",,"11:25:00"
-5,"Arrêt 5","9:20:00","10:30:00","11:30:00"
+;id course;invalid vj;import:VehicleJourney:2;import:VehicleJourney:3
+;numéro;1;2;3
+;PMR (O(ui)|N(on)|vide si inconnu);Oui;;
+;TAD (O(ui)|N(on)|vide si inconnu);Oui;;
+;calendriers;;;
+id arrêt;nom arrêt;;;
+1;Arrêt 1;9:00:00;10:05:00;11:10:00
+2;Arrêt 2;11:05:00;;11:15:00
+3;Arrêt 3;11:10:00;10:20:00;11:20:00
+4;Arrêt 4;11:15:00;;11:25:00
+5;Arrêt 5;9:20:00;10:30:00;11:30:00
diff --git a/spec/fixtures/vehicle_journey_imports_with_vjas_bad_order.csv b/spec/fixtures/vehicle_journey_imports_with_vjas_bad_order.csv
index 4096616ab..d4da585d0 100644
--- a/spec/fixtures/vehicle_journey_imports_with_vjas_bad_order.csv
+++ b/spec/fixtures/vehicle_journey_imports_with_vjas_bad_order.csv
@@ -1,6 +1,11 @@
-"stop area id","stop area name","import:VehicleJourney:1","import:VehicleJourney:2",""
-1,"Arrêt 1","9:05:00","10:05:00","11:10:00"
-2,"Arrêt 2","11:05:00",,"11:15:00"
-3,"Arrêt 3","9:10:00","10:20:00","11:20:00"
-4,"Arrêt 4","9:15:00","10:25:00","11:25:00"
-5,"Arrêt 5","9:20:00","10:30:00","11:30:00"
+;id course;import:VehicleJourney:1;import:VehicleJourney:2;
+;numéro;1;2;3
+;PMR (O(ui)|N(on)|vide si inconnu);Oui;;
+;TAD (O(ui)|N(on)|vide si inconnu);Oui;;
+;calendriers;;;
+id arrêt;nom arrêt;;;
+1;Arrêt 1;9:05:00;10:05:00;11:10:00
+2;Arrêt 2;11:05:00;;11:15:00
+3;Arrêt 3;9:10:00;10:20:00;11:20:00
+4;Arrêt 4;9:15:00;10:25:00;11:25:00
+5;Arrêt 5;9:20:00;10:30:00;11:30:00
diff --git a/spec/fixtures/vehicle_journey_imports_with_vjas_invalid.csv b/spec/fixtures/vehicle_journey_imports_with_vjas_invalid.csv
index c5e9e32b1..687f6b09a 100644
--- a/spec/fixtures/vehicle_journey_imports_with_vjas_invalid.csv
+++ b/spec/fixtures/vehicle_journey_imports_with_vjas_invalid.csv
@@ -1,6 +1,11 @@
-"stop area id","stop area name","import:VehicleJourney:1","import:VehicleJourney:2",""
-1,"Arrêt 1",invalid time,"10:05:00","11:10:00"
-2,"Arrêt 2","9:05:00",,"11:15:00"
-3,"Arrêt 3","9:10:00","10:20:00","11:20:00"
-4,"Arrêt 4","9:15:00",,"11:25:00"
-5,"Arrêt 5","9:20:00","10:30:00","11:30:00"
+;id course;import:VehicleJourney:1;import:VehicleJourney:2;
+;numéro;1;2;3
+;PMR (O(ui)|N(on)|vide si inconnu);Oui;;
+;TAD (O(ui)|N(on)|vide si inconnu);Oui;;
+;calendriers;;;;
+id arrêt;nom arrêt;;;
+1;Arrêt 1;invalid time;10:05:00;11:10:00
+2;Arrêt 2;9:05:00;;11:15:00
+3;Arrêt 3;9:10:00;10:20:00;11:20:00
+4;Arrêt 4;9:15:00;;11:25:00
+5;Arrêt 5;9:20:00;10:30:00;11:30:00