From f6799c2bf46e45b240567b7376526e4b529ea2b3 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Mon, 29 Jun 2015 17:17:11 +0200
Subject: efa-m: use scheduled times for departure list and update
 documentation

---
 Changelog |  2 ++
 bin/efa-m | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Changelog b/Changelog
index 2b86bc3..200b1ff 100644
--- a/Changelog
+++ b/Changelog
@@ -3,6 +3,8 @@ git HEAD
     * efa-m: Add -V / --track-via option
     * efa-m: Add -O / --output option with outputtypes
       route_after, route_before, fullroute and route
+    * efa-m: Always output schedule data when absolute times are requested.
+      As before, delays are indicated by a +xyz mark next to the time
 
 Travel::Status::DE::VRR 1.10 - Thu Jun 25 2015
 
diff --git a/bin/efa-m b/bin/efa-m
index e7e35a8..7c17472 100755
--- a/bin/efa-m
+++ b/bin/efa-m
@@ -195,7 +195,7 @@ sub show_results {
 		my @output_line;
 		my $platform = $d->platform;
 		my $dtime    = (
-			$relative_times ? sprintf( '%2d min', $d->countdown ) : $d->time );
+			$relative_times ? sprintf( '%2d min', $d->countdown ) : $d->sched_time );
 
 		if ( $d->platform_db ) {
 			$platform .= ' (DB)';
@@ -227,7 +227,12 @@ sub show_results {
 			$dtime .= ' → ' . $via->arr_time;
 		}
 		if ( $d->delay ) {
-			$dtime .= ' (+' . $d->delay . ')';
+			if ($relative_times) {
+				$dtime .= ' (+' . $d->delay . ')';
+			}
+			else {
+				$dtime .= ' +' . $d->delay;
+			}
 		}
 
 		@output_line
@@ -289,8 +294,9 @@ version 1.10
 
 =head1 DESCRIPTION
 
-B<efa-m> lists upcoming tram, bus and train departures at the location I<name>
-in I<city>.
+B<efa-m> lists scheduled tram, bus and train departures at the location I<name>
+in I<city>.  Realtime data (i.e. delays) is included if available, it's
+visible in the output as a "+x" remark (meaning a delay of x minutes).
 
 By default, I<name> refers to a stop, this can be changed by specifying
 I<type>.  Supported types are B<address> and B<poi> (point of interest).
@@ -361,7 +367,9 @@ repeated).  Note that the C<< Bstg. >> / C<< Gleis >> prefix must be omitted.
 
 =item B<-r>, B<--relative>
 
-Use relative departure times.
+Show relative departure times in minutes (i.e. the time difference between
+the departure and the time of the request).  In this case, realtime data is
+already included.
 
 =item B<-t>, B<--time> I<hh:mm>
 
-- 
cgit v1.2.3