--- a/trip.php +++ b/trip.php @@ -18,42 +18,55 @@ include ('include/common.inc.php'); $routetrips = Array(); if (isset($routeid) && !isset($tripid)) { - $trip = getRouteNextTrip($routeid); + $trip = getRouteNextTrip($routeid,$directionid); + + if (!($trip)) { + $trip = getRouteFirstTrip($routeid,$directionid); + } $tripid = $trip['trip_id']; } else { $trip = getTrip($tripid); - $routeid = $trip["route_id"]; + $routeid = $trip['route_id']; } -include_header("Stops on " . $trip['route_short_name'] . ' ' . $trip['route_long_name'], "trip"); -trackEvent("Route/Trip View", "View Route", $trip['route_short_name'] . ' ' . $trip['route_long_name'], $routeid); +$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 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); +$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']; - } + // 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++; + + 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"; } -if ($otherDir == 0) - echo "None"; echo '
'; flush(); @ob_flush(); @@ -66,7 +79,7 @@ echo '