--- a/stopList.php
+++ b/stopList.php
@@ -1,12 +1,13 @@
@@ -14,87 +15,121 @@
';
}
// 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']) {
- $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();
- timePlaceSettings();
+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 '
';
}
- 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 (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 '
';
+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();
+ timePlaceSettings(true);
+ if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") {
+ include_footer();
+ die();
+ }
+ $stops = getNearbyStops($_SESSION['lat'], $_SESSION['lon'], 15);
+ }
+ 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 '
';
}
include_footer();
?>
-