--- a/routeList.php
+++ b/routeList.php
@@ -7,132 +7,118 @@
';
}
-if ($_REQUEST['bysuburb']) {
+if (isset($bysuburbs)) {
include_header("Routes by Suburb", "routeList");
navbar();
echo ' ';
- if (!isset($_REQUEST['firstLetter'])) {
+ if (!isset($firstLetter)) {
foreach (range('A', 'Z') as $letter) {
- echo "- $letter...
\n";
+ echo "- $letter...
\n";
}
}
else {
foreach ($suburbs as $suburb) {
- if (startsWith($suburb, $_REQUEST['firstLetter'])) {
+ if (startsWith($suburb, $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);
+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 ($_REQUEST['nearby']) {
- $url = $APIurl . "/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15";
+ if (isset($nearby)) {
include_header("Routes Nearby", "routeList", true, true);
- timePlaceSettings(true);
- if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") {
- include_footer();
- die();
- }
+ 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']);
}
- $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 '