mark/nopnv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch to using bahn.de api instead of bahnhof.de

Browse Source
This commit is contained in:
mark 2025-07-18 09:50:44 +02:00 committed by Mark
parent 8f9c90a689
commit 1d4ba20039
3 changed files with 179 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/bahnhof.rs
View File

@ -1,33 +1,40 @@
use std::collections::HashMap; use chrono::NaiveDateTime;
use chrono::{DateTime, Local};
use serde::Deserialize; use serde::Deserialize;
#[derive(Deserialize)] #[derive(Deserialize)]
pub struct DeparturesMerklingen { pub struct DeparturesMerklingen {
#[serde(rename = "entries")] #[serde(rename = "entries")]
pub entries: Vec<Vec<DeparturesMerklingen1>>, pub entries: Vec<DeparturesMerklingen1>,
} }
#[derive(Deserialize)] #[derive(Deserialize)]
pub struct DeparturesMerklingen1 { pub struct DeparturesMerklingen1 {
#[serde(rename = "timeSchedule")] #[serde(rename = "zeit")]
pub time_schedule: Option<DateTime<Local>>, pub time_schedule: Option<NaiveDateTime>,
#[serde(rename = "timeDelayed")] #[serde(rename = "ezZeit")]
pub time_delayed: Option<DateTime<Local>>, pub time_delayed: Option<NaiveDateTime>,
#[serde(rename = "platform")] #[serde(rename = "ezGleis")]
pub platform: Option<String>, pub platform: Option<String>,
#[serde(rename = "platformSchedule")] #[serde(rename = "gleis")]
pub platform_schedule: Option<String>, pub platform_schedule: Option<String>,
// TODO: find this in api if it exists
#[serde(rename = "canceled")] #[serde(rename = "canceled")]
pub canceled: Option<bool>, pub canceled: Option<bool>,
#[serde(rename = "lineName")] #[serde(rename = "verkehrmittel")]
pub line_name: Option<String>, pub line_name: Option<DeparturesMerklingen4>,
// TODO: find this in api if it exists
#[serde(rename = "stopPlace")] #[serde(rename = "stopPlace")]
pub stop_place: Option<DeparturesMerklingen2>, pub stop_place: Option<DeparturesMerklingen2>,
#[serde(rename = "destination")] #[serde(rename = "terminus")]
pub destination: Option<DeparturesMerklingen2>, pub destination: Option<String>,
#[serde(rename = "messages")] #[serde(rename = "meldungen")]
pub messages: Option<HashMap<String, Vec<DeparturesMerklingen3>>>, pub messages: Option<Vec<DeparturesMerklingen3>>,
}
#[derive(Deserialize)]
pub struct DeparturesMerklingen4 {
#[serde(rename = "linienNummer")]
pub line_number: Option<String>,
#[serde(rename = "kurzText")]
pub product: Option<String>,
} }
#[derive(Deserialize)] #[derive(Deserialize)]
pub struct DeparturesMerklingen2 { pub struct DeparturesMerklingen2 {
@ -40,22 +47,20 @@ pub struct DeparturesMerklingen2 {
pub struct DeparturesMerklingen3 { pub struct DeparturesMerklingen3 {
#[serde(rename = "text")] #[serde(rename = "text")]
pub text: Option<String>, pub text: Option<String>,
#[serde(rename = "important")] #[serde(rename = "prioritaet")]
pub important: Option<bool>, pub priority: Option<String>,
} }
pub async fn departures_merklingen() -> Result<DeparturesMerklingen, String> { pub async fn departures_merklingen() -> Result<DeparturesMerklingen, String> {
let url = format!( let url = r#"https://www.bahn.de/web/api/reiseloesung/abfahrten?ortExtId=8003983&mitVias=true&maxVias=8&verkehrsmittel[]=ICE&verkehrsmittel[]=EC_IC&verkehrsmittel[]=IR&verkehrsmittel[]=REGIONAL&verkehrsmittel[]=SBAHN"#;
r#"https://www.bahnhof.de/api/boards/departures?evaNumbers=8003983&filterTransports=REGIONAL_TRAIN&duration=120&stationCategory=5&locale=de&sortBy=TIME_SCHEDULE"# match reqwest::get(url).await {
);
match reqwest::get(&url).await {
Ok(response) => match response.text().await { Ok(response) => match response.text().await {
Ok(response) => { Ok(response) => match serde_json::from_str::<DeparturesMerklingen>(&response) {
match serde_json::from_str::<DeparturesMerklingen>(&response) {
Ok(response) => Ok(response), Ok(response) => Ok(response),
Err(e) => Err(format!("Couldn't parse HTTP response from URL {url:?}: {e}\nResponse was (raw):\n{response}"))?, Err(e) => Err(format!(
} "Couldn't parse HTTP response from URL {url:?}: {e}\nResponse was (raw):\n{response}"
} ))?,
},
Err(e) => Err(format!("Couldn't get HTTP response from URL {url:?}: {e}"))?, Err(e) => Err(format!("Couldn't get HTTP response from URL {url:?}: {e}"))?,
}, },
Err(e) => Err(format!("Couldn't make GET request to URL {url:?}: {e}"))?, Err(e) => Err(format!("Couldn't make GET request to URL {url:?}: {e}"))?,

6
src/index.html
View File

@ -36,7 +36,7 @@ async function con(change) {
nmv('oberdrackenstein_rathaus', 26) nmv('oberdrackenstein_rathaus', 26)
break; break;
case "967UDrackensteinKirche": case "967UDrackensteinKirche":
nmv('unterdrackenstain_kirche', 32) nmv('unterdrackenstein_kirche', 32)
break; break;
case "967GosbachEinkaufszentrum": case "967GosbachEinkaufszentrum":
nmv('gosbach_einkaufszentrum', 37) nmv('gosbach_einkaufszentrum', 37)
@ -72,7 +72,7 @@ async function con(change) {
<button id="hohenstadt_kirche" onclick="con('967HohenstadtKirche')">Hohenstadt<small> Kirche</small></button> / <button id="hohenstadt_kirche" onclick="con('967HohenstadtKirche')">Hohenstadt<small> Kirche</small></button> /
<button id="hohenstadt_waltertal" onclick="con('967HohenstadtWaltertal')">Hohenstadt<small> Abzw. Waltertal</small></button> / <button id="hohenstadt_waltertal" onclick="con('967HohenstadtWaltertal')">Hohenstadt<small> Abzw. Waltertal</small></button> /
<button id="oberdrackenstein_rathaus" onclick="con('967ODrackensteinRathaus')">Oberdrackenstein<small> Rathaus</small></button> / <button id="oberdrackenstein_rathaus" onclick="con('967ODrackensteinRathaus')">Oberdrackenstein<small> Rathaus</small></button> /
<button id="unterdrackenstain_kirche" onclick="con('967UDrackensteinKirche')">Unterdrackenstein<small> Kirche</small></button> / <button id="unterdrackenstein_kirche" onclick="con('967UDrackensteinKirche')">Unterdrackenstein<small> Kirche</small></button> /
<button id="gosbach_einkaufszentrum" onclick="con('967GosbachEinkaufszentrum')">Gosbach<small> Einkaufszentrum</small></button> / <button id="gosbach_einkaufszentrum" onclick="con('967GosbachEinkaufszentrum')">Gosbach<small> Einkaufszentrum</small></button> /
<button id="gosbach_lamm" onclick="con('967GosbachLamm')">Gosbach<small> Lamm</small></button> / <button id="gosbach_lamm" onclick="con('967GosbachLamm')">Gosbach<small> Lamm</small></button> /
<button id="gosbach_abzw_drackenstein" onclick="con('967GosbachDrackenstein')">Gosbach<small> Abzw. Drackenstein</small></button> / <button id="gosbach_abzw_drackenstein" onclick="con('967GosbachDrackenstein')">Gosbach<small> Abzw. Drackenstein</small></button> /
@ -90,7 +90,7 @@ async function con(change) {
Diese Seite soll eine einfache Möglichkeit darstellen, zu prüfen, Diese Seite soll eine einfache Möglichkeit darstellen, zu prüfen,
ob der Bus und Zug von/nach Merklingen heute kommt, oder ob er mal wieder streikt oder aus sonstigen Gründen fehlt.<br> ob der Bus und Zug von/nach Merklingen heute kommt, oder ob er mal wieder streikt oder aus sonstigen Gründen fehlt.<br>
Das ganze sollte aber auch für andere Busse funktionieren, sofern der VVS den Bus kennt (→ <a href="https://www.vvs.de/">vvs.de</a>).<br> Das ganze sollte aber auch für andere Busse funktionieren, sofern der VVS den Bus kennt (→ <a href="https://www.vvs.de/">vvs.de</a>).<br>
Zug-Informationen kommen von <a href="https://www.bahnhof.de/merklingen-schwaebische-alb/abfahrt">bahnhof.de</a>. Zug-Informationen kommen von <a href="https://www.bahn.de/buchung/abfahrten-ankuenfte">bahn.de</a>.
</div> </div>
<div><a href="./api">API documentation</a></div> <div><a href="./api">API documentation</a></div>
</body></html> </body></html>

61
src/main.rs
View File

@ -14,7 +14,7 @@ use tokio::{
time::{Instant, sleep}, time::{Instant, sleep},
}; };
use crate::vvs::VvsStopIdentifier; use crate::{bahnhof::DeparturesMerklingen3, vvs::VvsStopIdentifier};
#[rocket::launch] #[rocket::launch]
async fn rocket() -> _ { async fn rocket() -> _ {
@ -103,35 +103,40 @@ async fn index(
let mut table_rows = BTreeMap::<_, (String, String, usize, usize, bool)>::new(); let mut table_rows = BTreeMap::<_, (String, String, usize, usize, bool)>::new();
for departure in &departures.entries { for departure in &departures.entries {
let mut messages = vec![]; let mut messages = vec![];
for departure in departure.iter() {
if let Some(message) = &departure.messages { if let Some(message) = &departure.messages {
for (_message_type, message) in message { for DeparturesMerklingen3 { priority, text } in message {
for message in message { if let Some(text) = &text {
if let Some(text) = message.text.clone() { if priority
if message.important.is_some_and(|v| v) { .as_ref()
if !messages.contains(&text) { .is_some_and(|v| ["HOCH"].contains(&v.to_uppercase().as_str()))
messages.push(text); {
if !messages.contains(text) {
messages.push(text.to_owned());
} }
} }
} }
} }
} }
}
}
if let Some(departure) = departure.first() {
if let Some(time) = departure.time_delayed.or(departure.time_schedule) { if let Some(time) = departure.time_delayed.or(departure.time_schedule) {
let row = table_rows let row = table_rows
.entry((time.date_naive(), time.hour(), time.minute() >= 30)) .entry((time.date(), time.hour(), time.minute() >= 30))
.or_default(); .or_default();
let line_name = departure let line_name = departure
.line_name .line_name
.as_ref() .as_ref()
.map(|v| v.as_str()) .map(|v| {
.unwrap_or("[RE?]"); v.product.as_ref().map(|prod| {
format!(
"{prod} {}",
v.line_number.as_ref().map(|v| v.as_str()).unwrap_or("?")
)
})
})
.flatten()
.unwrap_or_else(|| "[RE ?]".to_owned());
let is_ulm = { let is_ulm = {
if let Some(destination) = departure.destination.as_ref() { if let Some(destination) = departure.destination.as_ref() {
if let Some(name) = &destination.name { let name = destination.to_lowercase();
let name = name.to_lowercase();
if name.starts_with("ulm") || name.contains(" ulm") { if name.starts_with("ulm") || name.contains(" ulm") {
Some(true) Some(true)
} else if name.contains("wendlingen") } else if name.contains("wendlingen")
@ -145,9 +150,6 @@ async fn index(
} else { } else {
None None
} }
} else {
None
}
} }
.or_else(|| { .or_else(|| {
match departure.platform_schedule.as_ref().map(|v| v.as_str()) { match departure.platform_schedule.as_ref().map(|v| v.as_str()) {
@ -157,7 +159,7 @@ async fn index(
} }
}); });
let mut dep_str = "".to_owned(); let mut dep_str = "".to_owned();
dep_str.push_str(html_escape::encode_safe(line_name).as_ref()); dep_str.push_str(html_escape::encode_safe(&line_name).as_ref());
let platform = departure let platform = departure
.platform .platform
.as_ref() .as_ref()
@ -212,19 +214,17 @@ async fn index(
}, },
)); ));
if let Some(dest) = &departure.destination { if let Some(dest) = &departure.destination {
if let Some(name) = &dest.name {
dep_str.push_str(r#"<br><span style="color:gray;"> → </span>"#); dep_str.push_str(r#"<br><span style="color:gray;"> → </span>"#);
dep_str.push_str(html_escape::encode_safe(name).as_ref()); dep_str.push_str(html_escape::encode_safe(dest).as_ref());
}
} }
if departure.canceled.is_some_and(|canceled| canceled) { if departure.canceled.is_some_and(|canceled| canceled) {
dep_str.push_str( dep_str.push_str(
r#"<div style="color:darkorange;"> ▸ fällt aus / cancelled</div>"#, r#"<div style="color:darkorange;"> ▸ fällt aus / cancelled</div>"#,
); );
} else if let Some(stop_place) = } else if let Some(stop_place) = departure
departure.stop_place.as_ref().filter(|stop_place| { .stop_place
stop_place.canceled.is_some_and(|canceled| canceled) .as_ref()
}) .filter(|stop_place| stop_place.canceled.is_some_and(|canceled| canceled))
{ {
dep_str.push_str(r#"<div style="color:darkorange;"> ▸ stop/halt "#); dep_str.push_str(r#"<div style="color:darkorange;"> ▸ stop/halt "#);
html_escape::encode_safe_to_string( html_escape::encode_safe_to_string(
@ -243,6 +243,12 @@ async fn index(
dep_str.push_str("</div>"); dep_str.push_str("</div>");
} }
row.4 = is_ulm.is_some(); row.4 = is_ulm.is_some();
if !row.0.is_empty() {
row.0.push_str("<br>");
}
if !row.1.is_empty() {
row.1.push_str("<br>");
}
match is_ulm { match is_ulm {
Some(true) => { Some(true) => {
row.0.push_str(&dep_str); row.0.push_str(&dep_str);
@ -264,7 +270,6 @@ async fn index(
} }
} }
} }
}
for should_be_sure in [true, false] { for should_be_sure in [true, false] {
let mut unused = true; let mut unused = true;
for (i, ((_date, _hour, _late_half), (dep_html, _, _, _, sure))) in for (i, ((_date, _hour, _late_half), (dep_html, _, _, _, sure))) in