--- a/trip.php
+++ b/trip.php
@@ -1,100 +1,110 @@
';
+echo 'View Original Timetable/Map';
+echo '
Via:
' . viaPointNames($tripid) . '';
+echo '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'])) . ' ';
+ } 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'];
+
+ }
+}
+flush();
+@ob_flush();
+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 (!($tripid > 0)) $tripid = $routetrip[0][1];
}
-$url = $APIurl . "/json/triprows?trip=" . $tripid;
-$trips = array_flatten(json_decode(getPage($url)));
-if (sizeof($routetrips) == 0) {
- $routeid = $trips[1]->route_id;
- $url = $APIurl . "/json/routetrips?route_id=" . $trips[1]->route_id;
- $routetrips = json_decode(getPage($url));
-}
-include_header("Stops on " . $trips[1]->route_short_name . ' ' . $trips[1]->route_long_name, "trip");
-if (isMetricsOn()) {
- // Create a new Instance of the tracker
- $owa = new owa_php();
- // Set the ID of the site being tracked
- $owa->setSiteId($owaSiteID);
- // Create a new event object
- $event = $owa->makeEvent();
- // Set the Event Type, in this case a "video_play"
- $event->setEventType('view_trip');
- // Set a property
- $event->set('trip_id', $tripid);
- $event->set('route_id', $routeid);
- $event->set('stop_id', $stopid);
- // Track the event
- $owa->trackEvent($event);
-}
-timePlaceSettings();
-echo ' Other Trips: ';
-foreach ($routetrips as $othertrip) {
- echo '' . midnight_seconds_to_time($othertrip[0]) . ' ';
-}
-echo '
Other directions/timing periods: ';
+if ($otherDir == 0) echo "None";
+echo '';
+flush();
+@ob_flush();
+echo "";
echo ' ';
-$url = $APIurl . "/json/tripstoptimes?trip=" . $tripid;
-$json = json_decode(getPage($url));
-$stops = $json[0];
-$times = $json[1];
-echo '- ' . midnight_seconds_to_time($times[0]) . '-' . midnight_seconds_to_time($times[sizeof($times) - 1]) . '
';
$stopsGrouped = Array();
-foreach ($stops as $key => $row) {
- if (($stops[$key][1] != $stops[$key + 1][1]) || $key + 1 >= sizeof($stops)) {
+$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($row[5], "Wj")) echo '';
+ if (!startsWith($tripStopTime['stop_code'], "Wj")) echo '';
if (sizeof($stopsGrouped) > 0) {
// print and empty grouped stops
// subsequent duplicates
- $stopsGrouped["stop_ids"][] = $row[0];
- $stopsGrouped["endTime"] = $times[$key];
- echo '';
- echo '
' . midnight_seconds_to_time($stopsGrouped['startTime']) . ' to ' . midnight_seconds_to_time($stopsGrouped['endTime']) . '
';
- echo bracketsMeanNewLine($row[1]);
+ $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 '' . midnight_seconds_to_time($times[$key]) . '
';
- echo bracketsMeanNewLine($row[1]);
+ 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 || ($stops[$key][1] != $stops[$key - 1][1])) {
+ if ($key - 1 <= 0 || ($tripStopTimes[$key]['stop_name'] != $tripStopTimes[$key - 1]['stop_name'])) {
// first duplicate
$stopsGrouped = Array(
- "name" => $row[1],
- "startTime" => $times[$key],
+ "name" => $tripStopTime['stop_name'],
+ "startTime" => $tripStopTime['arrival_time'],
"stop_ids" => Array(
- $row[0]
+ $tripStopTime['stop_id']
)
);
}
else {
// subsequent duplicates
- $stopsGrouped["stop_ids"][] = $row[0];
- $stopsGrouped["endTime"] = $times[$key];
+ $stopsGrouped["stop_ids"][] = $tripStopTime['stop_id'];
+ $stopsGrouped["endTime"] = $tripStopTime['arrival_time'];
}
}
}
echo '
';
+echo '';
include_footer();
?>