--- a/trip.php
+++ b/trip.php
@@ -1,13 +1,28 @@
Other Trips: ';
$routeTrips = getRouteTrips($routeid);
foreach ($routeTrips as $key => $othertrip) {
- if ($othertrip['trip_id']!= $tripid) {
- echo '' . str_replace(" ", ":00", str_replace(":00", " ", $othertrip['arrival_time'])) . ' ';
+ if ($othertrip['trip_id'] != $tripid) {
+ echo '' . str_replace(" ", ":00", str_replace(":00", " ", $othertrip['arrival_time'])) . ' ';
} else {
// skip this trip but look forward/back
- if ($key-1 > 0) $prevTrip = $routeTrips[$key-1]['trip_id'];
- if ($key+1 < sizeof($routeTrips)) $nextTrip = $routeTrips[$key+1]['trip_id'];
-
+ if ($key - 1 > 0)
+ $prevTrip = $routeTrips[$key - 1]['trip_id'];
+ if ($key + 1 < sizeof($routeTrips))
+ $nextTrip = $routeTrips[$key + 1]['trip_id'];
}
}
flush();
@@ -32,76 +48,76 @@
echo '
Other directions/timing periods:
';
$otherDir = 0;
foreach (getRoutesByNumber($trip['route_short_name']) as $row) {
- if ($row['route_id'] != $routeid) {
- echo '' . $row['route_long_name'] . ' (' . ucwords($row['service_id']) . ') ';
- $otherDir++;
- }
+ if ($row['route_id'] != $routeid) {
+ echo '' . $row['route_long_name'] . ' (' . ucwords($row['service_id']) . ') ';
+ $otherDir++;
+ }
}
-if ($otherDir == 0) echo "None";
+if ($otherDir == 0)
+ echo "None";
echo '';
flush();
@ob_flush();
echo "";
echo ' ';
$stopsGrouped = Array();
$tripStopTimes = getTimeInterpolatedTrip($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)) {
- echo '- ';
- if (!startsWith($tripStopTime['stop_code'], "Wj")) echo '';
- if (sizeof($stopsGrouped) > 0) {
- // print and empty grouped stops
- // subsequent duplicates
- $stopsGrouped["stop_ids"][] = $tripStopTime['stop_id'];
- $stopsGrouped["endTime"] = $tripStopTime['arrival_time'];
- echo '';
- echo '
' . $stopsGrouped['startTime'] . ' to ' . $stopsGrouped['endTime'];
- if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
- echo '
' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
- }
- echo '
';
- echo bracketsMeanNewLine($tripStopTime["stop_name"]);
- echo ' ';
- flush();
- @ob_flush();
- $stopsGrouped = Array();
- }
- else {
- // just a normal stop
- echo '';
- echo '' . $tripStopTime['arrival_time'];
- if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
- echo '
' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
- }
- echo '
';
- echo bracketsMeanNewLine($tripStopTime['stop_name']);
- echo '';
- flush();
- @ob_flush();
- }
- }
- else {
- // this is a duplicated line item
- if ($key - 1 <= 0 || ($tripStopTimes[$key]['stop_name'] != $tripStopTimes[$key - 1]['stop_name'])) {
- // first duplicate
- $stopsGrouped = Array(
- "name" => $tripStopTime['stop_name'],
- "startTime" => $tripStopTime['arrival_time'],
- "stop_ids" => Array(
- $tripStopTime['stop_id']
- )
- );
- }
- else {
- // subsequent duplicates
- $stopsGrouped["stop_ids"][] = $tripStopTime['stop_id'];
- $stopsGrouped["endTime"] = $tripStopTime['arrival_time'];
- }
- }
+ if ($key + 1 > sizeof($tripStopTimes) || ($tripStopTimes[$key]["stop_name"] != $tripStopTimes[$key + 1]["stop_name"])) {
+ echo '- ';
+
+ if (sizeof($stopsGrouped) > 0) {
+ // print and empty grouped stops
+ // subsequent duplicates
+ $stopsGrouped["stop_ids"][] = $tripStopTime['stop_id'];
+ $stopsGrouped["endTime"] = $tripStopTime['arrival_time'];
+ echo '';
+ echo '
' . $stopsGrouped['startTime'] . ' to ' . $stopsGrouped['endTime'];
+ if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
+ echo '
' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
+ }
+ echo '
';
+ echo $tripStopTime["stop_name"];
+ echo ' ';
+ flush();
+ @ob_flush();
+ $stopsGrouped = Array();
+ } else {
+ // just a normal stop
+ echo '';
+ echo '' . $tripStopTime['arrival_time'];
+ if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
+ echo '
' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
+ }
+ echo '
';
+ echo $tripStopTime['stop_name'];
+ echo '';
+ flush();
+ @ob_flush();
+ }
+ } else {
+ // this is a duplicated line item
+ if ($key - 1 <= 0 || ($tripStopTimes[$key]['stop_name'] != $tripStopTimes[$key - 1]['stop_name'])) {
+ // first duplicate
+ $stopsGrouped = Array(
+ "name" => $tripStopTime['stop_name'],
+ "startTime" => $tripStopTime['arrival_time'],
+ "stop_ids" => Array(
+ $tripStopTime['stop_id']
+ )
+ );
+ } else {
+ // subsequent duplicates
+ $stopsGrouped["stop_ids"][] = $tripStopTime['stop_id'];
+ $stopsGrouped["endTime"] = $tripStopTime['arrival_time'];
+ }
+ }
}
echo '
';
echo '';