--- a/routeList.php
+++ b/routeList.php
@@ -1,128 +1,141 @@
 <?php
+
+/*
+ *    Copyright 2010,2011 Alexander Sadleir 
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ */
 include ('include/common.inc.php');
-function navbar()
-{
-	echo '
+
+function navbar() {
+    echo '
 		<div data-role="navbar"> 
 			<ul> 
 				<li><a href="routeList.php">By Final Destination...</a></li> 
 				<li><a href="routeList.php?bynumber=yes">By Number... </a></li>
-				<li><a href="routeList.php?bysuburb=yes">By Suburb... </a></li>
+				<li><a href="routeList.php?bysuburbs=yes">By Suburb... </a></li>
 				<li><a href="routeList.php?nearby=yes">Nearby... </a></li>
 			</ul>
                 </div>
 	';
 }
-if ($_REQUEST['bysuburb']) {
-	include_header("Routes by Suburb", "routeList");
-	navbar();
-	echo '  <ul data-role="listview" data-filter="true" data-inset="true" >';
-	if (!isset($_REQUEST['firstLetter'])) {
-		foreach (range('A', 'Z') as $letter) {
-			echo "<li><a href=\"routeList.php?firstLetter=$letter&bysuburb=yes\">$letter...</a></li>\n";
-		}
-	}
-	else {
-		foreach ($suburbs as $suburb) {
-			if (startsWith($suburb, $_REQUEST['firstLetter'])) {
-				echo '<li><a href="routeList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>';
-			}
-		}
-	}
-	echo '</ul>';
-}
-else if ($_REQUEST['nearby'] || $_REQUEST['suburb']) {
-	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);
-	}
-	if ($_REQUEST['nearby']) {
-		$url = $APIurl . "/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15";
-		include_header("Routes Nearby", "routeList", true, true);
-		timePlaceSettings(true);
-		if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") {
-			include_footer();
-			die();
-		}
-	}
-	$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;
-		}
-	}
-	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";
-	}
-}
-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;
-			}
-			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) {
-			echo '<li><a href="' . curPageURL() . '/routeList.php?numberSeries=' . $series . '">';
-			if ($series <= 9) echo $series;
-			else echo "{$seriesRange[$series]['min']}-{$seriesRange[$series]['max']}";
-			echo "</a></li>\n";
-		}
-	}
-	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";
-		}
-	}
-}
-else {
-	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";
-		}
-	}
-	else {
-		foreach ($routeDestinations as $destination => $routes) {
-			echo '<li><a href="' . curPageURL() . '/routeList.php?routeDestination=' . urlencode($destination) . '">' . $destination . "... </a></li>\n";
-		}
-	}
+
+if (isset($bysuburbs)) {
+    include_header("Routes by Suburb", "routeList");
+    navbar();
+    echo '  <ul data-role="listview" data-filter="true" data-inset="true" >';
+    if (!isset($firstLetter)) {
+        foreach (range('A', 'Z') as $letter) {
+            echo "<li><a href=\"routeList.php?firstLetter=$letter&amp;bysuburbs=yes\">$letter...</a></li>\n";
+        }
+    } else {
+        foreach ($suburbs as $suburb) {
+            if (startsWith($suburb, $firstLetter)) {
+                echo '<li><a href="routeList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>';
+            }
+        }
+    }
+    echo '</ul>';
+} else if (isset($nearby) || isset($suburb)) {
+    $routes = Array();
+    if ($suburb) {
+        include_header($suburb . " - " . ucwords(service_period()), "routeList");
+        navbar();
+        timePlaceSettings();
+        trackEvent("Route Lists", "Routes By Suburb", $suburb);
+        $routes = getRoutesBySuburb($suburb);
+    }
+    if (isset($nearby)) {
+        include_header("Routes Nearby", "routeList", true, true);
+        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']);
+    }
+    echo '  <ul data-role="listview" data-filter="true" data-inset="true" >';
+    if ($routes) {
+        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 (isset($nearby)) {
+                $time = getRouteAtStop($route['route_id'], $route['stop_id']);
+                echo '<span class="ui-li-count">' . ($time['arrival_time'] ? $time['arrival_time'] : "No more trips today") . "<br>" . floor($route['distance']) . 'm away</span>';
+            }
+            echo "</a></li>\n";
+        }
+    } else {
+        echo "<li style='text-align: center;'> No routes nearby.</li>";
+    }
+} else if (isset($bynumber) || isset($numberSeries)) {
+    include_header("Routes by Number", "routeList");
+    navbar();
+    echo ' <ul data-role="listview"  data-inset="true">';
+    if (isset($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;
+            }
+        }
+        ksort($routeSeries);
+        ksort($seriesRange);
+        foreach ($routeSeries as $series => $routes) {
+            echo '<li><a href="' . curPageURL() . '/routeList.php?numberSeries=' . $series . '">';
+            if ($series <= 9)
+                echo $series;
+            else
+                echo "{$seriesRange[$series]['min']}-{$seriesRange[$series]['max']}";
+            echo "</a></li>\n";
+        }
+    }
+    else if ($numberSeries) {
+        $routes = getRoutesByNumberSeries($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";
+        }
+    }
+} else {
+    include_header("Routes by Destination", "routeList");
+    navbar();
+    echo ' <ul data-role="listview"  data-inset="true">';
+    if (isset($routeDestination)) {
+        foreach (getRoutesByDestination($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 (getRoutesByDestination() as $destination) {
+            echo '<li><a href="' . curPageURL() . '/routeList.php?routeDestination=' . urlencode($destination['route_long_name']) . '">' . $destination['route_long_name'] . "... </a></li>\n";
+        }
+    }
 }
 echo "</ul>\n";
 include_footer();