--- a/trip.php +++ b/trip.php @@ -1,97 +1,139 @@ midnight_seconds()) { - $tripid = $trip[1]; - break; - } - } - if ($tripid == 0) $tripid = $routetrips[0][1]; +if (isset($routeid) && !isset($tripid)) { + $trip = getRouteNextTrip($routeid,$directionid); + + if (!($trip)) { + $trip = getRouteFirstTrip($routeid,$directionid); + } + $tripid = $trip['trip_id']; +} else { + $trip = getTrip($tripid); + $routeid = $trip['route_id']; } -$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)); +$directionid = $trip['direction_id']; +$service_period = strtolower($trip["service_id"]); +$destination = getTripDestination($trip['trip_id']); +include_header("Stops on " . $trip['route_short_name'] . ' ' . $destination['stop_name'], "trip"); +trackEvent("Route/Trip View", "View Route", $trip['route_short_name'] . ' ' . $destination['stop_name'], $routeid); +echo ''; +echo 'View Original Timetable/Map '; +echo 'View Trip in Google Earth '; +echo 'View Route in Google Earth'; +echo '

Via:

' . viaPointNames($tripid) . ''; +echo '

Other Trips:

'; +$routeTrips = getRouteTrips($routeid, $trip['direction_id'], $service_period); +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']; + // } } -include_header("Stops on " . $trips[1]->route_short_name . ' ' . $trips[1]->route_long_name, "trip"); -trackEvent("Route/Trip View","View Route", $trips[1]->route_short_name . ' ' . $trips[1]->route_long_name, $trips[1]->route_id); -$url = $APIurl . "/json/tripstoptimes?trip=" . $tripid; -$json = json_decode(getPage($url)); -$stops = $json[0]; -$times = $json[1]; -$viaPoints = Array(); -foreach ($stops as $stop) { - if (!startsWith($stop[5], "Wj")) { - $viaPoints[] = $stop[1]; - } +flush(); +@ob_flush(); +echo '

Other directions/timing periods:

'; +$otherDir = 0; + + foreach (getRouteHeadsigns($routeid) as $headsign) { + if ($headsign['direction_id'] != $directionid || strtolower($headsign['service_id']) != $service_period) { + + echo ' Starting at ' . $headsign['stop_name'] . ' (' . $headsign['service_id'] . ') '; + $otherDir++; + } + } + +if ($otherDir == 0) { + echo "None"; } -echo '

Via:

' . implode(", ", $viaPoints) . '

'; -echo '

Other Trips:

'; -foreach ($routetrips as $othertrip) { - echo '' . midnight_seconds_to_time($othertrip[0]) . ' '; -} -echo '

Other directions/timing periods:

'; -$url = $APIurl . "/json/routesearch?routeshortname=" . rawurlencode($trips[1]->route_short_name); -$json = json_decode(getPage($url)); -foreach ($json as $row) { - if ($row[0] != $routeid) echo '' . $row[2] . ' (' . ucwords($row[3]) . ') '; -} +echo '
'; +flush(); +@ob_flush(); +echo "
"; +if ($nextTrip) + echo 'Next Trip'; +if ($prevTrip) + echo 'Previous Trip'; +echo "
"; echo ' '; +echo '
'; include_footer(); ?>