--- a/stopList.php
+++ b/stopList.php
@@ -1,7 +1,8 @@
';
- foreach ($suburbs as $suburb) {
- if (!isset($_REQUEST['firstLetter'])) {
- foreach (range('A', 'Z') as $letter) {
- echo "
$letter...\n";
+ 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 . '';
}
- }
- else if (startsWith($suburb, $_REQUEST['firstLetter'])) {
- echo '' . $suburb . '';
}
}
echo '';
@@ -48,26 +51,16 @@
include_header("Nearby Stops", "stopList");
navbar();
timePlaceSettings(true);
+ if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") {
+ include_footer();
+ die();
+ }
}
else if ($_REQUEST['suburb']) {
$suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);
$listType = "suburb=$suburb";
$url = $APIurl . "/json/stopzonesearch?q=" . $suburb;
include_header("Stops in " . ucwords($suburb) , "stopList");
- if (isMetricsOn()) {
- // Create a new Instance of the tracker
- $owa = new owa_php($config);
- // Set the ID of the site being tracked
- $owa->setSiteId($owaSiteID);
- // Create a new event object
- $event = $owa->makeEvent();
- // Set the Event Type, in this case a "video_play"
- $event->setEventType('view_stop_list_suburb');
- // Set a property
- $event->set('stop_list_suburb', $suburb);
- // Track the event
- $owa->trackEvent($event);
- }
navbar();
}
else {
@@ -77,7 +70,7 @@
timePlaceSettings();
}
echo ' ';
- if (!isset($_REQUEST['firstLetter']) && !$_REQUEST['suburb']) {
+ if (!isset($_REQUEST['firstLetter']) && !$_REQUEST['suburb'] && !$_REQUEST['nearby']) {
foreach (range('A', 'Z') as $letter) {
echo "- $letter...
\n";
}
@@ -89,48 +82,47 @@
}
// Sort the stops by name
array_multisort($stopName, SORT_ASC, $stops);
- if (!isset($_REQUEST['suburb'])){
- $stops = array_filter($stops, "filterByFirstLetter");
+ if (!isset($_REQUEST['suburb']) && !isset($_REQUEST['nearby'])) {
+ $stops = array_filter($stops, "filterByFirstLetter");
}
$stopsGrouped = Array();
foreach ($stops as $key => $row) {
- if ((trim(preg_replace("/\(Platform.*/","",$stops[$key][1])) != trim(preg_replace("/\(Platform.*/","",$stops[$key + 1][1]))) || $key + 1 >= sizeof($stops)) {
- if (sizeof($stopsGrouped) > 0) {
- // print and empty grouped stops
- // subsequent duplicates
- $stopsGrouped["stop_ids"][] = $row[0];
- echo '- ';
-
- if (!startsWith($stopsGrouped['stop_codes'][0], "Wj")) echo '';
- echo '';
- if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
- echo '' . floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])) . 'm away';
- }
- echo bracketsMeanNewLine(trim(preg_replace("/\(Platform.*/","",$row[1])) . '(' . sizeof($stopsGrouped["stop_ids"]) . ' stops)');
- echo "
\n";
- $stopsGrouped = Array();
+ if ((trim(preg_replace("/\(Platform.*/", "", $stops[$key][1])) != trim(preg_replace("/\(Platform.*/", "", $stops[$key + 1][1]))) || $key + 1 >= sizeof($stops)) {
+ if (sizeof($stopsGrouped) > 0) {
+ // print and empty grouped stops
+ // subsequent duplicates
+ $stopsGrouped["stop_ids"][] = $row[0];
+ echo '- ';
+ if (!startsWith($stopsGrouped['stop_codes'][0], "Wj")) echo '';
+ echo '';
+ if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
+ echo '' . distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
}
- else {
- // just a normal stop
- echo '
- ';
- if (!startsWith($row[5], "Wj")) echo '';
- echo '';
- if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
- echo '' . floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])) . 'm away';
- }
- echo bracketsMeanNewLine($row[1]);
- echo "
\n";
+ echo bracketsMeanNewLine(trim(preg_replace("/\(Platform.*/", "", $row[1])) . '(' . sizeof($stopsGrouped["stop_ids"]) . ' stops)');
+ echo " \n";
+ $stopsGrouped = Array();
+ }
+ else {
+ // just a normal stop
+ echo '- ';
+ if (!startsWith($row[5], "Wj")) echo '';
+ echo '';
+ if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
+ echo '' . distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
}
-
- } else {
+ echo bracketsMeanNewLine($row[1]);
+ echo "
\n";
+ }
+ }
+ else {
// this is a duplicated line item
- if ($key - 1 <= 0 || (trim(preg_replace("/\(Platform.*/","",$stops[$key][1])) != trim(preg_replace("/\(Platform.*/","",$stops[$key - 1][1])))) {
+ if ($key - 1 <= 0 || (trim(preg_replace("/\(Platform.*/", "", $stops[$key][1])) != trim(preg_replace("/\(Platform.*/", "", $stops[$key - 1][1])))) {
// first duplicate
$stopsGrouped = Array(
- "name" => trim(preg_replace("/\(Platform.*/","",$row[1])),
+ "name" => trim(preg_replace("/\(Platform.*/", "", $row[1])) ,
"stop_ids" => Array(
$row[0]
- ),
+ ) ,
"stop_codes" => Array(
$row[5]
)
@@ -141,11 +133,10 @@
$stopsGrouped["stop_ids"][] = $row[0];
}
}
-
- }
+ }
}
echo '
';
- var_dump ($stopsGrouped);
}
include_footer();
?>
+