summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2017-07-02 18:38:32 +0200
committerDaniel Friesel <derf@finalrewind.org>2017-07-02 18:38:32 +0200
commit242a6d2c472f0ff747db7665294fac19eaa2408e (patch)
tree8d110c5ac87aca67295b6544293c068d1c27ee81
parent4aee2fb6dc0755371eaa23459e514ac76f6a9576 (diff)
parentf09d59986998f2210314e38a1ad72d77fcfac067 (diff)
Merge branch 'master' of git.finalrewind.org:var/git_root/Travel-Status-DE-IRIS
-rwxr-xr-xbin/db-iris2
-rw-r--r--lib/Travel/Status/DE/IRIS.pm20
-rw-r--r--t/20-iris-class.t4
-rw-r--r--t/31-result-basics.t6
4 files changed, 22 insertions, 10 deletions
diff --git a/bin/db-iris b/bin/db-iris
index d47167b..f83a52a 100755
--- a/bin/db-iris
+++ b/bin/db-iris
@@ -20,7 +20,7 @@ use Travel::Status::DE::IRIS::Stations;
my ( $date, $time );
my $datetime = DateTime->now( time_zone => 'Europe/Berlin' );
my $developer_mode = 0;
-my $lookahead = 3 * 60;
+my $lookahead = 2 * 60;
my $realtime = 0;
my $with_related = 1;
my ( $filter_via, $track_via, $status_via );
diff --git a/lib/Travel/Status/DE/IRIS.pm b/lib/Travel/Status/DE/IRIS.pm
index aab0788..43993b0 100644
--- a/lib/Travel/Status/DE/IRIS.pm
+++ b/lib/Travel/Status/DE/IRIS.pm
@@ -31,7 +31,7 @@ sub new {
developer_mode => $opt{developer_mode},
iris_base => $opt{iris_base}
// 'http://iris.noncd.db.de/iris-tts/timetable',
- lookahead => $opt{lookahead} // ( 3 * 60 ),
+ lookahead => $opt{lookahead} // ( 2 * 60 ),
lookbehind => $opt{lookbehind} // ( 0 * 60 ),
main_cache => $opt{main_cache},
rt_cache => $opt{realtime_cache},
@@ -88,13 +88,25 @@ sub new {
return $self;
}
+ my $lookahead_steps = int( $self->{lookahead} / 60 );
+ if ( ( 60 - $self->{datetime}->minute ) < ( $self->{lookahead} % 60 ) ) {
+ say "lookahead: ${lookahead_steps}++";
+ $lookahead_steps++;
+ }
+ my $lookbehind_steps = int( $self->{lookbehind} / 60 );
+ if ( $self->{datetime}->minute < ( $self->{lookbehind} % 60 ) ) {
+ say "lookbehind: ${lookbehind_steps}++";
+ $lookbehind_steps++;
+ }
+
my $dt_req = $self->{datetime}->clone;
- for ( 1 .. int( $self->{lookahead} / 60 ) ) {
- $self->get_timetable( $self->{station}{uic}, $dt_req );
+ $self->get_timetable( $self->{station}{uic}, $dt_req );
+ for ( 1 .. $lookahead_steps ) {
$dt_req->add( hours => 1 );
+ $self->get_timetable( $self->{station}{uic}, $dt_req );
}
$dt_req = $self->{datetime}->clone;
- for ( 1 .. int( $self->{lookbehind} / 60 ) ) {
+ for ( 1 .. $lookbehind_steps ) {
$dt_req->subtract( hours => 1 );
$self->get_timetable( $self->{station}{uic}, $dt_req );
}
diff --git a/t/20-iris-class.t b/t/20-iris-class.t
index 8ec50ef..a861909 100644
--- a/t/20-iris-class.t
+++ b/t/20-iris-class.t
@@ -4,7 +4,7 @@ use warnings;
use 5.014;
use DateTime;
-use Test::More tests => 274;
+use Test::More tests => 266;
BEGIN {
use_ok('Travel::Status::DE::IRIS');
@@ -22,7 +22,7 @@ my $status = Travel::Status::DE::IRIS->new(
minute => 1,
time_zone => 'Europe/Berlin',
),
- lookahead => 3 * 60 + 59,
+ lookahead => 3 * 60,
);
isa_ok( $status, 'Travel::Status::DE::IRIS' );
diff --git a/t/31-result-basics.t b/t/31-result-basics.t
index ac2b23d..d313d4f 100644
--- a/t/31-result-basics.t
+++ b/t/31-result-basics.t
@@ -5,7 +5,7 @@ use 5.014;
use utf8;
use DateTime;
-use Test::More tests => 436;
+use Test::More tests => 424;
use Test::Fatal;
use Travel::Status::DE::IRIS;
@@ -21,12 +21,12 @@ my $status = Travel::Status::DE::IRIS->new(
minute => 1,
time_zone => 'Europe/Berlin'
),
- lookahead => 3 * 60 + 59,
+ lookahead => 3 * 60,
);
my @results = $status->results;
-is(@results, 135, 'got 135 results');
+is(@results, 131, 'got 131 results');
my $ice645 = $results[0];
my $s1 = $results[1];