Adding more stuff in

This commit is contained in:
2026-04-18 07:41:32 +01:00
parent 34dad5e000
commit e28d4fdb22
6 changed files with 95 additions and 35 deletions
+25 -15
View File
@@ -1,9 +1,16 @@
use std::{collections::{HashMap, HashSet}, fs::File, hash::Hash};
use gtfs_structures::{Calendar, CalendarDate, RawStopTime, RawTrip, Route, Stop};
use serde::de::DeserializeOwned;
use std::{
collections::{HashMap, HashSet},
fs::File,
hash::Hash,
};
use zip::ZipArchive;
use crate::gtfs::{structs::Gtfs, utils::{route_ids_from_numbers, stop_ids_from_codes}};
use crate::gtfs::{
structs::Gtfs,
utils::{route_ids_from_numbers, stop_ids_from_codes},
};
trait Filter<T> {
fn accept(&self, v: &T) -> bool;
@@ -80,11 +87,11 @@ fn load_map<K, V, IndexFn, FilterT>(
index: IndexFn,
filter: FilterT,
) where
K: Eq + Hash,
V: DeserializeOwned,
IndexFn: Fn(&V) -> K,
FilterT: Filter<V>,
{
K: Eq + Hash,
V: DeserializeOwned,
IndexFn: Fn(&V) -> K,
FilterT: Filter<V>,
{
let file_reader = zip_reader.by_name(table_name).unwrap();
let mut rdr = csv::Reader::from_reader(file_reader);
@@ -110,11 +117,11 @@ fn load_vector_map<'a, K, V, IndexFn, FilterT>(
table_name: &str,
index: IndexFn,
filter: FilterT,
) where
K: Eq + Hash,
V: DeserializeOwned,
IndexFn: Fn(&V) -> K,
FilterT: Filter<V>,
) where
K: Eq + Hash,
V: DeserializeOwned,
IndexFn: Fn(&V) -> K,
FilterT: Filter<V>,
{
let file_reader = zip_reader.by_name(table_name).unwrap();
let mut rdr = csv::Reader::from_reader(file_reader);
@@ -128,9 +135,12 @@ fn load_vector_map<'a, K, V, IndexFn, FilterT>(
}
}
pub fn load_gtfs(gtfs: &mut Gtfs, zip_reader: &mut ZipArchive<File>, route_numbers: &HashSet<String>, stop_codes: &HashSet<String>) {
pub fn load_gtfs(
gtfs: &mut Gtfs,
zip_reader: &mut ZipArchive<File>,
route_numbers: &HashSet<String>,
stop_codes: &HashSet<String>,
) {
// Agencies
load_vector(&mut gtfs.agencies, zip_reader, "agency.txt");