--- a/routeList.php
+++ b/routeList.php
@@ -18,6 +18,7 @@
include ('include/common.inc.php');
function navbar() {
+
echo '
';
+}
+
+function displayRoutes($routes) {
+ echo ' ';
+ foreach ($routes as $route) {
+ foreach (getRouteHeadsigns($route['route_id']) as $headsign) {
+
+ //print_r($route);
+ echo '-
' . $route['route_id'] . "
+
+ " . $headsign['trip_headsign'] . (strstr($headsign['trip_headsign'], "bound") === false ? "bound" : "") . ", starting at " . $headsign['stop_name'] . " (" . ucwords($headsign['service_id']) . ")
";
+
+ echo" \n";
+ }
+ }
+}
+
+function displayNearbyRoutes($routes) {
+ echo ' ';
-} else if (isset($nearby) || isset($suburb)) {
- $routes = Array();
+} else if (isset($suburb)) {
+
if ($suburb) {
include_header($suburb . " - " . ucwords(service_period()), "routeList");
navbar();
- timePlaceSettings();
+ timeSettings();
trackEvent("Route Lists", "Routes By Suburb", $suburb);
- $routes = getRoutesBySuburb($suburb);
+ displayRoutes(getRoutesBySuburb($suburb));
}
- if (isset($nearby)) {
- include_header("Routes Nearby", "routeList", true, true);
+} else if (isset($nearby)) {
+ $routes = Array();
+ include_header("Routes Nearby", "routeList", true, true);
+ if (isset($_SESSION['lat']))
trackEvent("Route Lists", "Routes Nearby", $_SESSION['lat'] . "," . $_SESSION['lon']);
- navbar();
- placeSettings();
- if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") {
- include_footer();
- die();
- }
- $routes = getRoutesNearby($_SESSION['lat'], $_SESSION['lon']);
+ navbar();
+ placeSettings();
+ if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") {
+ include_footer();
+ die();
}
- echo ' ';
- if ($routes) {
- foreach ($routes as $route) {
- echo '' . $route['route_short_name'] . "
" . $route['route_long_name'] . " (" . ucwords($route['service_id']) . ")
";
- if (isset($nearby)) {
- $time = getRouteAtStop($route['route_id'], $route['stop_id']);
- echo '' . ($time['arrival_time'] ? $time['arrival_time'] : "No more trips today") . "
" . floor($route['distance']) . 'm away';
- }
- echo " \n";
- }
+ $routes = getRoutesNearby($_SESSION['lat'], $_SESSION['lon']);
+
+
+ if (sizeof($routes) > 0) {
+ displayNearbyRoutes($routes);
} else {
+ echo ' ';
echo "- No routes nearby.
";
}
} else if (isset($bynumber) || isset($numberSeries)) {
@@ -84,7 +114,7 @@
navbar();
echo ' ';
if (isset($bynumber)) {
- $routes = getRoutesByNumber();
+ $routes = getRoutes();
$routeSeries = Array();
$seriesRange = Array();
foreach ($routes as $key => $routeNumber) {
@@ -103,7 +133,7 @@
$seriesRange[$seriesNum]['max'] = $routeNumber;
$seriesRange[$seriesNum]['min'] = $routeNumber;
}
- $routeSeries[$seriesNum][$seriesNum . "-" . $row[1] . "-" . $row[0]] = $row;
+ $routeSeries[$seriesNum][] = null;
}
}
ksort($routeSeries);
@@ -118,42 +148,18 @@
}
}
else if ($numberSeries) {
- $routes = getRoutesByNumberSeries($numberSeries);
- $filteredRoutes = Array();
- foreach ($routes as $route) {
- foreach (getRouteHeadsigns($route['route_id']) as $headsign) {
- $start = $headsign['stop_name'];
- $serviceday = service_period_day ( $headsign['service_id']);
- $key = $route['route_short_name'].".".$headsign['direction_id'];
- if (isset($filteredRoutes[$key])) {
- $filteredRoutes[$key]['route_ids'][] = $route['route_id'];
- $filteredRoutes[$key]['route_ids'] = array_unique($filteredRoutes[$key]['route_ids']);
- } else {
- $filteredRoutes[$key]['route_short_name'] = $route['route_short_name'];
- $filteredRoutes[$key]['route_long_name'] = "Starting at ".$start;
- $filteredRoutes[$key]['service_id'] = $serviceday;
- $filteredRoutes[$key]['direction_id'] = $headsign['direction_id'];
- }
- }
- }
- foreach ($filteredRoutes as $key => $route) {
- echo '-
' . $route['route_short_name'] . "
-
- " . $route['route_long_name'] . " (" . ucwords($route['service_id']) . ")
- \n";
- }
+ displayRoutes(getRoutesByNumberSeries($numberSeries));
}
} else {
include_header("Routes by Destination", "routeList");
navbar();
echo '