marudor interface v2 (detailed arr/dep information) (d7b77a9d) · Commits · derf / db-infoscreen

index.pl

+88 −25

Original line number	Diff line number	Diff line
		@@ -448,6 +448,7 @@ sub handle_request {
		my @json_route = $self->json_route_diff( [ $result->route ],
		[ $result->sched_route ] );

		if ( $apiver == 1 ) {
		push(
		@departures,
		{
		@@ -458,12 +459,20 @@ sub handle_request {
		: undef,
		messages => {
		delay => [
		map { { timestamp => $_->[0], text => $_->[1] } }
		$result->delay_messages
		map {
		{
		timestamp => $_->[0],
		text => $_->[1]
		}
		} $result->delay_messages
		],
		qos => [
		map { { timestamp => $_->[0], text => $_->[1] } }
		$result->qos_messages
		map {
		{
		timestamp => $_->[0],
		text => $_->[1]
		}
		} $result->qos_messages
		],
		},
		platform => $result->platform,
		@@ -475,6 +484,60 @@ sub handle_request {
		}
		);
		}
		else { # apiver == 2
		my ( $delay_arr, $delay_dep, $sched_arr, $sched_dep );
		if ( $result->arrival ) {
		$delay_arr = $result->arrival->subtract_datetime(
		$result->sched_arrival )->in_units('minutes');
		}
		if ( $result->departure ) {
		$delay_dep = $result->departure->subtract_datetime(
		$result->sched_departure )->in_units('minutes');
		}
		if ( $result->sched_arrival ) {
		$sched_arr = $result->sched_arrival->strftime('%H:%M');
		}
		if ( $result->sched_departure ) {
		$sched_dep = $result->sched_departure->strftime('%H:%M');
		}
		push(
		@departures,
		{
		delayArrival => $delay_arr,
		delayDeparture => $delay_dep,
		destination => $result->destination,
		isCancelled => $result->can('is_cancelled')
		? $result->is_cancelled
		: undef,
		messages => {
		delay => [
		map {
		{
		timestamp => $_->[0],
		text => $_->[1]
		}
		} $result->delay_messages
		],
		qos => [
		map {
		{
		timestamp => $_->[0],
		text => $_->[1]
		}
		} $result->qos_messages
		],
		},
		platform => $result->platform,
		route => \@json_route,
		scheduledPlatform => $result->sched_platform,
		scheduledArrival => $sched_arr,
		scheduledDeparture => $sched_dep,
		train => $result->train,
		via => [ $result->route_interesting(3) ],
		}
		);
		}
		}
		elsif ( $backend eq 'iris' ) {
		push(
		@departures,

Admin message