diff options
author | Birte Kristina Friesel <derf@finalrewind.org> | 2025-01-08 18:11:28 +0100 |
---|---|---|
committer | Birte Kristina Friesel <derf@finalrewind.org> | 2025-01-08 18:11:28 +0100 |
commit | 42f9a00d98dbd675234c05b3e25c3e722cfdd7ba (patch) | |
tree | cc27bb0a0746c19829d607e14e6cd39537997ad4 /lib/Travelynx/Controller | |
parent | 35660567614dea8d4572bcfe5bb1890504be0c20 (diff) |
EFA support (WiP)efa-support
Diffstat (limited to 'lib/Travelynx/Controller')
-rw-r--r-- | lib/Travelynx/Controller/Account.pm | 42 | ||||
-rwxr-xr-x | lib/Travelynx/Controller/Traveling.pm | 26 |
2 files changed, 68 insertions, 0 deletions
diff --git a/lib/Travelynx/Controller/Account.pm b/lib/Travelynx/Controller/Account.pm index faaad0a..97a3cf6 100644 --- a/lib/Travelynx/Controller/Account.pm +++ b/lib/Travelynx/Controller/Account.pm @@ -1069,6 +1069,48 @@ sub backend_form { $backend->{longname} = 'Deutsche Bahn (IRIS-TTS)'; $backend->{homepage} = 'https://www.bahn.de'; } + elsif ( $backend->{efa} ) { + if ( my $s = $self->efa->get_service( $backend->{name} ) ) { + $type = 'EFA'; + $backend->{longname} = $s->{name}; + $backend->{homepage} = $s->{homepage}; + $backend->{regions} = [ map { $place_map{$_} // $_ } + @{ $s->{coverage}{regions} // [] } ]; + $backend->{has_area} = $s->{coverage}{area} ? 1 : 0; + + if ( + $s->{coverage}{area} + and $s->{coverage}{area}{type} eq 'Polygon' + and $self->lonlat_in_polygon( + $s->{coverage}{area}{coordinates}, + [ $user_lon, $user_lat ] + ) + ) + { + push( @suggested_backends, $backend ); + } + elsif ( $s->{coverage}{area} + and $s->{coverage}{area}{type} eq 'MultiPolygon' ) + { + for my $s_poly ( + @{ $s->{coverage}{area}{coordinates} // [] } ) + { + if ( + $self->lonlat_in_polygon( + $s_poly, [ $user_lon, $user_lat ] + ) + ) + { + push( @suggested_backends, $backend ); + last; + } + } + } + } + else { + $type = undef; + } + } elsif ( $backend->{hafas} ) { if ( my $s = $self->hafas->get_service( $backend->{name} ) ) { $type = 'HAFAS'; diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm index f61d83d..53d28a9 100755 --- a/lib/Travelynx/Controller/Traveling.pm +++ b/lib/Travelynx/Controller/Traveling.pm @@ -917,6 +917,8 @@ sub station { $timestamp = DateTime->now( time_zone => 'Europe/Berlin' ); } + my $efa_service = $self->param('efa') + // ( $user->{backend_efa} ? $user->{backend_name} : undef ); my $hafas_service = $self->param('hafas') // ( $user->{backend_hafas} ? $user->{backend_name} : undef ); my $promise; @@ -929,6 +931,15 @@ sub station { lookahead => 30, ); } + elsif ($efa_service) { + $promise = $self->efa->get_departures_p( + service => $efa_service, + name => $station, + timestamp => $timestamp, + lookbehind => 10, + lookahead => 30, + ); + } else { $promise = $self->iris->get_departures_p( station => $station, @@ -967,6 +978,16 @@ sub station { related_stations => [], }; } + elsif ($efa_service) { + @results = map { $_->[0] } + sort { $b->[1] <=> $a->[1] } + map { [ $_, $_->datetime->epoch ] } $status->results; + $status = { + station_eva => $status->stop->id, + station_name => $status->stop->full_name, + related_stations => [], + }; + } else { # You can't check into a train which terminates here @@ -1013,12 +1034,14 @@ sub station { eva => $user_status->{cancellation}{dep_eva}, destination_name => $user_status->{cancellation}{arr_name}, + efa => $efa_service, hafas => $hafas_service, ); } else { $connections_p = $self->get_connecting_trains_p( eva => $status->{station_eva}, + efa => $efa_service, hafas => $hafas_service ); } @@ -1031,6 +1054,7 @@ sub station { $self->render( 'departures', user => $user, + efa => $efa_service, hafas => $hafas_service, eva => $status->{station_eva}, datetime => $timestamp, @@ -1050,6 +1074,7 @@ sub station { $self->render( 'departures', user => $user, + efa => $efa_service, hafas => $hafas_service, eva => $status->{station_eva}, datetime => $timestamp, @@ -1068,6 +1093,7 @@ sub station { $self->render( 'departures', user => $user, + efa => $efa_service, hafas => $hafas_service, eva => $status->{station_eva}, datetime => $timestamp, |