--- a/trip.php +++ b/trip.php @@ -3,21 +3,26 @@ $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); -if ($_REQUEST['routeid']) { +$routetrips = Array(); +if ($_REQUEST['routeid'] && !$_REQUEST['tripid']) { + $tripid = 0; $url = $APIurl . "/json/routetrips?route_id=" . $routeid; - $trips = json_decode(getPage($url)); - debug(print_r($trips, true)); - foreach ($trips as $trip) { - if ($trip[0] < midnight_seconds()) { + $routetrips = json_decode(getPage($url)); + foreach ($routetrips as $trip) { + if ($trip[0] > midnight_seconds()) { $tripid = $trip[1]; break; } } - if (!($tripid > 0)) $tripid = $trips[0][1]; + if ($tripid == 0) $tripid = $routetrips[0][1]; } $url = $APIurl . "/json/triprows?trip=" . $tripid; $trips = array_flatten(json_decode(getPage($url))); -debug(print_r($trips, true)); +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 @@ -35,20 +40,72 @@ // 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: '; +$url = $APIurl . "/json/routesearch?routeshortname=" . $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 '' . midnight_seconds_to_time($times[$key]) . '
'; - echo '' . midnight_seconds_to_time($stopsGrouped['startTime']) . ' to ' . midnight_seconds_to_time($stopsGrouped['endTime']) . '
'; + echo bracketsMeanNewLine($row[1]); + echo '' . midnight_seconds_to_time($times[$key]) . '
'; + echo bracketsMeanNewLine($row[1]); + echo ''; + } + } + else { + // this is a duplicated line item + if ($key - 1 <= 0 || ($stops[$key][1] != $stops[$key - 1][1])) { + // first duplicate + $stopsGrouped = Array( + "name" => $row[1], + "startTime" => $times[$key], + "stop_ids" => Array( + $row[0] + ) + ); + } + else { + // subsequent duplicates + $stopsGrouped["stop_ids"][] = $row[0]; + $stopsGrouped["endTime"] = $times[$key]; + } + } } echo '