--- a/stopList.php
+++ b/stopList.php
@@ -1,101 +1,168 @@
",$stopdesc);
+ return trim(str_replace("Street: ","",$descParts[0]));
+ } else {
+ return trim(preg_replace("/\(Platform.*/", "",$stopName));
+ }
+}
function navbar() {
- echo'
+ 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();
}
- 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 (!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 (stopCompare($stops[$key]["stop_name"])
+ != stopCompare($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 '- ';
+ echo '';
+ if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
+ echo '' . distance($stop['stop_lat'], $stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
+ }
+ echo stopGroupTitle($stop['stop_name'],$stop['stop_desc']) . '
' . sizeof($stopsGrouped["stop_ids"]) . ' stops';
+ echo " \n";
+ flush();
+ @ob_flush();
+ $stopsGrouped = Array();
+ } else {
+ // just a normal stop
+ 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 $stop['stop_name'];
+ echo "
\n";
+ flush();
+ @ob_flush();
+ }
+ } else {
+ // this is a duplicated line item
+ if ($key - 1 <= 0 || stopCompare($stops[$key]['stop_name']) != stopCompare($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($_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 '
';
+ if (isset($nearby))
+ echo '';
}
include_footer();
?>
-