--- a/stopList.php
+++ b/stopList.php
@@ -1,8 +1,8 @@
- Timing Points
@@ -15,87 +15,85 @@
}
// By suburb
if (isset($_REQUEST['suburbs'])) {
- include_header("Stops by Suburb","stopList");
- navbar();
- echo ' ';
- foreach ($suburbs as $suburb) {
- echo '- '.$suburb.'
';
- }
-echo '
';
-} else {
-// Timing Points / All stops
-
-if ($_REQUEST['allstops']) {
- $url = $APIurl."/json/stops";
- include_header("All Stops","stopList");
- navbar();
- timePlaceSettings();
-} else if ($_REQUEST['nearby']) {
- $url = $APIurl."/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15";
-include_header("Nearby Stops","stopList");
- navbar();
- timePlaceSettings(true);
-} else if ($_REQUEST['suburb']) {
- $suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);
- $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 {
- $url = $APIurl."/json/timingpoints";
- include_header("Timing Points / Major Stops","stopList");
- navbar();
- timePlaceSettings();
+ include_header("Stops by Suburb", "stopList");
+ navbar();
+ echo ' ';
+ foreach ($suburbs as $suburb) {
+ echo '- ' . $suburb . '
';
+ }
+ echo '
';
}
- echo ' Go to letter: ';
-foreach(range('A','Z') as $letter)
-{
- echo "
$letter ";
-}
-echo "
+else {
+ // Timing Points / All stops
+ if ($_REQUEST['allstops']) {
+ $url = $APIurl . "/json/stops";
+ include_header("All Stops", "stopList");
+ navbar();
+ timePlaceSettings();
+ }
+ else if ($_REQUEST['nearby']) {
+ $url = $APIurl . "/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15";
+ include_header("Nearby Stops", "stopList");
+ navbar();
+ timePlaceSettings(true);
+ }
+ else if ($_REQUEST['suburb']) {
+ $suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);
+ $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 {
+ $url = $APIurl . "/json/timingpoints";
+ include_header("Timing Points / Major Stops", "stopList");
+ navbar();
+ timePlaceSettings();
+ }
+ echo ' Go to letter: ';
+ foreach (range('A', 'Z') as $letter) {
+ echo "
$letter ";
+ }
+ echo "
";
-echo ' ';
-$contents = json_decode(getPage($url));
-debug(print_r($contents,true));
-foreach ($contents as $key => $row) {
- $stopName[$key] = $row[1];
-}
-
-// Sort the stops by name
-array_multisort($stopName, SORT_ASC, $contents);
-
-$firstletter = "";
-foreach ($contents as $row)
-{
- if (substr($row[1],0,1) != $firstletter){
- echo "";
- $firstletter = substr($row[1],0,1);
- }
- 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 '
';
- }
-echo '
';
+ echo ' ';
+ $contents = json_decode(getPage($url));
+ foreach ($contents as $key => $row) {
+ $stopName[$key] = $row[1];
+ }
+ // Sort the stops by name
+ array_multisort($stopName, SORT_ASC, $contents);
+ $firstletter = "";
+ foreach ($contents as $row) {
+ if (substr($row[1], 0, 1) != $firstletter) {
+ echo "";
+ $firstletter = substr($row[1], 0, 1);
+ }
+ 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 '
';
+ }
+ echo '
';
}
include_footer();
?>