HAFAS backend: handle passing the same stop more than once

lib/Travelynx.pm

@@ -529,6 +529,7 @@ sub startup {
  my ( $self, %opt ) = @_;
 
  my $station = $opt{station};
+ my $departure = $opt{ts};
  my $train_id = $opt{train_id};
  my $uid = $opt{uid} // $self->current_user->{id};
  my $db = $opt{db} // $self->pg->db;
@@ -539,15 +540,13 @@ sub startup {
  $self->hafas->get_journey_p( trip_id => $train_id )->then(
  sub {
  my ($journey) = @_;
- my $found;
- for my $stop ( $journey->route ) {
- if ( $stop->loc->name eq $station
- or $stop->loc->eva == $station )
- {
- $found = $stop;
- last;
- }
- }
+
+ my $found = List::Util::first {
+ ($_->loc->name eq $station
+ or $_->loc->eva == $station)
+ and Travelynx::Helper::HAFAS::lenient_compare_dts($departure, $_->sched_dep)
+ } $journey->route;
+
  if ( not $found ) {
  $promise->reject(
  "Did not find journey $train_id at $station");
@@ -965,6 +964,7 @@ sub startup {
  my ( $self, %opt ) = @_;
 
  my $station = $opt{station};
+ my $arrival = $opt{ts} // 0;
  my $force = $opt{force};
  my $uid = $opt{uid} // $self->current_user->{id};
  my $db = $opt{db} // $self->pg->db;
@@ -986,7 +986,8 @@ sub startup {
  my $found;
  my $has_arrived;
  for my $stop ( @{ $journey->{route_after} } ) {
- if ( $station eq $stop->[0] or $station eq $stop->[1] ) {
+ if ( ($station eq $stop->[0] or $station eq $stop->[1])
+ and Travelynx::Helper::HAFAS::lenient_compare_dts($arrival, $stop->[2]{sched_arr})) {
  $found = 1;
  $self->in_transit->set_arrival_eva(
  uid => $uid,
@@ -1911,7 +1912,8 @@ sub startup {
  train_id => $traewelling->{trip_id},
  uid => $uid,
  in_transaction => 1,
- db => $db
+ db => $db,
+ ts => $traewelling->{dep_dt}->epoch
  )->then(
  sub {
  $self->log->debug("... handled origin");
@@ -1920,7 +1922,8 @@ sub startup {
  train_id => $traewelling->{trip_id},
  uid => $uid,
  in_transaction => 1,
- db => $db
+ db => $db,
+ ts => $traewelling->{arr_dt}->epoch
  );
  }
  )->then(

lib/Travelynx/Command/work.pm

@@ -46,10 +46,10 @@ sub run {
  my $found_dep;
  my $found_arr;
  for my $stop ( $journey->route ) {
- if ( $stop->loc->eva == $dep ) {
+ if ( $stop->loc->eva == $dep && Travelynx::Helper::HAFAS::lenient_compare_dts($stop->sched_dep, $entry->{sched_dep_ts})) {
  $found_dep = $stop;
  }
- if ( $arr and $stop->loc->eva == $arr ) {
+ if ( $arr and $stop->loc->eva == $arr && Travelynx::Helper::HAFAS::lenient_compare_dts($stop->sched_arr, $entry->{sched_arr_ts})) {
  $found_arr = $stop;
  last;
  }
@@ -103,7 +103,8 @@ sub run {
  force => 2,
  dep_eva => $dep,
  arr_eva => $arr,
- uid => $uid
+ uid => $uid,
+ ts => $entry->{sched_arr_ts}
  )->wait;
  }
  next;

lib/Travelynx/Controller/Traveling.pm

@@ -313,6 +313,7 @@ sub get_connecting_trains_p {
  and $stop->arr )
  {
  $iris_train->[2] = $stop->arr;
+ $iris_train->[4] = $stop->arr;
  if ( $iris_train->[0]->departure_delay
  and not $stop->arr_delay )
  {
@@ -354,7 +355,7 @@ sub get_connecting_trains_p {
  if ( $departure->epoch >= $exclude_before ) {
  $via_count{ $dest->{name} }++;
  push( @hafas_trains,
- [ $hafas_train, $dest, $arrival ] );
+ [ $hafas_train, $dest, $arrival, $stop->arr ] );
  }
  }
  }
@@ -674,7 +675,7 @@ sub travel_action {
  and $status->{arr_eva}
  and $status->{arrival_countdown} <= 0 )
  {
- $promise = $self->checkout_p( station => $status->{arr_eva} );
+ $promise = $self->checkout_p( station => $status->{arr_eva}, ts => $params->{ts});
  }
  else {
  $promise = Mojo::Promise->resolve;
@@ -685,7 +686,8 @@ sub travel_action {
  sub {
  return $self->checkin_p(
  station => $params->{station},
- train_id => $params->{train}
+ train_id => $params->{train},
+ ts => $params->{ts}
  );
  }
  )->then(
@@ -705,7 +707,8 @@ sub travel_action {
  # them when selecting the destination manually.
  return $self->checkout_p(
  station => $destination,
- force => 0
+ force => 0,
+ ts => $params->{dest_ts}
  );
  }
  )->then(
@@ -744,7 +747,8 @@ sub travel_action {
  my $status = $self->get_user_status;
  $self->checkout_p(
  station => $params->{station},
- force => $params->{force}
+ force => $params->{force},
+ ts => $params->{ts}
  )->then(
  sub {
  my ( $still_checked_in, $error ) = @_;
@@ -819,7 +823,8 @@ sub travel_action {
  $self->render_later;
  $self->checkin_p(
  station => $params->{station},
- train_id => $params->{train}
+ train_id => $params->{train},
+ ts => $params->{ts}
  )->then(
  sub {
  $self->render(
@@ -845,7 +850,8 @@ sub travel_action {
  $self->render_later;
  $self->checkout_p(
  station => $params->{station},
- force => 1
+ force => 1,
+ ts => $params->{ts}
  )->then(
  sub {
  my ( undef, $error ) = @_;

lib/Travelynx/Helper/HAFAS.pm

@@ -20,6 +20,32 @@ sub _epoch {
  return $dt ? $dt->epoch : 0;
 }
 
+# for making sure we have the right stop selected if it appears multiple times
+# on the route we need to compare the arrival/departure times.
+# depending on context they might be undef, stored as DateTime or just a plain
+# number. this helper plasters over these numerous edge cases and does a
+# fuzzy match on the values provided, also returning true if any values are
+# undef or 0.
+sub lenient_compare_dts {
+ my ( $a, $b ) = @_;
+
+ if (not defined($a) or not defined($b)) {
+ return 1;
+ }
+
+ if (ref($a) eq 'DateTime') {
+ $a = $a->epoch;
+ }
+ if (ref($b) eq 'DateTime') {
+ $b = $b->epoch;
+ }
+ if ($a == 0 or $b == 0) {
+ return 1;
+ } else {
+ return $a == $b;
+ }
+}
+
 sub new {
  my ( $class, %opt ) = @_;
 

lib/Travelynx/Model/InTransit.pm

@@ -11,6 +11,8 @@ use 5.020;
 use DateTime;
 use JSON;
 
+use Travelynx::Helper::HAFAS qw(lenient_compare_dts);
+
 my %visibility_itoa = (
  100 => 'public',
  80 => 'travelynx',
@@ -207,7 +209,8 @@ sub postprocess {
  push( @route_after, $station );
  }
  if ( $ret->{dep_name}
- and $station->[0] eq $ret->{dep_name} )
+ and $station->[0] eq $ret->{dep_name}
+ and Travelynx::Helper::HAFAS::lenient_compare_dts($station->[2]{sched_dep}, $ret->{sched_dep_ts}))
  {
  $is_after = 1;
  if ( @{$station} > 1 and not $dep_info ) {

lib/Travelynx/Model/Journeys.pm

@@ -15,6 +15,8 @@ use utf8;
 use DateTime;
 use JSON;
 
+use Travelynx::Helper::HAFAS qw(lenient_compare_dts);
+
 my %visibility_itoa = (
  100 => 'public',
  80 => 'travelynx',
@@ -1066,9 +1068,11 @@ sub get_travel_distance {
  my $from = $journey->{from_name};
  my $from_eva = $journey->{from_eva};
  my $from_latlon = $journey->{from_latlon};
+ my $departure = $journey->{sched_dep_ts};
  my $to = $journey->{to_name};
  my $to_eva = $journey->{to_eva};
  my $to_latlon = $journey->{to_latlon};
+ my $arrival = $journey->{sched_arr_ts};
  my $route_ref = $journey->{route};
  my $polyline_ref = $journey->{polyline};
 
@@ -1088,8 +1092,16 @@ sub get_travel_distance {
  my $skipped = 0;
  my $geo = GIS::Distance->new();
  my @stations = map { $_->[0] } @{$route_ref};
- my @route = after_incl { $_ eq $from } @stations;
- @route = before_incl { $_ eq $to } @route;
+ my @route = map { $_->[0] }
+ before_incl {
+ $_->[0] eq $to and
+ Travelynx::Helper::HAFAS::lenient_compare_dts($arrival, $_->[2]{sched_arr})
+ }
+ after_incl {
+ $_->[0] eq $from and
+ Travelynx::Helper::HAFAS::lenient_compare_dts($departure, $_->[2]{sched_dep})
+ }
+ @{$route_ref};
 
  if ( @route < 2 ) {
 

public/static/js/travelynx-actions.js

@@ -186,6 +186,7 @@ function tvly_reg_handlers() {
  train: link.data('train'),
  dest: link.data('dest'),
  ts: link.data('ts'),
+ dest_ts: link.data('dest-ts')
  };
  tvly_run(link, req);
  });
@@ -195,6 +196,7 @@ function tvly_reg_handlers() {
  action: 'checkout',
  station: link.data('station'),
  force: link.data('force'),
+ ts: link.data('ts'),
  };
  tvly_run(link, req, function() {
  if (!link.data('force')) {
@@ -235,6 +237,7 @@ function tvly_reg_handlers() {
  action: 'cancelled_to',
  station: link.data('station'),
  force: true,
+ ts: link.data('ts'),
  };
  tvly_run(link, req);
  });