Unverified Commit 0478d409 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Stationboard: more consistent station board handler names

parent ec5d03c6

lib/DBInfoscreen.pm

+5 −4
Original line number Diff line number Diff line
@@ -328,14 +328,15 @@ sub startup { 
	  ->to( 'stationboard#station_train_details', format => undef )

	  ->name('train_at_station');

	$r->get( '/z/:train' => [ format => [ 'html', 'json' ] ] )

	  ->to( 'stationboard#train_details', format => undef )->name('train');

	  ->to( 'stationboard#train_details', format => undef )

	  ->name('train');



	$self->defaults( layout => 'app' );



	$r->get('/')->to('stationboard#handle_request');

	$r->get('/multi/*station')->to('stationboard#handle_request');

	$r->get('/')->to('stationboard#handle_board_request');

	$r->get('/multi/*station')->to('stationboard#handle_board_request');

	$r->get( '/*station' => [ format => [ 'html', 'json' ] ] )

	  ->to( 'stationboard#handle_request', format => undef );

	  ->to( 'stationboard#handle_board_request', format => undef );



	$self->types->type( json => 'application/json; charset=utf-8' );

lib/DBInfoscreen/Controller/Map.pm

+0 −1
Original line number Diff line number Diff line
@@ -452,7 +452,6 @@ sub route_efa { 
				ajax_route    => route_to_ajax( @{$ref_route} ),

				ajax_polyline => join( '|',

					map { join( ';', @{$_} ) } @{ $train_pos->{positions} } ),

				,

				origin => {

					name => ( $trip->route )[0]->full_name,

					ts   => ( $trip->route )[0]->dep,

lib/DBInfoscreen/Controller/Stationboard.pm

+6 −5
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ sub get_results_p { 
	}

}



sub handle_request {

sub handle_board_request {

	my ($self) = @_;

	my $station = $self->stash('station');
@@ -558,7 +558,7 @@ sub handle_request { 
		sub {

			my ($status) = @_;

			if ($efa) {

				$self->handle_efa( $station, $status );

				$self->render_board_efa( $station, $status );

				return;

			}

			my $data = {
@@ -585,7 +585,7 @@ sub handle_request { 
				$self->handle_no_results( $station, $data, $hafas );

				return;

			}

			$self->handle_result($data);

			$self->render_board_hafas($data);

		}

	)->catch(

		sub {
@@ -1696,7 +1696,7 @@ sub train_details { 
	)->wait;

}



sub handle_efa {

sub render_board_efa {

	my ( $self, $station_name, $efa ) = @_;

	my $template       = $self->param('mode')         // 'app';

	my $hide_low_delay = $self->param('hidelowdelay') // 0;
@@ -1821,7 +1821,8 @@ sub handle_efa { 
	}

}



sub handle_result {

# For HAFAS and IRIS departure elements

sub render_board_hafas {

	my ( $self, $data ) = @_;



	my @results = @{ $data->{results} };