Unverified Commit 3dd1b3a5 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Stop: Use place / name / full_name rather than just name_suf and name

parent 1496b2a0

bin/efa-m

+7 −7
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ sub format_route { 
				$output .= sprintf(

					"    %5s      %40s %s\n",

					$stop->arr->strftime('%H:%M'),

					$stop->name, $stop->platform,

					$stop->full_name, $stop->platform,

				);

			}

			else {
@@ -180,7 +180,7 @@ sub format_route { 
					"%5s → %5s  %40s %s\n",

					$stop->arr->strftime('%H:%M'),

					$stop->dep->strftime('%H:%M'),

					$stop->name, $stop->platform,

					$stop->full_name, $stop->platform,

				);

			}

		}
@@ -188,19 +188,19 @@ sub format_route { 
			$output .= sprintf(

				"%5s          %40s %s\n",

				$stop->arr->strftime('%H:%M'),

				$stop->name, $stop->platform,

				$stop->full_name, $stop->platform,

			);

		}

		elsif ( defined $stop->dep ) {

			$output .= sprintf(

				"        %5s  %40s %s\n",

				$stop->dep->strftime('%H:%M'),

				$stop->name, $stop->platform,

				$stop->full_name, $stop->platform,

			);

		}

		elsif ( $stop->name ) {

		elsif ( $stop->full_name ) {

			$output .= sprintf( "               %40s %s\n",

				$stop->name, $stop->platform, );

				$stop->full_name, $stop->platform, );

		}

		else {

			$output .= "?\n";
@@ -346,7 +346,7 @@ sub show_results { 


		if ( $edata{route} ) {

			$output_line[3]

			  = join( q{  }, map { $_->name_suf } $d->route_interesting );

			  = join( q{  }, map { $_->name } $d->route_interesting );

		}

		elsif ( $d->occupancy ) {

			if ( $d->occupancy eq 'MANY_SEATS' ) {

lib/Travel/Status/DE/EFA.pm

+6 −5
Original line number Diff line number Diff line
@@ -421,8 +421,9 @@ sub parse_route { 
			Travel::Status::DE::EFA::Stop->new(

				arr       => $arr,

				dep       => $dep,

				name     => $stop->{name},

				name_suf => $stop->{nameWO},

				full_name => $stop->{name},

				place     => $stop->{place},

				name      => $stop->{nameWO},

				platform  => $ref->{platform} || $stop->{platformName} || undef,

			)

		);

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

+7 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ use parent 'Class::Accessor'; 
our $VERSION = '2.02';



Travel::Status::DE::EFA::Stop->mk_ro_accessors(

	qw(arr dep name name_suf platform));

	qw(arr dep place name full_name platform));



sub new {

	my ( $obj, %conf ) = @_;
@@ -71,12 +71,16 @@ first scheduled stop. 
DateTime(3pm) object holding departure date and time. undef if this is the

final scheduled stop.



=item $stop->name

=item $stop->place



City name, for instance "Essen".



=item $stop->full_name



stop name with city prefix ("I<City> I<Stop>", for instance

"Essen RE<uuml>ttenscheider Stern").



=item $stop->name_suf

=item $stop->name



stop name without city prefix, for instance "RE<uuml>ttenscheider Stern".