--- a/busui/stopList.php
+++ b/busui/stopList.php
@@ -1,8 +1,9 @@
+
+function navbar() {
+ echo'
+
';
+ timePlaceSettings();
+}
// By suburb
if (isset($_REQUEST['suburbs'])) {
+ include_header("Stops by Suburb","stopList");
+ navbar();
echo ' ';
foreach ($suburbs as $suburb) {
echo '- '.$suburb.'
';
@@ -20,6 +25,39 @@
echo '
';
} else {
// Timing Points / All stops
+
+if ($_REQUEST['allstops']) {
+ $url = $APIurl."/json/stops";
+ include_header("All Stops","stopList");
+ navbar();
+} else if ($_REQUEST['nearby']) {
+ $url = $APIurl."/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15";
+include_header("Nearby Stops","stopList");
+ navbar();
+ timePlaceSettings();
+} else if ($_REQUEST['suburb']) {
+ $url = $APIurl."/json/stopzonesearch?q=".filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);
+include_header("Stops in ".ucwords(filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING)),"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('bus.lambdacomplex.org');
+// 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',$_REQUEST['suburb']);
+// Track the event
+$owa->trackEvent($event);
+ }
+ navbar();
+} else {
+ $url = $APIurl."/json/timingpoints";
+ include_header("Timing Points / Major Stops","stopList");
+ navbar();
+}
echo ' Go to letter: ';
foreach(range('A','Z') as $letter)
{
@@ -30,10 +68,6 @@
$('.noscriptnav').hide();
";
echo '
';
-$url = $APIurl."/json/timingpoints";
-if ($_REQUEST['allstops']) $url = $APIurl."/json/stops";
-if ($_REQUEST['nearby']) $url = $APIurl."/json/neareststops?lat={$_REQUEST['lat']}&lon={$_REQUEST['lon']}&limit=15";
-if ($_REQUEST['suburb']) $url = $APIurl."/json/stopzonesearch?q={$_REQUEST['suburb']}";
$contents = json_decode(getPage($url));
debug(print_r($contents,true));
foreach ($contents as $key => $row) {