--- a/stopList.php
+++ b/stopList.php
@@ -1,9 +1,25 @@
- Timing Points
@@ -14,136 +30,130 @@
';
}
+
// By suburb
if (isset($bysuburbs)) {
- include_header("Stops by Suburb", "stopList");
- 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 {
- // Timing Points / All stops
- if (isset($allstops)) {
- $listType = 'allstops=yes';
- $stops = getStops();
- include_header("All Stops", "stopList");
- navbar();
- timePlaceSettings();
- }
- else if (isset($nearby)) {
- $listType = 'nearby=yes';
- include_header("Nearby Stops", "stopList", true, true);
- trackEvent("Stop Lists", "Stops Nearby", $_SESSION['lat'] . "," . $_SESSION['lon']);
- navbar();
- if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") {
- timePlaceSettings(true);
- include_footer();
- die();
- }
- $stops = getNearbyStops($_SESSION['lat'], $_SESSION['lon'], 15);
- echo '';
- $stopPositions[] = Array(
- $_SESSION['lat'],
- $_SESSION['lon']
- );
- foreach ($stops as $sub_stop) {
- $stopPositions[] = Array(
- $sub_stop["stop_lat"],
- $sub_stop["stop_lon"]
- );
- }
- echo staticmap($stopPositions, 0, "iconb", true, true);
- timePlaceSettings(true);
- echo '';
- }
- else if (isset($suburb)) {
- $stops = getStopsBySuburb($suburb);
- include_header("Stops in " . ucwords($suburb) , "stopList");
- navbar();
- trackEvent("Stop Lists", "Stops By Suburb", $suburb);
- }
- else {
- $stops = getStops(true, $firstLetter);
- include_header("Timing Points / Major Stops", "stopList");
- navbar();
- timePlaceSettings();
- }
- echo ' ';
- if (!isset($firstLetter) && !isset($suburb) && !isset($nearby)) {
- foreach (range('A', 'Z') as $letter) {
- echo "- $letter...
\n";
- }
- }
- else {
- //var_dump($stops);
- $stopsGrouped = Array();
- foreach ($stops as $key => $stop) {
- if ((trim(preg_replace("/\(Platform.*/", "", $stops[$key]["stop_name"])) != trim(preg_replace("/\(Platform.*/", "", $stops[$key + 1]["stop_name"]))) || $key + 1 >= sizeof($stops)) {
- if (sizeof($stopsGrouped) > 0) {
- // print and empty grouped stops
- // subsequent duplicates
- $stopsGrouped["stop_ids"][] = $stop['stop_id'];
- echo '- ';
- if (!startsWith($stopsGrouped['stop_codes'][0], "Wj")) echo '';
- echo '';
- if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
- echo '' . distance($stop['stop_lat'], $stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
- }
- echo bracketsMeanNewLine(trim(preg_replace("/\(Platform.*/", "", $stop['stop_name'])) . '(' . sizeof($stopsGrouped["stop_ids"]) . ' stops)');
- echo "
\n";
- flush();
- @ob_flush();
- $stopsGrouped = Array();
- }
- else {
- // just a normal stop
- echo '- ';
- if (!startsWith($stop['stop_code'], "Wj")) echo '';
- echo '';
- if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
- echo '' . distance($stop['stop_lat'], $stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
- }
- echo bracketsMeanNewLine($stop['stop_name']);
- echo "
\n";
- flush();
- @ob_flush();
- }
- }
- else {
- // this is a duplicated line item
- if ($key - 1 <= 0 || (trim(preg_replace("/\(Platform.*/", "", $stops[$key]['stop_name'])) != trim(preg_replace("/\(Platform.*/", "", $stops[$key - 1]['stop_name'])))) {
- // first duplicate
- $stopsGrouped = Array(
- "name" => trim(preg_replace("/\(Platform.*/", "", $stop['stop_name'])) ,
- "stop_ids" => Array(
- $stop['stop_id']
- ) ,
- "stop_codes" => Array(
- $stop['stop_code']
- )
- );
- }
- else {
- // subsequent duplicates
- $stopsGrouped["stop_ids"][] = $stop['stop_id'];;
- }
- }
- }
- }
- echo '
';
- if (isset($nearby)) echo '';
+ include_header("Stops by Suburb", "stopList");
+ 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 {
+ // Timing Points / All stops
+ if (isset($allstops)) {
+ $listType = 'allstops=yes';
+ $stops = getStops();
+ include_header("All Stops", "stopList");
+ navbar();
+ } else if (isset($nearby)) {
+ $listType = 'nearby=yes';
+ include_header("Nearby Stops", "stopList", true, true);
+ trackEvent("Stop Lists", "Stops Nearby", $_SESSION['lat'] . "," . $_SESSION['lon']);
+ navbar();
+ if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") {
+ placeSettings();
+ include_footer();
+ die();
+ }
+ $stops = getNearbyStops($_SESSION['lat'], $_SESSION['lon'], 15);
+ echo '';
+ $stopPositions[] = Array(
+ $_SESSION['lat'],
+ $_SESSION['lon']
+ );
+ foreach ($stops as $sub_stop) {
+ $stopPositions[] = Array(
+ $sub_stop["stop_lat"],
+ $sub_stop["stop_lon"]
+ );
+ }
+ echo staticmap($stopPositions, 0, "iconb", true, true);
+ placeSettings();
+ echo '';
+ } else if (isset($suburb)) {
+ $stops = getStopsBySuburb($suburb);
+ include_header("Stops in " . ucwords($suburb), "stopList");
+ navbar();
+ trackEvent("Stop Lists", "Stops By Suburb", $suburb);
+ } else {
+ $stops = getStops(true, $firstLetter);
+ include_header("Timing Points / Major Stops", "stopList");
+ navbar();
+ }
+ echo ' ';
+ if (!isset($firstLetter) && !isset($suburb) && !isset($nearby)) {
+ foreach (range('A', 'Z') as $letter) {
+ echo "- $letter...
\n";
+ }
+ } else {
+ //var_dump($stops);
+ $stopsGrouped = Array();
+ foreach ($stops as $key => $stop) {
+ if ((trim(preg_replace("/\(Platform.*/", "", $stops[$key]["stop_name"])) != trim(preg_replace("/\(Platform.*/", "", $stops[$key + 1]["stop_name"]))) || $key + 1 >= sizeof($stops)) {
+ if (sizeof($stopsGrouped) > 0) {
+ // print and empty grouped stops
+ // subsequent duplicates
+ $stopsGrouped["stop_ids"][] = $stop['stop_id'];
+ echo '- ';
+ if (!startsWith($stopsGrouped['stop_codes'][0], "Wj"))
+ echo '';
+ echo '';
+ if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
+ echo '' . distance($stop['stop_lat'], $stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
+ }
+ echo bracketsMeanNewLine(trim(preg_replace("/\(Platform.*/", "", $stop['stop_name'])) . '(' . sizeof($stopsGrouped["stop_ids"]) . ' stops)');
+ echo "
\n";
+ flush();
+ @ob_flush();
+ $stopsGrouped = Array();
+ } else {
+ // just a normal stop
+ echo '- ';
+ if (!startsWith($stop['stop_code'], "Wj"))
+ echo '';
+ echo '';
+ if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
+ echo '' . distance($stop['stop_lat'], $stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
+ }
+ echo bracketsMeanNewLine($stop['stop_name']);
+ echo "
\n";
+ flush();
+ @ob_flush();
+ }
+ } else {
+ // this is a duplicated line item
+ if ($key - 1 <= 0 || (trim(preg_replace("/\(Platform.*/", "", $stops[$key]['stop_name'])) != trim(preg_replace("/\(Platform.*/", "", $stops[$key - 1]['stop_name'])))) {
+ // first duplicate
+ $stopsGrouped = Array(
+ "name" => trim(preg_replace("/\(Platform.*/", "", $stop['stop_name'])),
+ "stop_ids" => Array(
+ $stop['stop_id']
+ ),
+ "stop_codes" => Array(
+ $stop['stop_code']
+ )
+ );
+ } else {
+ // subsequent duplicates
+ $stopsGrouped["stop_ids"][] = $stop['stop_id'];
+ ;
+ }
+ }
+ }
+ }
+ echo '
';
+ if (isset($nearby))
+ echo '';
}
include_footer();
?>