--- a/trip.php +++ b/trip.php @@ -1,41 +1,54 @@ <?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'] && !$_REQUEST['tripid']) { - $trip = getRouteNextTrip($routeid); - $tripid = $trip['trip_id']; -} else { - $trip = getTrip($tripid); - $routeid = $trip["route_id"]; +if (isset($routeid) && !isset($tripid)) { + $trip = getRouteNextTrip($routeid); + $tripid = $trip['trip_id']; +} +else { + $trip = getTrip($tripid); + $routeid = $trip["route_id"]; } -$routetrips = getRouteTrips($routeid); - 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); - - -echo '<p><h2>Via:</h2> ' . viaPointNames($tripid) . '</small></p>'; -echo '<p><h2>Other Trips:</h2> '; -foreach (getRouteTrips($routeid) as $othertrip) { - echo '<a href="trip.php?tripid=' . $othertrip['trip_id'] . "&routeid=" . $routeid . '">' . str_replace(" ",":00",str_replace(":00"," ",$othertrip['arrival_time'])). '</a> '; +trackEvent("Route/Trip View", "View Route", $trip['route_short_name'] . ' ' . $trip['route_long_name'], $routeid); +echo '<span class="content-secondary">'; +echo '<a href="' . $trip['route_url'] . '">View Original Timetable/Map</a>'; +echo '<h2>Via:</h2> <small>' . viaPointNames($tripid) . '</small>'; +echo '<h2>Other Trips:</h2> '; +$routeTrips = getRouteTrips($routeid); +foreach ($routeTrips as $key => $othertrip) { + if ($othertrip['trip_id']!= $tripid) { + echo '<a href="trip.php?tripid=' . $othertrip['trip_id'] . "&routeid=" . $routeid . '">' . str_replace(" ", ":00", str_replace(":00", " ", $othertrip['arrival_time'])) . '</a> '; + } 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 '</p><p><h2>Other directions/timing periods:</h2> '; +flush(); +@ob_flush(); +echo '<h2>Other directions/timing periods:</h2> '; +$otherDir = 0; foreach (getRoutesByNumber($trip['route_short_name']) as $row) { - if ($row['route_id'] != $routeid) echo '<a href="trip.php?routeid=' . $row['route_id'] . '">' . $row['route_long_name'] . ' (' . ucwords($row['service_id']) . ')</a> '; + if ($row['route_id'] != $routeid) { + echo '<a href="trip.php?routeid=' . $row['route_id'] . '">' . $row['route_long_name'] . ' (' . ucwords($row['service_id']) . ')</a> '; + $otherDir++; + } } -flush(); @ob_flush(); +if ($otherDir == 0) echo "None"; +echo '</span><span class="content-primary">'; +flush(); +@ob_flush(); +echo "<div class='ui-header' style='overflow: visible; height: 1.5em'>"; +if($nextTrip) echo '<a href="trip.php?tripid=' . $nextTrip . "&routeid=" . $routeid . '" data-icon="arrow-r" class="ui-btn-right">Next Trip</a>'; +if($prevTrip) echo '<a href="trip.php?tripid=' . $prevTrip . "&routeid=" . $routeid . '" data-icon="arrow-l" class="ui-btn-left">Previous Trip</a>'; +echo "</div>"; echo ' <ul data-role="listview" data-inset="true">'; $stopsGrouped = Array(); $tripStopTimes = getTimeInterpolatedTrip($tripid); -echo '<li data-role="list-divider">' . $tripStopTimes[0]['arrival_time'] . ' to ' . $tripStopTimes[sizeof($tripStopTimes) - 1]['arrival_time'] . ' ' . $trips[1]->route_long_name . '</li>'; - +echo '<li data-role="list-divider">' . $tripStopTimes[0]['arrival_time'] . ' to ' . $tripStopTimes[sizeof($tripStopTimes) - 1]['arrival_time'] . ' ' . $trip['route_long_name'] . ' (' . ucwords($tripStopTimes[0]['service_id']) . ')</li>'; foreach ($tripStopTimes as $key => $tripStopTime) { if (($tripStopTimes[$key]["stop_name"] != $tripStopTimes[$key + 1]["stop_name"]) || $key + 1 >= sizeof($tripStopTimes)) { echo '<li>'; @@ -47,25 +60,28 @@ $stopsGrouped["endTime"] = $tripStopTime['arrival_time']; echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">'; echo '<p class="ui-li-aside">' . $stopsGrouped['startTime'] . ' to ' . $stopsGrouped['endTime']; - echo '</p>'; - if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { - echo '<span class="ui-li-count">' . distance($stop['stop_lat'],$stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away</span>'; - } + if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { + echo '<br>' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away'; + } + echo '</p>'; echo bracketsMeanNewLine($tripStopTime["stop_name"]); echo '</a></li>'; - flush(); @ob_flush(); + flush(); + @ob_flush(); $stopsGrouped = Array(); } else { // just a normal stop - echo '<a href="stop.php?stopid=' . $tripStopTime['stop_id'] . (startsWith($tripStopTime['stop_code'], "Wj") ? '&stopcode=' . $tripStopTime['stop_code'] : "") . '">'; - echo '<p class="ui-li-aside">' . $tripStopTime['arrival_time'] . '</p>'; + echo '<a href="stop.php?stopid=' . $tripStopTime['stop_id'] . (startsWith($tripStopTime['stop_code'], "Wj") ? '&stopcode=' . $tripStopTime['stop_code'] : "") . '">'; + echo '<p class="ui-li-aside">' . $tripStopTime['arrival_time']; if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { - echo '<span class="ui-li-count">' . distance($stop['stop_lat'],$stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away</span>'; - } - echo bracketsMeanNewLine($tripStopTime['stop_name']); + echo '<br>' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away'; + } + echo '</p>'; + echo bracketsMeanNewLine($tripStopTime['stop_name']); echo '</a></li>'; - flush(); @ob_flush(); + flush(); + @ob_flush(); } } else { @@ -88,6 +104,7 @@ } } echo '</ul>'; +echo '</span>'; include_footer(); ?>