--- a/stopList.php
+++ b/stopList.php
@@ -1,100 +1,153 @@
';
}
+
// By suburb
-if (isset($_REQUEST['suburbs'])) {
- include_header("Stops by Suburb","stopList");
- navbar();
- echo ' ';
- foreach ($suburbs as $suburb) {
- echo '- '.$suburb.'
';
- }
-echo '
';
+if (isset($bysuburbs)) {
+ include_header("Stops by Suburb", "stopList");
+ navbar();
+ echo ' ';
+ if (!isset($firstLetter)) {
+ 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) {
+ if (startsWith($suburb, $firstLetter)) {
+ 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']) {
- $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);
+ // Timing Points / All stops
+ 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, 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 {
+ $listType = 'allstops=yes';
+ $stops = getStops($firstLetter);
+ include_header("Stops by Name", "stopList");
+ navbar();
+ }
+ echo ' ';
+ if (isset($nearby))
+ echo '';
}
include_footer();
?>
-