Refactoring of route list page
--- a/include/common-template.inc.php
+++ b/include/common-template.inc.php
@@ -1,28 +1,27 @@
<?php
- // Copyright 2009 Google Inc. All Rights Reserved.
- $GA_ACCOUNT = "MO-22173039-1";
- $GA_PIXEL = "/lib/ga.php";
-
- function googleAnalyticsGetImageUrl() {
- global $GA_ACCOUNT, $GA_PIXEL;
- $url = "";
- $url .= $GA_PIXEL . "?";
- $url .= "utmac=" . $GA_ACCOUNT;
- $url .= "&utmn=" . rand(0, 0x7fffffff);
- $referer = $_SERVER["HTTP_REFERER"];
- $query = $_SERVER["QUERY_STRING"];
- $path = $_SERVER["REQUEST_URI"];
- if (empty($referer)) {
- $referer = "-";
- }
- $url .= "&utmr=" . urlencode($referer);
- if (!empty($path)) {
- $url .= "&utmp=" . urlencode($path);
- }
- $url .= "&guid=ON";
- return str_replace("&", "&", $url);
- }
-
+// Copyright 2009 Google Inc. All Rights Reserved.
+$GA_ACCOUNT = "MO-22173039-1";
+$GA_PIXEL = "/lib/ga.php";
+function googleAnalyticsGetImageUrl()
+{
+ global $GA_ACCOUNT, $GA_PIXEL;
+ $url = "";
+ $url.= $GA_PIXEL . "?";
+ $url.= "utmac=" . $GA_ACCOUNT;
+ $url.= "&utmn=" . rand(0, 0x7fffffff);
+ $referer = $_SERVER["HTTP_REFERER"];
+ $query = $_SERVER["QUERY_STRING"];
+ $path = $_SERVER["REQUEST_URI"];
+ if (empty($referer)) {
+ $referer = "-";
+ }
+ $url.= "&utmr=" . urlencode($referer);
+ if (!empty($path)) {
+ $url.= "&utmp=" . urlencode($path);
+ }
+ $url.= "&guid=ON";
+ return str_replace("&", "&", $url);
+}
function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false)
{
echo '
@@ -34,27 +33,34 @@
<meta name="google-site-verification"
content="-53T5Qn4TB_de1NyfR_ZZkEVdUNcNFSaYKSFkWKx-sY" />';
if ($datepicker) echo '<link rel="stylesheet" href="css/jquery.ui.datepicker.mobile.css" />';
- if (isDebugServer()) echo '<link rel="stylesheet" href="css/jquery.mobile-1.0a4.css" />
+ if (isDebugServer()) {
+ echo '<link rel="stylesheet" href="css/jquery.mobile-1.0a4.css" />
+
<script type="text/javascript" src="js/jquery-1.5.js"></script>
<script>$(document).bind("mobileinit", function(){
$.mobile.ajaxEnabled = false;
});
</script>
<script type="text/javascript" src="js/jquery.mobile-1.0a4.js"></script>';
- else echo '<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a4/jquery.mobile-1.0a4.min.css" />
+ }
+ else {
+ echo '<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a4.1/jquery.mobile-1.0a4.1.min.css" />
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js"></script>
<script>$(document).bind("mobileinit", function(){
$.mobile.ajaxEnabled = false;
});
</script>
- <script type="text/javascript" src="http://code.jquery.com/mobile/1.0a4/jquery.mobile-1.0a4.min.js"></script>';
- if ($datepicker) echo '<script>
+ <script type="text/javascript" src="http://code.jquery.com/mobile/1.0a4.1/jquery.mobile-1.0a4.1.min.js"></script>';
+ }
+ if ($datepicker) {
+ echo '<script>
//reset type=date inputs to text
$( document ).bind( "mobileinit", function(){
$.mobile.page.prototype.options.degradeInputs.date = true;
});
</script>
<script src="js/jQuery.ui.datepicker.js"></script>';
+ }
echo '<style type="text/css">
.ui-navbar {
width: 100%;
@@ -145,17 +151,17 @@
$('#here').show();
});
";
-if (!isset($_SESSION['lat']) || $_SESSION['lat'] == "") echo "geolocate();";
-echo "</script> ";
+ if (!isset($_SESSION['lat']) || $_SESSION['lat'] == "") echo "geolocate();";
+ echo "</script> ";
}
if (isAnalyticsOn()) echo '
-<script type="text/javascript">'."
+<script type="text/javascript">' . "
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-22173039-1']);
_gaq.push(['_trackPageview']);
</script>";
-echo '</head>
+ echo '</head>
<body>
<div id="skip">
<a href="#maincontent">Skip to content</a>
@@ -170,7 +176,7 @@
});
</script>
<div data-role="header" data-position="inline">
- <a href="'.$_SERVER["HTTP_REFERER"].'" data-icon="arrow-l" data-rel="back" class="ui-btn-left">Back</a>
+ <a href="' . $_SERVER["HTTP_REFERER"] . '" data-icon="arrow-l" data-rel="back" class="ui-btn-left">Back</a>
<h1>' . $pageTitle . '</h1>
<a href="/index.php" data-icon="home" class="ui-btn-right">Home</a>
</div><!-- /header -->
@@ -182,8 +188,8 @@
{
echo '<div id="footer"><a href="about.php">About/Contact Us</a> <a href="feedback.php">Feedback/Bug Report</a></a>';
echo '</div>';
- if (isAnalyticsOn()) {
- echo "<script> (function() {
+ if (isAnalyticsOn()) {
+ echo "<script> (function() {
var ga = document.createElement('script'); ga.type =
'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ?
@@ -191,9 +197,9 @@
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
})();</script>";
- $googleAnalyticsImageUrl = googleAnalyticsGetImageUrl();
- echo '<noscript><img src="' . $googleAnalyticsImageUrl . '" /></noscript>';
- }
+ $googleAnalyticsImageUrl = googleAnalyticsGetImageUrl();
+ echo '<noscript><img src="' . $googleAnalyticsImageUrl . '" /></noscript>';
+ }
}
function timePlaceSettings($geolocate = false)
{
@@ -209,7 +215,7 @@
}
echo '<div data-role="collapsible" data-collapsed="' . !$geoerror . '">
<h3>Change Time/Place (' . (isset($_SESSION['time']) ? $_SESSION['time'] : "Current Time,") . ' ' . ucwords(service_period()) . ')...</h3>
- <form action="'.basename($_SERVER['PHP_SELF'])."?".$_SERVER['QUERY_STRING'].'" method="post">
+ <form action="' . basename($_SERVER['PHP_SELF']) . "?" . $_SERVER['QUERY_STRING'] . '" method="post">
<div class="ui-body">
<div data-role="fieldcontain">
<label for="geolocate"> Current Location: </label>
@@ -218,7 +224,7 @@
<div data-role="fieldcontain">
<label for="time"> Time: </label>
<input type="time" name="time" id="time" value="' . (isset($_SESSION['time']) ? $_SESSION['time'] : date("H:i")) . '"/>
- <a href="#" name="currentTime" id="currentTime" onClick="var d = new Date();'. "$('#time').val(d.getHours() +':'+ (d.getMinutes().toString().length = 1 ? '0'+ d.getMinutes(): d.getMinutes()));".'">Current Time?</a>
+ <a href="#" name="currentTime" id="currentTime" onClick="var d = new Date();' . "$('#time').val(d.getHours() +':'+ (d.getMinutes().toString().length = 1 ? '0'+ d.getMinutes(): d.getMinutes()));" . '">Current Time?</a>
</div>
<div data-role="fieldcontain">
<label for="service_period"> Service Period: </label>
@@ -234,10 +240,11 @@
</form>
</div></div>';
}
-function trackEvent($category, $action, $label = "", $value = -1) {
- if (isAnalyticsOn()) {
- echo "\n<script> _gaq.push(['_trackEvent', '$category', '$action'".($label != "" ? ", '$label'" : "").($value != -1 ? ", $value" : "")."]);</script>";
- }
+function trackEvent($category, $action, $label = "", $value = - 1)
+{
+ if (isAnalyticsOn()) {
+ echo "\n<script> _gaq.push(['_trackEvent', '$category', '$action'" . ($label != "" ? ", '$label'" : "") . ($value != - 1 ? ", $value" : "") . "]);</script>";
+ }
}
?>
--- a/include/db/route-dao.inc.php
+++ b/include/db/route-dao.inc.php
@@ -1,78 +1,120 @@
<?php
function getRoute($routeID) {
-/*
- def handle_json_GET_routerow(self, params):
- schedule = self.server.schedule
- route = schedule.GetRoute(params.get('route', None))
- return [transitfeed.Route._FIELD_NAMES, route.GetFieldValuesTuple()]
-*/
+ $query = "Select * from routes where route_id = '$routeID' LIMIT 1";
+ debug($query,"database");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ return pg_fetch_assoc($result);
}
function getRoutes() {
-/* def handle_json_GET_routes(self, params):
- """Return a list of all routes."""
- schedule = self.server.schedule
- result = []
- for r in schedule.GetRouteList():
- servicep = None
- for t in schedule.GetTripList():
- if t.route_id == r.route_id:
- servicep = t.service_period
- break
- result.append( (r.route_id, r.route_short_name, r.route_long_name, servicep.service_id) )
- result.sort(key = lambda x: x[1:3])
- return result
-*/
+ global $conn;
+ $query = "Select * from routes order by route_short_name;";
+ debug($query,"database");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ return pg_fetch_all($result);
}
-function findRouteByNumber($routeNumber) {
- /*
- def handle_json_GET_routesearch(self, params):
- """Return a list of routes with matching short name."""
- schedule = self.server.schedule
- routeshortname = params.get('routeshortname', None)
- result = []
- for r in schedule.GetRouteList():
- if r.route_short_name == routeshortname:
- servicep = None
- for t in schedule.GetTripList():
- if t.route_id == r.route_id:
- servicep = t.service_period
- break
- result.append( (r.route_id, r.route_short_name, r.route_long_name, servicep.service_id) )
- result.sort(key = lambda x: x[1:3])
- return result
- */
+function getRoutesByNumber($routeNumber = "") {
+ global $conn;
+ if ($routeNumber != "") {
+ $query = "Select distinct routes.route_id,routes.route_short_name,routes.route_long_name,service_id from routes join trips on trips.route_id =
+routes.route_id join stop_times on stop_times.trip_id = trips.trip_id where route_short_name = '$routeNumber' order by route_short_name;";
+ } else {
+ $query = "SELECT DISTINCT route_short_name from routes order by route_short_name";
+ }
+ debug($query,"database");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ return pg_fetch_all($result);
}
function getRouteNextTrip($routeID) {
- /*
- def handle_json_GET_routetrips(self, params):
- """ Get a trip for a route_id (preferablly the next one) """
- schedule = self.server.schedule
- query = params.get('route_id', None).lower()
- result = []
- for t in schedule.GetTripList():
- if t.route_id == query:
- try:
- starttime = t.GetStartTime()
- except:
- print "Error for GetStartTime of trip #" + t.trip_id + sys.exc_info()[0]
- else:
- cursor = t._schedule._connection.cursor()
- cursor.execute(
- 'SELECT arrival_secs,departure_secs FROM stop_times WHERE '
- 'trip_id=? ORDER BY stop_sequence DESC LIMIT 1', (t.trip_id,))
- (arrival_secs, departure_secs) = cursor.fetchone()
- if arrival_secs != None:
- endtime = arrival_secs
- elif departure_secs != None:
- endtime = departure_secs
- else:
- endtime =0
- result.append ( (starttime, t.trip_id, endtime) )
- return sorted(result, key=lambda trip: trip[2])
- */
+ $query = "select * from routes join trips on trips.route_id = routes.route_id
+join stop_times on stop_times.trip_id = trips.trip_id where
+arrival_time > CURRENT_TIME and routes.route_id = '$routeID' order by
+arrival_time limit 1";
+ debug($query,"database");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ return pg_fetch_assoc($result);
+ }
+
+function getRoutesByDestination($destination = "", $service_period = "") {
+ global $conn;
+ if ($service_period == "") $service_period = service_period();
+ if ($destination != "") {
+ $query = "SELECT DISTINCT trips.route_id,route_short_name,route_long_name, service_id
+FROM stop_times join trips on trips.trip_id =
+stop_times.trip_id join routes on trips.route_id = routes.route_id
+WHERE route_long_name = '$destination' AND service_id='$service_period' order by route_short_name";
+ } else {
+ $query = "SELECT DISTINCT route_long_name
+FROM stop_times join trips on trips.trip_id =
+stop_times.trip_id join routes on trips.route_id = routes.route_id
+WHERE service_id='$service_period' order by route_long_name";
+ }
+ debug($query,"database");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ return pg_fetch_all($result);
}
+function getRoutesBySuburb($suburb, $service_period = "") {
+ if ($service_period == "") $service_period = service_period();
+ global $conn;
+ $query = "SELECT DISTINCT service_id,trips.route_id,route_short_name,route_long_name
+FROM stop_times join trips on trips.trip_id = stop_times.trip_id
+join routes on trips.route_id = routes.route_id
+join stops on stops.stop_id = stop_times.stop_id
+WHERE zone_id LIKE '%$suburb;%' AND service_id='$service_period' ORDER BY route_short_name";
+ debug($query,"database");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ return pg_fetch_all($result);
+}
+
+function getRoutesNearby($lat, $lng, $limit = "", $distance = 500) {
+
+
+ if ($service_period == "") $service_period = service_period();
+ if ($limit != "") $limit = " LIMIT $limit ";
+ global $conn;
+ $query = "SELECT service_id,trips.route_id,route_short_name,route_long_name,
+ min(ST_Distance(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), FALSE)) as distance
+FROM stop_times
+join trips on trips.trip_id = stop_times.trip_id
+join routes on trips.route_id = routes.route_id
+join stops on stops.stop_id = stop_times.stop_id
+WHERE service_id='$service_period'
+AND ST_DWithin(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), $distance, FALSE)
+ group by service_id,trips.route_id,route_short_name,route_long_name
+ order by distance $limit";
+ debug($query,"database");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ return pg_fetch_all($result);
+}
?>
--- a/include/db/stop-dao.inc.php
+++ b/include/db/stop-dao.inc.php
@@ -1,9 +1,4 @@
<?php
-/* def StopZoneToTuple(stop):
- """Return tuple as expected by javascript function addStopMarkerFromList"""
- return (stop.stop_id, stop.stop_name, float(stop.stop_lat),
- float(stop.stop_lon), stop.location_type, stop.stop_code, stop.zone_id)
-*/
function getStop($stopID)
{
global $conn;
@@ -40,13 +35,14 @@
}
return pg_fetch_all($result);
}
-function getNearbyStops($lat, $lng, $limit, $distance = 1000)
+function getNearbyStops($lat, $lng, $limit = "", $distance = 1000)
{
if ($lat == null || $lng == null) return Array();
+ if ($limit != "") $limit = " LIMIT $limit ";
global $conn;
$query = "Select *, ST_Distance(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), FALSE) as distance
from stops WHERE ST_DWithin(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), $distance, FALSE)
- order by distance;";
+ order by distance $limit;";
debug($query,"database");
$result = pg_query($conn, $query);
if (!$result) {
@@ -70,22 +66,19 @@
function getStopRoutes($stopID, $service_period)
{
if ($service_period == "") $service_period = service_period();
- /*
- def handle_json_GET_stoproutes(self, params):
- """Given a stop_id return all routes to visit the stop."""
- schedule = self.server.schedule
- stop = schedule.GetStop(params.get('stop', None))
- service_period = params.get('service_period', None)
- trips = stop.GetTrips(schedule)
- result = {}
- for trip in trips:
- route = schedule.GetRoute(trip.route_id)
- if service_period == None or trip.service_id == service_period:
- if not route.route_short_name+route.route_long_name+trip.service_id in result:
- result[route.route_short_name+route.route_long_name+trip.service_id] = (route.route_id, route.route_short_name, route.route_long_name, trip.trip_id, trip.service_id)
- return result
- */
-}
+ global $conn;
+ $query = "SELECT service_id,trips.route_id,route_short_name,route_long_name
+FROM stop_times join trips on trips.trip_id =
+stop_times.trip_id join routes on trips.route_id = routes.route_id WHERE stop_id = '$stopID' AND service_id='$service_period'";
+ debug($query,"database");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ return pg_fetch_all($result);
+ }
+
function getStopTrips($stopID, $service_period = "")
{
if ($service_period == "") $service_period = service_period();
--- a/routeList.php
+++ b/routeList.php
@@ -32,62 +32,62 @@
echo '</ul>';
}
else if ($_REQUEST['nearby'] || $_REQUEST['suburb']) {
+ $routes = Array();
if ($_REQUEST['suburb']) {
$suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);
- $url = $APIurl . "/json/stopzonesearch?q=" . $suburb;
- include_header("Routes by Suburb", "routeList");
- trackEvent("Route Lists", "Routes By Suburb", $suburb);
+ include_header($suburb ." - ".ucwords(service_period()), "routeList");
+ navbar();
+ timePlaceSettings();
+ trackEvent("Route Lists", "Routes By Suburb", $suburb);
+ $routes = getRoutesBySuburb($suburb);
+
}
if ($_REQUEST['nearby']) {
- $url = $APIurl . "/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15";
include_header("Routes Nearby", "routeList", true, true);
- timePlaceSettings(true);
+ trackEvent("Route Lists", "Routes Nearby", $_SESSION['lat'].",".$_SESSION['lon']);
+ navbar();
+ timePlaceSettings(true);
if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") {
include_footer();
die();
}
+ $routes = getRoutesNearby($_SESSION['lat'],$_SESSION['lon']);
}
- $stops = json_decode(getPage($url));
- $routes = Array();
- foreach ($stops as $stop) {
- $url = $APIurl . "/json/stoproutes?stop=" . $stop[0];
- $stoproutes = json_decode(getPage($url));
- foreach ($stoproutes as $route) {
- if (!isset($routes[$route[0]])) $routes[$route[0]] = $route;
+
+ echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';
+
+ foreach ($routes as $route) {
+ echo '<li><a href="trip.php?routeid=' . $route['route_id'] . '"><h3>' . $route['route_short_name'] . "</h3><p>" . $route['route_long_name'] . " (" . ucwords($route['service_id']) . ")</p>";
+ if ($_REQUEST['nearby']) {
+ echo '<span class="ui-li-count">' .floor($route['distance']) . 'm away</span>';
}
- }
- navbar();
- echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';
- sksort($routes, 1, true);
- foreach ($routes as $row) {
- echo '<li><a href="trip.php?routeid=' . $row[0] . '"><h3>'. $row[1] . "</h3><p>". $row[2] . " (" . ucwords($row[4]) . ")</p></a></li>\n";
+ echo "</a></li>\n";
}
}
else if ($_REQUEST['bynumber'] || $_REQUEST['numberSeries']) {
include_header("Routes by Number", "routeList");
navbar();
echo ' <ul data-role="listview" data-inset="true">';
- $url = $APIurl . "/json/routes";
- $contents = json_decode(getPage($url));
- $routeSeries = Array();
- $seriesRange = Array();
- foreach ($contents as $key => $row) {
- foreach (explode(" ", $row[1]) as $routeNumber) {
- $seriesNum = substr($routeNumber, 0, -1) . "0";
- if ($seriesNum == "0") $seriesNum = $routeNumber;
- $finalDigit = substr($routeNumber, sizeof($routeNumber) - 1, 1);
- if (isset($seriesRange[$seriesNum])) {
- if ($finalDigit < $seriesRange[$seriesNum]['max']) $seriesRange[$seriesNum]['max'] = $routeNumber;
- if ($finalDigit > $seriesRange[$seriesNum]['min']) $seriesRange[$seriesNum]['min'] = $routeNumber;
+ if ($_REQUEST['bynumber']) {
+ $routes = getRoutesByNumber();
+ $routeSeries = Array();
+ $seriesRange = Array();
+ foreach ($routes as $key => $routeNumber) {
+ foreach (explode(" ", $routeNumber['route_short_name']) as $routeNumber) {
+ $seriesNum = substr($routeNumber, 0, -1) . "0";
+ if ($seriesNum == "0") $seriesNum = $routeNumber;
+ $finalDigit = substr($routeNumber, sizeof($routeNumber) - 1, 1);
+ if (isset($seriesRange[$seriesNum])) {
+ if ($finalDigit < $seriesRange[$seriesNum]['max']) $seriesRange[$seriesNum]['max'] = $routeNumber;
+ if ($finalDigit > $seriesRange[$seriesNum]['min']) $seriesRange[$seriesNum]['min'] = $routeNumber;
+ }
+ else {
+ $seriesRange[$seriesNum]['max'] = $routeNumber;
+ $seriesRange[$seriesNum]['min'] = $routeNumber;
+ }
+ $routeSeries[$seriesNum][$seriesNum . "-" . $row[1] . "-" . $row[0]] = $row;
}
- else {
- $seriesRange[$seriesNum]['max'] = $routeNumber;
- $seriesRange[$seriesNum]['min'] = $routeNumber;
- }
- $routeSeries[$seriesNum][$seriesNum . "-" . $row[1] . "-" . $row[0]] = $row;
}
- }
- if ($_REQUEST['bynumber']) {
ksort($routeSeries);
ksort($seriesRange);
foreach ($routeSeries as $series => $routes) {
@@ -98,8 +98,9 @@
}
}
else if ($_REQUEST['numberSeries']) {
- foreach ($routeSeries[$_REQUEST['numberSeries']] as $row) {
- echo '<li> <a href="trip.php?routeid=' . $row[0] . '"><h3>' . $row[1] . "</h3><p>". $row[2] . " (" . ucwords($row[3]) . ")</p></a></li>\n";
+ $routes = getRoutesByNumber($_REQUEST['numberSeries']);
+ foreach ($routes as $route) {
+ echo '<li> <a href="trip.php?routeid=' . $route['route_id'] . '"><h3>' . $route['route_short_name'] . "</h3><p>" . $route['route_long_name'] . " (" . ucwords($route['service_id']) . ")</p></a></li>\n";
}
}
}
@@ -107,20 +108,14 @@
include_header("Routes by Destination", "routeList");
navbar();
echo ' <ul data-role="listview" data-inset="true">';
- $url = $APIurl . "/json/routes";
- $contents = json_decode(getPage($url));
- // by destination!
- foreach ($contents as $row) {
- $routeDestinations[$row[2]][] = $row;
- }
if ($_REQUEST['routeDestination']) {
- foreach ($routeDestinations[urldecode($_REQUEST['routeDestination'])] as $row) {
- echo '<li><a href="trip.php?routeid=' . $row[0] . '"><h3>' . $row[1] . '</h3><p>' . $row[2] . " (" . ucwords($row[3]) . ")</p></a></li>\n";
+ foreach (getRoutesByDestination(urldecode($_REQUEST['routeDestination'])) as $route) {
+ echo '<li><a href="trip.php?routeid=' . $route["route_id"] . '"><h3>' . $route["route_short_name"] . '</h3><p>' . $route["route_long_name"] . " (" . ucwords($route['service_id']) . ")</p></a></li>\n";
}
}
else {
- foreach ($routeDestinations as $destination => $routes) {
- echo '<li><a href="' . curPageURL() . '/routeList.php?routeDestination=' . urlencode($destination) . '">' . $destination . "... </a></li>\n";
+ foreach (getRoutesByDestination() as $destination) {
+ echo '<li><a href="' . curPageURL() . '/routeList.php?routeDestination=' . urlencode($destination['route_long_name']) . '">' . $destination['route_long_name'] . "... </a></li>\n";
}
}
}
--- a/stopList.php
+++ b/stopList.php
@@ -48,14 +48,16 @@
}
else if ($_REQUEST['nearby']) {
$listType = 'nearby=yes';
- $stops = getNearbyStops($_SESSION['lat'],$_SESSION['lon'],15);
include_header("Nearby Stops", "stopList", true, true);
+ trackEvent("Stop Lists","Stops Nearby", $_SESSION['lat'].",".$_SESSION['lon']);
navbar();
timePlaceSettings(true);
if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") {
include_footer();
die();
}
+
+ $stops = getNearbyStops($_SESSION['lat'],$_SESSION['lon'],15);
}
else if ($_REQUEST['suburb']) {
$suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);