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

journey: show average speed

parent 2366b193

index.pl

+28 −3
Original line number Diff line number Diff line
@@ -877,6 +877,31 @@ helper 'get_user_travels' => sub { 
					push( @parsed_messages, [ epoch_to_dt($ts), $msg ] );

				}

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

				$ref->{sched_duration}

				  = $ref->{sched_arrival}

				  ? $ref->{sched_arrival}->epoch

				  - $ref->{sched_departure}->epoch

				  : undef;

				$ref->{rt_duration}

				  = $ref->{rt_arrival}

				  ? $ref->{rt_arrival}->epoch - $ref->{rt_departure}->epoch

				  : undef;

				$ref->{km_route}

				  = $self->get_travel_distance( $ref->{from_name},

					$ref->{to_name}, $ref->{route} );

				$ref->{km_beeline}

				  = $self->get_travel_distance( $ref->{from_name},

					$ref->{to_name}, [ $ref->{from_name}, $ref->{to_name} ] );

				$ref->{kmh_route}

				  = $ref->{km_route}

				  / (

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

					/ 3600 );

				$ref->{kmh_beeline}

				  = $ref->{km_beeline}

				  / (

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

					/ 3600 );

			}

			if (    $opt{checkin_epoch}

				and $action == $action_type{cancelled_from} )

templates/journey.html.ep

+10 −5
Original line number Diff line number Diff line
@@ -78,12 +78,17 @@ 
				<tr>

					<th scope="row">Entfernung</th>

					<td>

						% my $distance = get_travel_distance($journey->{from_name}, $journey->{to_name}, $journey->{route});

						% my $beeline = get_travel_distance($journey->{from_name}, $journey->{to_name}, [$journey->{from_name}, $journey->{to_name}]);

						% if ($distance > 0.1) {

							ca. <%= sprintf('%.f', $distance) %> km

						% if ($journey->{km_route} > 0.1) {

							ca. <%= sprintf('%.f', $journey->{km_route}) %> km

						% }

						(Luftlinie: <%= sprintf('%.f', $beeline) %> km)

						(Luftlinie: <%= sprintf('%.f', $journey->{km_beeline}) %> km)

					</td>

				</tr>

				<tr>

					<th scope="row">Geschwindigkeit</th>

					<td>

						∅ <%= sprintf('%.f', $journey->{kmh_route}) %> km/h

						(<%= sprintf('%.f', $journey->{kmh_beeline}) %> km/h)

					</td>

				</tr>

				<tr>