Stationboard: more consistent station board handler names

3 files changed, 11 insertions, 10 deletions

diff --git a/lib/DBInfoscreen.pm b/lib/DBInfoscreen.pm
index 98e733b..7169efe 100644
--- a/lib/DBInfoscreen.pm
+++ b/lib/DBInfoscreen.pm
@@ -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' );
 
diff --git a/lib/DBInfoscreen/Controller/Map.pm b/lib/DBInfoscreen/Controller/Map.pm
index a96cd1b..9c83a07 100644
--- a/lib/DBInfoscreen/Controller/Map.pm
+++ b/lib/DBInfoscreen/Controller/Map.pm
@@ -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,
diff --git a/lib/DBInfoscreen/Controller/Stationboard.pm b/lib/DBInfoscreen/Controller/Stationboard.pm
index 4b63924..cfd949b 100644
--- a/lib/DBInfoscreen/Controller/Stationboard.pm
+++ b/lib/DBInfoscreen/Controller/Stationboard.pm
@@ -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} };