--- a/stopList.php
+++ b/stopList.php
@@ -17,17 +17,7 @@
*/
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 |Cr |Parade |Way |Bank /",$stopName)) {
- $descParts = explode("
",$stopdesc);
- return trim(str_replace("Street: ","",$descParts[0]));
- } else {
- return trim(preg_replace("/\(Platform.*/", "",$stopName));
- }
-}
+
function navbar() {
echo '
@@ -46,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) {
@@ -96,9 +86,9 @@
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);
@@ -112,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';
}
@@ -149,7 +139,7 @@
} else {
// subsequent duplicates
$stopsGrouped["stop_ids"][] = $stop['stop_id'];
- ;
+
}
}
}