--- a/trip.php +++ b/trip.php @@ -1,19 +1,20 @@ <?php -include ('common.inc.php'); +include ('include/common.inc.php'); $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']) { +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[0] < midnight_seconds()) { + if ($trip[2] > midnight_seconds()) { $tripid = $trip[1]; break; } } - if (!($tripid > 0)) $tripid = $routetrip[0][1]; + if ($tripid == 0) $tripid = $routetrips[0][1]; } $url = $APIurl . "/json/triprows?trip=" . $tripid; $trips = array_flatten(json_decode(getPage($url))); @@ -23,18 +24,32 @@ $routetrips = json_decode(getPage($url)); } include_header("Stops on " . $trips[1]->route_short_name . ' ' . $trips[1]->route_long_name, "trip"); -timePlaceSettings(); -echo '<p> Other Trips: '; -foreach ($routetrips as $othertrip) { - echo '<a href="trip.php?tripid=' . $othertrip[1] . "&routeid=" . $routeid . '">' . midnight_seconds_to_time($othertrip[0]) . '</a> '; -} -echo '</p> Other directions/timing periods: '; -echo ' <ul data-role="listview" data-inset="true">'; +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]; -echo '<li data-role="list-divider">' . midnight_seconds_to_time($times[0]) . '-' . midnight_seconds_to_time($times[sizeof($times) - 1]) . '</li>'; +$viaPoints = Array(); +foreach ($stops as $stop) { + if (!startsWith($stop[5], "Wj")) { + $viaPoints[] = $stop[1]; + } +} +echo '<p><h2>Via:</h2> ' . implode(", ", $viaPoints) . '</small></p>'; +echo '<p><h2>Other Trips:</h2> '; +foreach ($routetrips as $othertrip) { + echo '<a href="trip.php?tripid=' . $othertrip[1] . "&routeid=" . $routeid . '">' . midnight_seconds_to_time($othertrip[0]) . '</a> '; +} +flush(); @ob_flush(); +echo '</p><p><h2>Other directions/timing periods:</h2> '; +$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 '<a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . ' (' . ucwords($row[3]) . ')</a> '; +} +flush(); @ob_flush(); +echo ' <ul data-role="listview" data-inset="true">'; +echo '<li data-role="list-divider">' . midnight_seconds_to_time($times[0]) . '-' . midnight_seconds_to_time($times[sizeof($times) - 1]) . ' ' . $trips[1]->route_long_name . '</li>'; $stopsGrouped = Array(); foreach ($stops as $key => $row) { if (($stops[$key][1] != $stops[$key + 1][1]) || $key + 1 >= sizeof($stops)) { @@ -45,10 +60,11 @@ // subsequent duplicates $stopsGrouped["stop_ids"][] = $row[0]; $stopsGrouped["endTime"] = $times[$key]; - echo '<a href="stop.php?stopids=' . implode(",",$stopsGrouped['stop_ids']) . '">'; + echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">'; echo '<p class="ui-li-aside">' . midnight_seconds_to_time($stopsGrouped['startTime']) . ' to ' . midnight_seconds_to_time($stopsGrouped['endTime']) . '</p>'; echo bracketsMeanNewLine($row[1]); echo '</a></li>'; + flush(); @ob_flush(); $stopsGrouped = Array(); } else { @@ -57,6 +73,7 @@ echo '<p class="ui-li-aside">' . midnight_seconds_to_time($times[$key]) . '</p>'; echo bracketsMeanNewLine($row[1]); echo '</a></li>'; + flush(); @ob_flush(); } } else {