add new ::Stop class for stop data

4 files changed, 136 insertions, 13 deletions

diff --git a/Changelog b/Changelog
index 295ab90..a25bb8f 100644
--- a/Changelog
+++ b/Changelog
@@ -6,8 +6,8 @@ git HEAD
     * EFA->new: Add full_routes config option
     * EFA: Add identified_data accessor
     * Result: Add route_pre, route_post and route_interesting accessors
-    * efa-m: Add -f / --full-route option
     * efa-m: Add -v / --via option
+    * Add Travel::Routing::DE::EFA::Stop module
 
 Travel::Status::DE::VRR 1.09 - Thu Apr 30 2015
 
diff --git a/bin/efa-m b/bin/efa-m
index 4dc1387..5bea941 100755
--- a/bin/efa-m
+++ b/bin/efa-m
@@ -106,23 +106,23 @@ sub format_route {
 			say "BUG";
 			next;
 		}
-		if ( not defined $stop->{arr_time} ) {
+		if ( not defined $stop->arr_time ) {
 			$output .= sprintf( "        %5s  %40s %s\n",
-				$stop->{dep_time}, $stop->{stop}, $stop->{platform}, );
+				$stop->dep_time, $stop->name, $stop->platform, );
 		}
-		elsif ( not defined $stop->{dep_time} ) {
+		elsif ( not defined $stop->dep_time ) {
 			$output .= sprintf( "%5s          %40s %s\n",
-				$stop->{arr_time}, $stop->{stop}, $stop->{platform}, );
+				$stop->arr_time, $stop->name, $stop->platform, );
 		}
-		elsif ( $stop->{arr_time} eq $stop->{dep_time} ) {
+		elsif ( $stop->arr_time eq $stop->dep_time ) {
 			$output .= sprintf( "    %5s      %40s %s\n",
-				$stop->{dep_time}, $stop->{stop}, $stop->{platform}, );
+				$stop->dep_time, $stop->name, $stop->platform, );
 		}
 		else {
 			$output .= sprintf(
 				"%5s → %5s  %40s %s\n",
-				$stop->{arr_time}, $stop->{dep_time},
-				$stop->{stop},     $stop->{platform},
+				$stop->arr_time, $stop->dep_time,
+				$stop->name,     $stop->platform,
 			);
 		}
 	}
diff --git a/lib/Travel/Status/DE/EFA.pm b/lib/Travel/Status/DE/EFA.pm
index 3ac28ce..ecf2b79 100644
--- a/lib/Travel/Status/DE/EFA.pm
+++ b/lib/Travel/Status/DE/EFA.pm
@@ -12,6 +12,7 @@ use Carp qw(confess cluck);
 use Encode qw(encode decode);
 use Travel::Status::DE::EFA::Line;
 use Travel::Status::DE::EFA::Result;
+use Travel::Status::DE::EFA::Stop;
 use LWP::UserAgent;
 use XML::LibXML;
 
@@ -334,15 +335,15 @@ sub parse_route {
 		# cases.
 		push(
 			@ret,
-			{
+			Travel::Status::DE::EFA::Stop->new(
 				arr_date => sprintf_date( $dates[0] ),
 				arr_time => sprintf_time( $times[0] ),
 				dep_date => sprintf_date( $dates[-1] ),
 				dep_time => sprintf_time( $times[-1] ),
-				stop     => decode( 'UTF-8', $e->getAttribute('name') ),
-				stop_suf => decode( 'UTF-8', $e->getAttribute('nameWO') ),
+				name     => decode( 'UTF-8', $e->getAttribute('name') ),
+				name_suf => decode( 'UTF-8', $e->getAttribute('nameWO') ),
 				platform => $e->getAttribute('platformName'),
-			}
+			)
 		);
 	}
 
diff --git a/lib/Travel/Status/DE/EFA/Stop.pm b/lib/Travel/Status/DE/EFA/Stop.pm
new file mode 100644
index 0000000..a4b3b61
--- /dev/null
+++ b/lib/Travel/Status/DE/EFA/Stop.pm
@@ -0,0 +1,122 @@
+package Travel::Status::DE::EFA::Stop;
+
+use strict;
+use warnings;
+use 5.010;
+
+no if $] >= 5.018, warnings => 'experimental::smartmatch';
+
+use parent 'Class::Accessor';
+
+our $VERSION = '1.09';
+
+Travel::Status::DE::EFA::Stop->mk_ro_accessors(
+	qw(arr_date arr_time dep_date dep_time name name_suf platform));
+
+sub new {
+	my ( $obj, %conf ) = @_;
+
+	my $ref = \%conf;
+
+	return bless( $ref, $obj );
+}
+
+sub TO_JSON {
+	my ($self) = @_;
+
+	return { %{$self} };
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Travel::Status::DE::EFA::Stop - Information about a stop (station) contained
+in a Travel::Status::DE::EFA::Result's route
+
+=head1 SYNOPSIS
+
+    for my $stop ($departure->route_post) {
+        printf(
+            "%s -> %s : %40s %s\n",
+            $stop->arr_time // q{     }, $stop->dep_time // q{     },
+            $stop->name, $stop->platform
+        );
+    }
+
+=head1 VERSION
+
+version 1.09
+
+=head1 DESCRIPTION
+
+Travel::Status::DE::EFA::stop describes a TODO.
+
+=head1 METHODS
+
+=head2 ACCESSORS
+
+TODO
+
+=over
+
+=item $stop->arr_date
+
+=item $stop->arr_time
+
+=item $stop->dep_date
+
+=item $stop->dep_time
+
+=item $stop->name
+
+=item $stop->name_suf
+
+=item $stop->platform
+
+=back
+
+=head2 INTERNAL
+
+=over
+
+=item $stop = Travel::Status::DE::EFA::Stop->new(I<%data>)
+
+Returns a new Travel::Status::DE::EFA::Stop object.  You should not need to
+call this.
+
+=item $stop->TO_JSON
+
+Allows the object data to be serialized to JSON.
+
+=back
+
+=head1 DIAGNOSTICS
+
+None.
+
+=head1 DEPENDENCIES
+
+=over
+
+=item Class::Accessor(3pm)
+
+=back
+
+=head1 BUGS AND LIMITATIONS
+
+None known.
+
+=head1 SEE ALSO
+
+Travel::Status::DE::EFA(3pm).
+
+=head1 AUTHOR
+
+Copyright (C) 2015 by Daniel Friesel E<lt>derf@finalrewind.orgE<gt>
+
+=head1 LICENSE
+
+This module is licensed under the same terms as Perl itself.