A fantastic way to ride SEPTA
+ ++ SEPTASTIC is a website and (a soon to be) mobile app. Its purpose is to provide + information about how to ride SEPTA (and connecting transit authorities) in a + quick and information-rich manner. +
+ ++ Currently, all this website has is timetables for every + SEPTA route. More to come soon! +
diff --git a/api/templates/layout.html b/api/templates/layout.html new file mode 100644 index 0000000..f4ffa25 --- /dev/null +++ b/api/templates/layout.html @@ -0,0 +1,58 @@ + + + + + {% if let Some(title) = page_title %} +| Stop | + {% for trip_id in timetable.trip_ids %} +{{ trip_id }} | + {% endfor %} +
|---|---|
| {{ row.stop_name }} | + {% for time in row.times %} ++ {% if let Some(t) = time %} + {{ t | format_time }} + {% else %} + -- + {% endif %} + | + {% endfor %} +
Click on a route to see details and a schedule. Schedules in prevailing local time.
+ + + + + + + + diff --git a/data_loader b/data_loader index d577568..f7e9e79 160000 --- a/data_loader +++ b/data_loader @@ -1 +1 @@ -Subproject commit d577568fec8b1b7356cd0bb0520a20283318096a +Subproject commit f7e9e7903b55ed5353b0ea3946dcb4b131557468 diff --git a/libseptastic/Cargo.lock b/libseptastic/Cargo.lock index d8ba565..1260fb2 100644 --- a/libseptastic/Cargo.lock +++ b/libseptastic/Cargo.lock @@ -538,6 +538,8 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" name = "libseptastic" version = "0.1.0" dependencies = [ + "serde", + "serde_json", "sqlx", ] diff --git a/libseptastic/Cargo.toml b/libseptastic/Cargo.toml index fa289d4..3f44792 100644 --- a/libseptastic/Cargo.toml +++ b/libseptastic/Cargo.toml @@ -4,4 +4,6 @@ version = "0.1.0" edition = "2024" [dependencies] +serde = "1.0.219" +serde_json = "1.0.140" sqlx = "0.8.6" diff --git a/libseptastic/src/direction.rs b/libseptastic/src/direction.rs new file mode 100644 index 0000000..beb68b6 --- /dev/null +++ b/libseptastic/src/direction.rs @@ -0,0 +1,37 @@ + +use serde::{Deserialize, Serialize}; + +#[derive(sqlx::Type, Serialize, Deserialize, PartialEq, Debug, Clone)] +#[sqlx(type_name = "septa_direction_type", rename_all = "snake_case")] +pub enum CardinalDirection { + Northbound, + Southbound, + Eastbound, + Westbound, + Inbound, + Outbound, + Loop +} + +#[derive(::sqlx::Decode, Serialize, Deserialize, Debug, Clone)] +pub struct Direction { + pub route_id: String, + pub direction_id: i64, + pub direction: CardinalDirection, + pub direction_destination: String +} + +impl std::fmt::Display for CardinalDirection { + fn fmt (&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + let output = match self { + CardinalDirection::Northbound => "Northbound", + CardinalDirection::Southbound => "Southbound", + CardinalDirection::Eastbound => "Eastbound", + CardinalDirection::Westbound => "Westbound", + CardinalDirection::Inbound => "Inbound", + CardinalDirection::Outbound => "Outbound", + CardinalDirection::Loop => "Loop" + }; + std::write!(f, "{}", output) + } +} diff --git a/libseptastic/src/lib.rs b/libseptastic/src/lib.rs index bcac679..af16fa4 100644 --- a/libseptastic/src/lib.rs +++ b/libseptastic/src/lib.rs @@ -3,3 +3,5 @@ pub mod stop; pub mod route_stop; pub mod stop_schedule; pub mod schedule_day; +pub mod direction; +pub mod ridership; diff --git a/libseptastic/src/ridership.rs b/libseptastic/src/ridership.rs new file mode 100644 index 0000000..84bc2cd --- /dev/null +++ b/libseptastic/src/ridership.rs @@ -0,0 +1,21 @@ +use serde::{Deserialize, Serialize}; + +use crate::direction::CardinalDirection; + +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct Ridership { + pub route_id: String, + pub stop_id: i64, + pub direction: CardinalDirection, + pub exp_ons: i64, + pub exp_offs: i64, + pub ons: i64, + pub offs: i64, + pub year: i64, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct LineRidership { + pub route_id: String, + pub unlinked_trips: i64 +} diff --git a/libseptastic/src/route.rs b/libseptastic/src/route.rs index f1ff26d..2a14c02 100644 --- a/libseptastic/src/route.rs +++ b/libseptastic/src/route.rs @@ -1,4 +1,6 @@ -#[derive(sqlx::Type, PartialEq, Debug, Clone)] +use serde::{Deserialize, Serialize}; + +#[derive(sqlx::Type, Serialize, Deserialize, PartialEq, Debug, Clone)] #[sqlx(type_name = "septa_route_type", rename_all = "snake_case")] pub enum RouteType { Trolley, @@ -8,34 +10,11 @@ pub enum RouteType { TracklessTrolley } -#[derive(sqlx::Type, PartialEq, Debug, Clone)] -#[sqlx(type_name = "septa_direction_type", rename_all = "snake_case")] -pub enum CardinalDirection { - Northbound, - Southbound, - Eastbound, - Westbound // (and down) -} - -#[derive(Debug, Clone)] -pub struct Directional { - pub direction: CardinalDirection, - pub direction_destination: String -} - - -#[derive(Debug, Clone)] -pub struct RouteDirectional { - pub primary: Directional, // 0 - pub secondary: Directional, // 1 -} - -#[derive(Debug, Clone)] +#[derive(::sqlx::FromRow, Serialize, Deserialize, Debug, Clone)] pub struct Route { pub name: String, pub short_name: String, pub color_hex: String, pub route_type: RouteType, - pub id: String, - pub directional: RouteDirectional + pub id: String } diff --git a/libseptastic/src/route_stop.rs b/libseptastic/src/route_stop.rs index 77d941d..8d9d4b4 100644 --- a/libseptastic/src/route_stop.rs +++ b/libseptastic/src/route_stop.rs @@ -1,9 +1,7 @@ -use super::route::CardinalDirection; - #[derive(Debug, Clone)] pub struct RouteStop { pub route_id: String, pub stop_id: i64, - pub direction: CardinalDirection, + pub direction_id: i64, pub stop_sequence: i64 } diff --git a/libseptastic/src/stop_schedule.rs b/libseptastic/src/stop_schedule.rs index b09c38f..a66f19e 100644 --- a/libseptastic/src/stop_schedule.rs +++ b/libseptastic/src/stop_schedule.rs @@ -1,12 +1,20 @@ -use super::route::CardinalDirection; +use serde::{Deserialize, Serialize}; -#[derive(Debug, Clone)] +#[derive(Debug, Clone, Serialize, Deserialize)] pub struct StopSchedule { pub route_id: String, pub trip_id: String, pub service_id: String, - pub direction: CardinalDirection, + pub direction_id: i64, pub arrival_time: i64, pub stop_id: i64, pub stop_sequence: i64 } + +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct Trip { + pub route_id: String, + pub trip_id: String, + pub direction_id: i64, + pub schedule: Vec