--- a/trip.php
+++ b/trip.php
@@ -66,13 +66,12 @@
echo "";
echo '
';
$stopsGrouped = Array();
-$tripStopTimes = getTimeInterpolatedTrip($tripid);
+$tripStopTimes = getTripStopTimes($tripid);
echo '- ' . $tripStopTimes[0]['arrival_time'] . ' to ' . $tripStopTimes[sizeof($tripStopTimes) - 1]['arrival_time'] . ' ' . $trip['route_long_name'] . ' (' . ucwords($tripStopTimes[0]['service_id']) . ')
';
foreach ($tripStopTimes as $key => $tripStopTime) {
- if (($tripStopTimes[$key]["stop_name"] != $tripStopTimes[$key + 1]["stop_name"]) || $key + 1 >= sizeof($tripStopTimes)) {
+ if ($key + 1 > sizeof($tripStopTimes) || ($tripStopTimes[$key]["stop_name"] != $tripStopTimes[$key + 1]["stop_name"])) {
echo '- ';
- if (!startsWith($tripStopTime['stop_code'], "Wj"))
- echo '';
+
if (sizeof($stopsGrouped) > 0) {
// print and empty grouped stops
// subsequent duplicates
@@ -84,7 +83,7 @@
echo '
' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
}
echo '';
- echo bracketsMeanNewLine($tripStopTime["stop_name"]);
+ echo $tripStopTime["stop_name"];
echo ' ';
flush();
@ob_flush();
@@ -97,7 +96,7 @@
echo '
' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
}
echo '';
- echo bracketsMeanNewLine($tripStopTime['stop_name']);
+ echo $tripStopTime['stop_name'];
echo '';
flush();
@ob_flush();