--- a/routeList.php
+++ b/routeList.php
@@ -1,128 +1,161 @@
';
}
-if ($_REQUEST['bysuburb']) {
- include_header("Routes by Suburb", "routeList");
- navbar();
- echo ' ';
- if (!isset($_REQUEST['firstLetter'])) {
- foreach (range('A', 'Z') as $letter) {
- echo "- $letter...
\n";
- }
- }
- else {
- foreach ($suburbs as $suburb) {
- if (startsWith($suburb, $_REQUEST['firstLetter'])) {
- echo '- ' . $suburb . '
';
- }
- }
- }
- echo '
';
-}
-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 ' ';
- sksort($routes, 1, true);
- foreach ($routes as $row) {
- echo '- ' . $row[1] . ' ' . $row[2] . " (" . ucwords($row[4]) . ")
\n";
- }
-}
-else if ($_REQUEST['bynumber'] || $_REQUEST['numberSeries']) {
- include_header("Routes by Number", "routeList");
- navbar();
- echo ' ';
- $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 '- ';
- if ($series <= 9) echo $series;
- else echo "{$seriesRange[$series]['min']}-{$seriesRange[$series]['max']}";
- echo "
\n";
- }
- }
- else if ($_REQUEST['numberSeries']) {
- foreach ($routeSeries[$_REQUEST['numberSeries']] as $row) {
- echo '- ' . $row[1] . ' ' . $row[2] . " (" . ucwords($row[3]) . ")
\n";
- }
- }
-}
-else {
- include_header("Routes by Destination", "routeList");
- navbar();
- echo ' ';
- $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 '- ' . $row[1] . ' ' . $row[2] . " (" . ucwords($row[3]) . ")
\n";
- }
- }
- else {
- foreach ($routeDestinations as $destination => $routes) {
- echo '- ' . $destination . "...
\n";
- }
- }
+
+if (isset($bysuburbs)) {
+ include_header("Routes by Suburb", "routeList");
+ navbar();
+ echo ' ';
+ if (!isset($firstLetter)) {
+ foreach (range('A', 'Z') as $letter) {
+ echo "- $letter...
\n";
+ }
+ } else {
+ foreach ($suburbs as $suburb) {
+ if (startsWith($suburb, $firstLetter)) {
+ echo '- ' . $suburb . '
';
+ }
+ }
+ }
+ echo '
';
+} 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 '