summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBirte Kristina Friesel <derf@finalrewind.org>2025-11-30 20:24:46 +0100
committerBirte Kristina Friesel <derf@finalrewind.org>2025-11-30 20:24:46 +0100
commit9955a3b6f8692c4808ea560e5e2e168a9061bc0d (patch)
treea131112ea7abd90cb18042b6158b7965d6c0657a /lib
parent1496f4528300b108c69196c7d329289ddca2ab74 (diff)
dbris: show checkin suggestions at the top of the departure board
Suggestions for connecting trains (i.e., suggestions shown in the "checked in" view) are not supported yet. This part is due for a major rewrite that moves the associated departure board request to the background worker rather than firing off a promise and delaying rendering until it has been answered.
Diffstat (limited to 'lib')
-rwxr-xr-xlib/Travelynx/Controller/Traveling.pm33
-rwxr-xr-xlib/Travelynx/Model/Journeys.pm13
2 files changed, 41 insertions, 5 deletions
diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm
index 3b46775..7e5bc82 100755
--- a/lib/Travelynx/Controller/Traveling.pm
+++ b/lib/Travelynx/Controller/Traveling.pm
@@ -1203,6 +1203,8 @@ sub station {
}
}
+ my @suggestions;
+
my $promise;
if ($dbris_service) {
if ( $station !~ m{ [@] L = \d+ }x ) {
@@ -1304,6 +1306,36 @@ sub station {
if ( $station =~ m{ [@] O = (?<name> [^@]+ ) [@] }x ) {
$status->{station_name} = $+{name};
}
+
+ my ($eva) = ( $station =~ m{ [@] L = (\d+) }x );
+ my $backend_id
+ = $self->stations->get_backend_id( dbris => $dbris_service );
+ my @destinations = $self->journeys->get_connection_targets(
+ uid => $uid,
+ backend_id => $backend_id,
+ eva => $eva
+ );
+
+ for my $dep (@results) {
+ destination: for my $dest (@destinations) {
+ if ( $dep->destination
+ and $dep->destination eq $dest->{name} )
+ {
+ push( @suggestions, [ $dep, $dest ] );
+ next destination;
+ }
+ for my $via_name ( $dep->via ) {
+ if ( $via_name eq $dest->{name} ) {
+ push( @suggestions, [ $dep, $dest ] );
+ next destination;
+ }
+ }
+ }
+ }
+
+ @suggestions = map { $_->[0] }
+ sort { $a->[1] <=> $b->[1] }
+ map { [ $_, $_->[0]->dep->epoch ] } @suggestions;
}
elsif ($hafas_service) {
@@ -1449,6 +1481,7 @@ sub station {
related_stations => $status->{related_stations},
user_status => $user_status,
can_check_out => $can_check_out,
+ suggestions => \@suggestions,
title => "travelynx: $status->{station_name}",
);
}
diff --git a/lib/Travelynx/Model/Journeys.pm b/lib/Travelynx/Model/Journeys.pm
index 77907cd..e0f1e83 100755
--- a/lib/Travelynx/Model/Journeys.pm
+++ b/lib/Travelynx/Model/Journeys.pm
@@ -2104,9 +2104,14 @@ sub get_connection_targets {
my $uid = $opt{uid};
my $threshold = $opt{threshold}
// DateTime->now( time_zone => 'Europe/Berlin' )->subtract( months => 4 );
- my $db = $opt{db} //= $self->{pg}->db;
- my $min_count = $opt{min_count} // 3;
- my $dest_id = $opt{eva};
+ my $db = $opt{db} //= $self->{pg}->db;
+ my $min_count = $opt{min_count} // 3;
+ my $backend_id = $opt{backend_id};
+ my $dest_id = $opt{eva};
+
+ $self->{log}->debug(
+"get_connection_targets(uid => $uid, backend_id => $backend_id, dest_id => $dest_id)"
+ );
if ( $opt{destination_name} ) {
return {
@@ -2115,8 +2120,6 @@ sub get_connection_targets {
};
}
- my $backend_id = $opt{backend_id};
-
if ( not $dest_id ) {
( $dest_id, $backend_id ) = $self->get_latest_dest_ids(%opt);
}