Add JSON output to train details (/z/:train)

2 files changed, 39 insertions, 20 deletions

diff --git a/lib/DBInfoscreen.pm b/lib/DBInfoscreen.pm
index c33a703..dc3b403 100644
--- a/lib/DBInfoscreen.pm
+++ b/lib/DBInfoscreen.pm
@@ -281,7 +281,8 @@ sub startup {
 	$r->get('/map/:tripid/:lineno')->to('map#route');
 	$r->get( '/z/:train/*station' => 'train_at_station' )
 	  ->to('stationboard#station_train_details');
-	$r->get( '/z/:train' => 'train' )->to('stationboard#train_details');
+	$r->get( '/z/:train' => [ format => [ 'html', 'json' ] ] )
+	  ->to( 'stationboard#train_details', format => undef )->name('train');
 
 	$self->defaults( layout => 'app' );
 
diff --git a/lib/DBInfoscreen/Controller/Stationboard.pm b/lib/DBInfoscreen/Controller/Stationboard.pm
index dde0d0e..838c63d 100644
--- a/lib/DBInfoscreen/Controller/Stationboard.pm
+++ b/lib/DBInfoscreen/Controller/Stationboard.pm
@@ -1303,34 +1303,52 @@ sub train_details {
 				$res->{details} = [@him_details];
 			}
 
-			$self->render(
-				$self->param('ajax') ? '_train_details' : 'train_details',
-				description => sprintf(
-					'%s %s%s%s nach %s',
-					$res->{train_type},
-					$res->{train_line} // $res->{train_no},
-					$res->{origin} ? ' von ' : q{},
-					$res->{origin}      // q{},
-					$res->{destination} // 'unbekannt'
-				),
-				departure => $res,
-				linetype  => $linetype,
-				dt_now    => DateTime->now( time_zone => 'Europe/Berlin' ),
+			$self->respond_to(
+				json => {
+					json => {
+						journey => $journey,
+					},
+				},
+				any => {
+					template => $self->param('ajax')
+					? '_train_details'
+					: 'train_details',
+					description => sprintf(
+						'%s %s%s%s nach %s',
+						$res->{train_type},
+						$res->{train_line} // $res->{train_no},
+						$res->{origin} ? ' von ' : q{},
+						$res->{origin}      // q{},
+						$res->{destination} // 'unbekannt'
+					),
+					departure => $res,
+					linetype  => $linetype,
+					dt_now    => DateTime->now( time_zone => 'Europe/Berlin' ),
+				},
 			);
 		}
 	)->catch(
 		sub {
 			my ($e) = @_;
 			if ($e) {
-				$self->render(
-					'exception',
-					message   => $e,
-					exception => undef,
-					snapshot  => {}
+				$self->respond_to(
+					json => {
+						json => {
+							error => $e,
+						},
+						status => 500,
+					},
+					any => {
+						template  => 'exception',
+						message   => $e,
+						exception => undef,
+						snapshot  => {},
+						status    => 500,
+					},
 				);
 			}
 			else {
-				$self->render('not_found');
+				$self->render( 'not_found', status => 404 );
 			}
 		}
 	)->wait;