diff options
Diffstat (limited to 'lib/Travelynx/Model')
-rw-r--r-- | lib/Travelynx/Model/InTransit.pm | 34 | ||||
-rwxr-xr-x | lib/Travelynx/Model/Journeys.pm | 29 | ||||
-rw-r--r-- | lib/Travelynx/Model/Stations.pm | 12 | ||||
-rw-r--r-- | lib/Travelynx/Model/Users.pm | 6 |
4 files changed, 45 insertions, 36 deletions
diff --git a/lib/Travelynx/Model/InTransit.pm b/lib/Travelynx/Model/InTransit.pm index 0e3fdc6..cc943b3 100644 --- a/lib/Travelynx/Model/InTransit.pm +++ b/lib/Travelynx/Model/InTransit.pm @@ -293,16 +293,20 @@ sub add { @route, [ $journey_stopover->stop->name, - $journey_stopover->stop->{eva} // die('eva not set for stopover'), + $journey_stopover->stop->{eva} + // die('eva not set for stopover'), { - sched_arr => _epoch( $journey_stopover->scheduled_arrival ), - sched_dep => _epoch( $journey_stopover->scheduled_departure ), - rt_arr => _epoch( $journey_stopover->realtime_arrival ), - rt_dep => _epoch( $journey_stopover->realtime_departure ), + sched_arr => + _epoch( $journey_stopover->scheduled_arrival ), + sched_dep => + _epoch( $journey_stopover->scheduled_departure ), + rt_arr => _epoch( $journey_stopover->realtime_arrival ), + rt_dep => + _epoch( $journey_stopover->realtime_departure ), arr_delay => $journey_stopover->arrival_delay, dep_delay => $journey_stopover->departure_delay, - lat => $journey_stopover->stop->lat, - lon => $journey_stopover->stop->lon, + lat => $journey_stopover->stop->lat, + lon => $journey_stopover->stop->lon, } ] ); @@ -384,7 +388,7 @@ sub postprocess { # Note that the departure stop may be present more than once in @route, # e.g. when traveling along ring lines such as S41 / S42 in Berlin. if ( - $ret->{dep_name} + $ret->{dep_name} and $station->[0] eq $ret->{dep_name} and not($station->[2]{sched_dep} and $station->[2]{sched_dep} < $ret->{sched_dep_ts} ) @@ -1149,16 +1153,18 @@ sub update_arrival_motis { @route, [ $journey_stopover->stop->name, - $journey_stopover->stop->{eva} // die('eva not set for stopover'), + $journey_stopover->stop->{eva} + // die('eva not set for stopover'), { sched_arr => _epoch( $journey_stopover->scheduled_arrival ), - sched_dep => _epoch( $journey_stopover->scheduled_departure ), - rt_arr => _epoch( $journey_stopover->realtime_arrival ), - rt_dep => _epoch( $journey_stopover->realtime_departure ), + sched_dep => + _epoch( $journey_stopover->scheduled_departure ), + rt_arr => _epoch( $journey_stopover->realtime_arrival ), + rt_dep => _epoch( $journey_stopover->realtime_departure ), arr_delay => $journey_stopover->arrival_delay, dep_delay => $journey_stopover->departure_delay, - lat => $journey_stopover->stop->lat, - lon => $journey_stopover->stop->lon, + lat => $journey_stopover->stop->lat, + lon => $journey_stopover->stop->lon, } ] ); diff --git a/lib/Travelynx/Model/Journeys.pm b/lib/Travelynx/Model/Journeys.pm index fff59f9..8efbab2 100755 --- a/lib/Travelynx/Model/Journeys.pm +++ b/lib/Travelynx/Model/Journeys.pm @@ -872,8 +872,10 @@ sub get_latest_checkout_stations { my $res = $db->select( 'journeys_str', [ - 'arr_name', 'arr_eva', 'arr_external_id', 'train_id', - 'backend_id', 'backend_name', 'is_dbris', 'is_hafas', + 'arr_name', 'arr_eva', + 'arr_external_id', 'train_id', + 'backend_id', 'backend_name', + 'is_dbris', 'is_hafas', 'is_motis' ], { @@ -898,11 +900,12 @@ sub get_latest_checkout_stations { { name => $row->{arr_name}, eva => $row->{arr_eva}, - external_id_or_eva => $row->{arr_external_id} // $row->{arr_eva}, - dbris => $row->{is_dbris} ? $row->{backend_name} : 0, - hafas => $row->{is_hafas} ? $row->{backend_name} : 0, - motis => $row->{is_motis} ? $row->{backend_name} : 0, - backend_id => $row->{backend_id}, + external_id_or_eva => $row->{arr_external_id} + // $row->{arr_eva}, + dbris => $row->{is_dbris} ? $row->{backend_name} : 0, + hafas => $row->{is_hafas} ? $row->{backend_name} : 0, + motis => $row->{is_motis} ? $row->{backend_name} : 0, + backend_id => $row->{backend_id}, } ); } @@ -1396,7 +1399,7 @@ sub compute_review { if ( not $most_undelay or $speedup > ( - $most_undelay->{sched_duration} + $most_undelay->{sched_duration} - $most_undelay->{rt_duration} ) ) @@ -1669,7 +1672,10 @@ sub compute_stats { @inconsistencies, { conflict => { - train => ( $journey->{is_motis} ? '' : $journey->{type} ) . ' ' + train => ( + $journey->{is_motis} ? '' : $journey->{type} + ) + . ' ' . ( $journey->{line} // $journey->{no} ), arr => epoch_to_dt( $journey->{rt_arr_ts} ) ->strftime('%d.%m.%Y %H:%M'), @@ -1695,7 +1701,8 @@ sub compute_stats { $next_departure = $journey->{rt_dep_ts}; $next_id = $journey->{id}; $next_train - = ( $journey->{is_motis} ? '' : $journey->{type} ) . ' ' . ( $journey->{line} // $journey->{no} ),; + = ( $journey->{is_motis} ? '' : $journey->{type} ) . ' ' + . ( $journey->{line} // $journey->{no} ),; } my $ret = { km_route => $km_route, @@ -1744,7 +1751,7 @@ sub get_stats { # checks out of a train or manually edits/adds a journey. if ( - not $opt{write_only} + not $opt{write_only} and not $opt{review} and my $stats = $self->stats_cache->get( uid => $uid, diff --git a/lib/Travelynx/Model/Stations.pm b/lib/Travelynx/Model/Stations.pm index 761c5de..6758b93 100644 --- a/lib/Travelynx/Model/Stations.pm +++ b/lib/Travelynx/Model/Stations.pm @@ -99,8 +99,8 @@ sub get_backends { $opt{db} //= $self->{pg}->db; - my $res = $opt{db} - ->select( 'backends', [ 'id', 'name', 'iris', 'hafas', 'dbris', 'motis' ] ); + my $res = $opt{db}->select( 'backends', + [ 'id', 'name', 'iris', 'hafas', 'dbris', 'motis' ] ); my @ret; while ( my $row = $res->hash ) { @@ -206,12 +206,8 @@ sub add_or_update { returning * }, ( - $opt{backend_id}, - $stop->id, - $stop->name, - $stop->lat, - $stop->lon, - 0, + $opt{backend_id}, $stop->id, $stop->name, + $stop->lat, $stop->lon, 0, ) ); diff --git a/lib/Travelynx/Model/Users.pm b/lib/Travelynx/Model/Users.pm index 10ab17e..1c3692e 100644 --- a/lib/Travelynx/Model/Users.pm +++ b/lib/Travelynx/Model/Users.pm @@ -1027,11 +1027,11 @@ sub get_followers { id => $row->{id}, name => $row->{name}, following_back => ( - $row->{inverse_predicate} + $row->{inverse_predicate} and $row->{inverse_predicate} == $predicate_atoi{follows} ) ? 1 : 0, followback_requested => ( - $row->{inverse_predicate} + $row->{inverse_predicate} and $row->{inverse_predicate} == $predicate_atoi{requests_follow} ) ? 1 : 0, @@ -1103,7 +1103,7 @@ sub get_followees { id => $row->{id}, name => $row->{name}, following_back => ( - $row->{inverse_predicate} + $row->{inverse_predicate} and $row->{inverse_predicate} == $predicate_atoi{follows} ) ? 1 : 0, } |