--- a/trip.php +++ b/trip.php @@ -1,12 +1,9 @@ <?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']) { +if (isset($routeid) && !isset($tripid)) { $trip = getRouteNextTrip($routeid); $tripid = $trip['trip_id']; } else { @@ -20,13 +17,13 @@ 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> '; +echo '<h2>Via:</h2> <small>' . viaPointNames($tripid) . '</small>'; +echo '<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> '; + echo '<a href="trip.php?tripid=' . $othertrip['trip_id'] . "&routeid=" . $routeid . '">' . str_replace(" ",":00",str_replace(":00"," ",$othertrip['arrival_time'])). '</a> '; } flush(); @ob_flush(); -echo '</p><p><h2>Other directions/timing periods:</h2> '; +echo '<h2>Other directions/timing periods:</h2> '; 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> '; } @@ -46,8 +43,11 @@ $stopsGrouped["stop_ids"][] = $tripStopTime['stop_id']; $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'] . '</p>'; + 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>'; + } echo bracketsMeanNewLine($tripStopTime["stop_name"]); echo '</a></li>'; flush(); @ob_flush(); @@ -55,9 +55,12 @@ } else { // just a normal stop - echo '<a href="stop.php?stopid=' . $tripStopTime['stop_id'] . (startsWith($tripStopTime['stop_code'], "Wj") ? '&stopcode=' . $tripStopTime['stop_code'] : "") . '">'; + 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 bracketsMeanNewLine($tripStopTime['stop_name']); + 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 '</a></li>'; flush(); @ob_flush(); }