--- a/stopList.php
+++ b/stopList.php
@@ -17,25 +17,14 @@
*/
include ('include/common.inc.php');
$stops = Array();
-function stopCompare($stopName) {
- return substr(trim(preg_replace("/\(Platform.*/", "", $stopName)),0,9);
-}
-function stopGroupTitle($stopName,$stopdesc) {
- if (preg_match("/Dr |Cct |Cir |Av |St /",$stopName)) {
- $descParts = explode("
",$stopdesc);
- return trim(str_replace("Street: ","",$descParts[0]));
- } else {
- return trim(preg_replace("/\(Platform.*/", "",$stopName));
- }
-}
+
function navbar() {
echo '
';
@@ -47,8 +36,8 @@
navbar();
echo ' ';
if (!isset($firstLetter)) {
- foreach (range('A', 'Z') as $letter) {
- echo "- $letter...
\n";
+ foreach (range('A', 'Y') as $letter) { // no suburbs start with J, Q, U, V, X or Z
+ if ($letter != "J" && $letter != "Q" && $letter != "U" && $letter != "V" && $letter != "X") echo "- $letter...
\n";
}
} else {
foreach ($suburbs as $suburb) {
@@ -60,12 +49,7 @@
echo '
';
} else {
// Timing Points / All stops
- if (isset($allstops)) {
- $listType = 'allstops=yes';
- $stops = getStops($firstLetter);
- include_header("All Stops", "stopList");
- navbar();
- } else if (isset($nearby)) {
+ if (isset($nearby)) {
$listType = 'nearby=yes';
include_header("Nearby Stops", "stopList", true, true);
trackEvent("Stop Lists", "Stops Nearby", $_SESSION['lat'] . "," . $_SESSION['lon']);
@@ -96,14 +80,15 @@
navbar();
trackEvent("Stop Lists", "Stops By Suburb", $suburb);
} else {
- $stops = getStops(true, $firstLetter);
- include_header("Timing Points / Major Stops", "stopList");
+ $listType = 'allstops=yes';
+ $stops = getStops($firstLetter);
+ include_header("Stops by Name", "stopList");
navbar();
- }
+ }
echo ' ';
- if (!isset($firstLetter) && !isset($suburb) && !isset($nearby)) {
- foreach (range('A', 'Z') as $letter) {
- echo "- $letter...
\n";
+ if (!isset($firstLetter) && !isset($suburb) && !isset($nearby)) { // all stops by letter
+ foreach (range('A', 'Y') as $letter) { // no streets start with X or Z
+ if ($letter != "X") echo "- $letter...
\n";
}
} else {
//var_dump($stops);
@@ -117,7 +102,7 @@
// subsequent duplicates
$stopsGrouped["stop_ids"][] = $stop['stop_id'];
echo '- ';
- echo '';
+ echo '';
if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
echo '' . distance($stop['stop_lat'], $stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
}
@@ -154,7 +139,7 @@
} else {
// subsequent duplicates
$stopsGrouped["stop_ids"][] = $stop['stop_id'];
- ;
+
}
}
}