Unverified Commit 6a1bf5e3 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Trip details: The endpoint has a time parameter. Using it is a good idea. 

This fixes trip detail requests occasionally returning data for yesterday,
and should also fix trip detail requests failing entirely.

Note that this breaks compatibility with trip IDs obtained from earlier efa-m
versions.
parent b965f9f8

bin/efa-m

+5 −2
Original line number Diff line number Diff line
@@ -99,12 +99,15 @@ if ($use_cache) { 
my ( $place, $input, $coord, $stopseq, $stopfinder );



if ( @ARGV == 1 ) {

	if ( $ARGV[0] =~ m{ ^ ([^@]*) @ ([^@]*) [(] ([^)]*) [)] (.*)  $ }x ) {

	if ( $ARGV[0]

		=~ m{ ^ ([^@]*) @ ([^@]*) [(] ([^T]*) T ([^)]*) [)] (.*)  $ }x )

	{

		$stopseq = {

			stateless => $1,

			stop_id   => $2,

			date      => $3,

			key       => $4

			time      => $4,

			key       => $5

		};

	}

	elsif ( $ARGV[0] =~ m{ ^ [?] (?<name> .*) $ }x ) {

lib/Travel/Status/DE/EFA.pm

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ sub new { 
			stop              => $opt{stopseq}{stop_id},

			tripCode          => $opt{stopseq}{key},

			date              => $opt{stopseq}{date},

			time              => $opt{stopseq}{time},

			coordOutputFormat => 'WGS84[DD.DDDDD]',

			outputFormat      => 'rapidJson',

			useRealtime       => '1',

lib/Travel/Status/DE/EFA/Departure.pm

+4 −3
Original line number Diff line number Diff line
@@ -177,10 +177,11 @@ sub id { 


	return $self->{id} = sprintf( '%s@%d(%s)%d',

		$self->stateless =~ s{ }{}gr,

		scalar $self->route_pre

		? ( $self->route_pre )[0]->id_num

		scalar $self->route_pre ? ( $self->route_pre )[0]->id_num

		: $self->stop_id_num,

		$self->sched_datetime->strftime('%Y%m%d'),

		( scalar $self->route_pre and ( $self->route_pre )[0]->sched_dep )

		? ( $self->route_pre )[0]->sched_dep->strftime('%Y%m%dT%H:%M')

		: $self->sched_datetime->strftime('%Y%m%dT%H:%M'),

		$self->key );

}