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

Journeys: use stored distances rather than costly get_travel_distance calls 

This speeds up individual journey views, the history page (stats calculation),
and the year in review.
parent e68ca00e

lib/Travelynx/Model/Journeys.pm

+12 −9
Changes for lib/Travelynx/Model/Journeys.pm: 12 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -880,22 +880,26 @@ sub get { 
				push( @parsed_messages, [ epoch_to_dt($ts), $msg ] );

			}

			$ref->{messages} = [ reverse @parsed_messages ];

			my ( $km_polyline, $km_route, $km_beeline, $skip )

			  = $self->get_travel_distance($ref);

			$ref->{km_route}     = $km_polyline || $km_route || $km_beeline;

			$ref->{skip_route}   = $km_polyline ? 0 : $skip;

			$ref->{km_beeline}   = $km_beeline;

			$ref->{skip_beeline} = $skip;

			if ( defined $ref->{distance} ) {

				$ref->{km_route} = $ref->{distance} / 1e3;

			}

			if ( defined $ref->{distance_beeline} ) {

				$ref->{km_beeline} = $ref->{distance_beeline} / 1e3;

			}

			my $kmh_divisor

			  = ( $ref->{rt_duration} // $ref->{sched_duration} // 999999 )

			  / 3600;

			if ( $ref->{km_route} ) {

				$ref->{kmh_route}

				  = $kmh_divisor ? $ref->{km_route} / $kmh_divisor : -1;

			}

			if ( $ref->{km_beeline} ) {

				$ref->{kmh_beeline}

				  = $kmh_divisor

				  ? $ref->{km_beeline} / $kmh_divisor

				  : -1;

			}

		}



		push( @travels, $ref );

	}
@@ -1906,8 +1910,8 @@ sub compute_stats { 


	for my $journey (@journeys) {

		$num_trains++;

		$km_route   += $journey->{km_route};

		$km_beeline += $journey->{km_beeline};

		$km_route   += $journey->{km_route}   // 0;

		$km_beeline += $journey->{km_beeline} // 0;

		if (    $journey->{sched_duration}

			and $journey->{sched_duration} > 0 )

		{
@@ -2061,7 +2065,6 @@ sub get_stats { 
		uid       => $uid,

		cancelled => 0,

		verbose   => 1,

		with_polyline => 1,

		after     => $interval_start,

		before    => $interval_end

	);