Introduced preferences struct
This commit is contained in:
+12
-4
@@ -1,15 +1,23 @@
|
||||
mod loader;
|
||||
mod utils;
|
||||
mod structs;
|
||||
pub mod structs;
|
||||
use std::{
|
||||
collections::{HashMap, HashSet},
|
||||
fs::File,
|
||||
};
|
||||
use crate::gtfs::{loader::load_gtfs, structs::Gtfs};
|
||||
use crate::gtfs::{loader::load_gtfs, structs::{Arrival, Gtfs, Preferences}};
|
||||
|
||||
|
||||
pub fn get_next_stops(gtfs: &Gtfs) -> Vec<Arrival> {
|
||||
let arrivals = Vec::<Arrival>::new();
|
||||
|
||||
return arrivals;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// Load a GTFS structure from a zip file
|
||||
pub fn load(src_file: &str, route_numbers: HashSet<String>, stop_codes: HashSet<String>) -> Gtfs {
|
||||
pub fn load(src_file: &str, prefs: &Preferences) -> Gtfs {
|
||||
// Open zip file
|
||||
let mut zip_reader = zip::ZipArchive::new(File::open(src_file).unwrap()).unwrap();
|
||||
|
||||
@@ -24,7 +32,7 @@ pub fn load(src_file: &str, route_numbers: HashSet<String>, stop_codes: HashSet<
|
||||
};
|
||||
|
||||
|
||||
load_gtfs(&mut gtfs, &mut zip_reader, route_numbers, stop_codes);
|
||||
load_gtfs(&mut gtfs, &mut zip_reader, &prefs.route_numbers, &prefs.stop_codes);
|
||||
|
||||
return gtfs;
|
||||
}
|
||||
Reference in New Issue
Block a user