diff --git a/bin/efa b/bin/efa index d28f32c6ff332a7a392113ee64c2acfc9fdfe088..c69d8ab2e035719d1e8be12167f2a86198087709 100755 --- a/bin/efa +++ b/bin/efa @@ -145,13 +145,13 @@ sub display_connection { $c->delay, $c->departure_stime, $c->arrival_stime ); } - for my $extra ( $c->sched_info ) { + for my $extra ( $c->regular_notes ) { if ( not( length $ignore_info and $extra =~ /$ignore_info/i ) ) { say "# $extra"; } } - for my $notice ( $c->current_info ) { + for my $notice ( $c->current_notes ) { if ( $notice->{subtitle} ne $notice->{subject} ) { printf( "# %s - %s\n", $notice->{subtitle}, $notice->{subject} ); } diff --git a/lib/Travel/Routing/DE/EFA.pm b/lib/Travel/Routing/DE/EFA.pm index f423cf876be56d44a51b6ad4ec29536fc39205d5..c21a34910db0151aa0ac83165aed164ec118c833 100644 --- a/lib/Travel/Routing/DE/EFA.pm +++ b/lib/Travel/Routing/DE/EFA.pm @@ -690,9 +690,9 @@ sub parse_xml_part { ); } - $hash->{sched_info} + $hash->{regular_notes} = [ map { decode( 'UTF-8', $_->textContent ) } @e_sinfo ]; - $hash->{current_info} = [ map { $self->parse_cur_info($_) } @e_cinfo ]; + $hash->{current_notes} = [ map { $self->parse_cur_info($_) } @e_cinfo ]; push( @route_parts, $hash ); } diff --git a/lib/Travel/Routing/DE/EFA/Route/Part.pm b/lib/Travel/Routing/DE/EFA/Route/Part.pm index 3bf5d60c56b50778bec4efd6ed4d9532ca6e29a0..ab94b129cc9d8411d07efb51d30497d52283672a 100644 --- a/lib/Travel/Routing/DE/EFA/Route/Part.pm +++ b/lib/Travel/Routing/DE/EFA/Route/Part.pm @@ -86,23 +86,23 @@ sub footpath_parts { sub extra { my ($self) = @_; - return @{ $self->{sched_info} // [] }; + return @{ $self->{regular_notes} // [] }; } -sub sched_info { +sub regular_notes { my ($self) = @_; - if ( $self->{sched_info} ) { - return @{ $self->{sched_info} }; + if ( $self->{regular_notes} ) { + return @{ $self->{regular_notes} }; } return; } -sub current_info { +sub current_notes { my ($self) = @_; - if ( $self->{current_info} ) { - return @{ $self->{current_info} }; + if ( $self->{current_notes} ) { + return @{ $self->{current_notes} }; } return; }