--- a/trip.php +++ b/trip.php @@ -3,95 +3,81 @@ $tripid = filter_var($_REQUEST['tripid'], FILTER_SANITIZE_NUMBER_INT); $stopid = filter_var($_REQUEST['stopid'], FILTER_SANITIZE_NUMBER_INT); $routeid = filter_var($_REQUEST['routeid'], FILTER_SANITIZE_NUMBER_INT); + $routetrips = Array(); + if ($_REQUEST['routeid'] && !$_REQUEST['tripid']) { - $tripid = 0; - $url = $APIurl . "/json/routetrips?route_id=" . $routeid; - $routetrips = json_decode(getPage($url)); - foreach ($routetrips as $trip) { - if ($trip[2] > midnight_seconds()) { - $tripid = $trip[1]; - break; - } - } - if ($tripid == 0) $tripid = $routetrips[0][1]; + $trip = getRouteNextTrip($routeid); + $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)); -} -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]; - } -} -echo '
' . midnight_seconds_to_time($stopsGrouped['startTime']) . ' to ' . midnight_seconds_to_time($stopsGrouped['endTime']) . '
'; - echo bracketsMeanNewLine($row[1]); + + echo '' . $stopsGrouped['startTime'] . ' to ' . $stopsGrouped['endTime'] . '
'; + echo bracketsMeanNewLine($tripStopTime["stop_name"]); echo '' . midnight_seconds_to_time($times[$key]) . '
'; - echo bracketsMeanNewLine($row[1]); + echo ''; + echo '' . $tripStopTime['arrival_time'] . '
'; + 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']; } } }