Unverified Commit a5eabdb6 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

estimate_trip_position: handle trips without real-time data 

rt_dep / rt_arr are set to 0 (not undef) in this case, so we gotta chain via
|| and not //
parent 3b577648

lib/Travelynx/Model/InTransit.pm

+10 −4
Original line number Diff line number Diff line
@@ -1698,10 +1698,16 @@ sub estimate_trip_position { 


	my $prev_ts;

	for my $i ( 0 .. $#route ) {

		my $ts = $route[$i][2]{rt_arr} // $route[$i][2]{sched_arr}

		  // $route[$i][2]{rt_dep} // $route[$i][2]{sched_dep} // 0;

		my $ts_dep = $route[$i][2]{rt_dep} // $route[$i][2]{sched_dep}

		  // $route[$i][2]{rt_arr} // $route[$i][2]{sched_arr} // 0;

		my $ts

		  = $route[$i][2]{rt_arr}

		  || $route[$i][2]{sched_arr}

		  || $route[$i][2]{rt_dep}

		  || $route[$i][2]{sched_dep} // 0;

		my $ts_dep

		  = $route[$i][2]{rt_dep}

		  || $route[$i][2]{sched_dep}

		  || $route[$i][2]{rt_arr}

		  || $route[$i][2]{sched_arr} // 0;

		if ( $ts and $ts_dep and $now >= $ts and $now <= $ts_dep ) {



			# Currently at a stop