nickorlow/septastic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor changes

Browse source
This commit is contained in:
Nicholas Orlowsky 2025-09-23 18:03:28 -04:00
parent 95bef54eed
commit 0593f14408
No known key found for this signature in database
GPG key ID: A9F3BA4C0AA7A70B
3 changed files with 29 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

51
api/src/controllers/route.rs
View file

@ -1,5 +1,5 @@
use actix_web::{get, web::{Data, self}, HttpResponse, Responder};
use std::{cmp::Ordering, time::Instant, sync::Arc};
use std::{time::Instant, sync::Arc};
use libseptastic::{route::RouteType, stop_schedule::Trip};
use serde::{Serialize, Deserialize};
use askama::Template;
@ -9,24 +9,15 @@ use crate::database;
#[get("/routes")]
async fn get_routes_html(state: Data<Arc<AppState>>) -> impl Responder {
let start_time = Instant::now();
let start_time = Instant::now();
let all_routes = database::get_all_routes(&mut state.database.begin().await.unwrap()).await.unwrap();
let mut all_routes = database::get_all_routes(&mut state.database.begin().await.unwrap()).await.unwrap();
all_routes.sort_by(|x, y| {
if let Ok(x_p) = x.id.parse::<u32>() {
if let Ok(y_p) = y.id.parse::<u32>() {
return if y_p > x_p { Ordering::Less } else { Ordering::Greater };
}
}
let rr_routes = all_routes.clone().into_iter().filter(|x| x.route_type == RouteType::RegionalRail).collect();
let subway_routes = all_routes.clone().into_iter().filter(|x| x.route_type == RouteType::SubwayElevated).collect();
let trolley_routes = all_routes.clone().into_iter().filter(|x| x.route_type == RouteType::Trolley).collect();
let bus_routes = all_routes.into_iter().filter(|x| x.route_type == RouteType::TracklessTrolley || x.route_type == RouteType::Bus).collect();
return if y.id > x.id { Ordering::Less } else { Ordering::Greater };
});
let rr_routes = all_routes.clone().into_iter().filter(|x| x.route_type == RouteType::RegionalRail).collect();
let subway_routes = all_routes.clone().into_iter().filter(|x| x.route_type == RouteType::SubwayElevated).collect();
let trolley_routes = all_routes.clone().into_iter().filter(|x| x.route_type == RouteType::Trolley).collect();
let bus_routes = all_routes.into_iter().filter(|x| x.route_type == RouteType::TracklessTrolley || x.route_type == RouteType::Bus).collect();
HttpResponse::Ok().body(crate::templates::ContentTemplate {
page_title: Some(String::from("SEPTASTIC | Routes")),
page_desc: Some(String::from("All SEPTA routes.")),
@ -47,16 +38,11 @@ async fn get_routes_json(state: Data<Arc<AppState>>) -> impl Responder {
}
#[derive(Debug, Deserialize)]
pub struct MyQueryParams {
pub struct RouteQueryParams {
#[serde(default)] // Optional: handle missing parameters with a default value
stops: Option<String>,
}
async fn get_route_by_id(id: String, state: Data<Arc<AppState>>) -> ::anyhow::Result<libseptastic::route::Route> {
Ok(database::get_route_by_id(id, &mut state.database.begin().await?).await?)
}
#[derive(Serialize, Deserialize)]
pub struct RouteResponse {
pub route: libseptastic::route::Route,
@ -65,24 +51,25 @@ pub struct RouteResponse {
}
async fn get_route_info(route_id: String, state: Data<Arc<AppState>>) -> ::anyhow::Result<RouteResponse> {
let mut tx = state.database.begin().await?;
let route = get_route_by_id(route_id.clone(), state.clone()).await?;
let directions = database::get_direction_by_route_id(route_id.clone(), &mut state.database.begin().await?).await?;
let mut trips = database::get_schedule_by_route_id(route_id.clone(), &mut state.database.begin().await?).await?;
let route = database::get_route_by_id(route_id.clone(), &mut tx).await?;
//let directions = database::get_direction_by_route_id(route_id.clone(), &mut tx).await?;
let mut trips = database::get_schedule_by_route_id(route_id.clone(), &mut tx).await?;
state.trip_tracking_service.annotate_trips(&mut trips);
Ok(RouteResponse{
route,
directions,
directions: Vec::new(),
schedule: trips
})
}
#[get("/route/{route_id}")]
async fn get_route(state: Data<Arc<AppState>>, info: web::Query<MyQueryParams>, path: web::Path<String>) -> impl Responder {
async fn get_route(state: Data<Arc<AppState>>, info: web::Query<RouteQueryParams>, path: web::Path<String>) -> impl Responder {
let start_time = Instant::now();
let start_time = Instant::now();
let mut filters: Option<Vec<i64>> = None;
if let Some (stops_v) = info.stops.clone() {
let mut items = Vec::new();
@ -95,16 +82,20 @@ async fn get_route(state: Data<Arc<AppState>>, info: web::Query<MyQueryParams>,
let route_id = path.into_inner();
let route_info_r = get_route_info(route_id.clone(), state).await;
let load_time_ms = Some(start_time.elapsed().as_millis());
if let Ok(route_info) = route_info_r {
let timetables = crate::templates::build_timetables(route_info.directions, route_info.schedule);
HttpResponse::Ok().body(crate::templates::ContentTemplate {
page_title: Some(format!("SEPTASTIC | Schedules for {}", route_id.clone())),
page_desc: Some(format!("Schedule information for {}", route_id.clone())),
content: crate::templates::RouteTemplate {
route: route_info.route,
timetables: crate::templates::build_timetables(route_info.directions.as_slice(), route_info.schedule.as_slice()),
timetables,
filter_stops: filters.clone()
},
load_time_ms: Some(start_time.elapsed().as_millis())
load_time_ms
}.render().unwrap())
} else {
HttpResponse::InternalServerError().body("Error")