--- a/stopList.php +++ b/stopList.php @@ -1,16 +1,13 @@ <?php include ('include/common.inc.php'); -function filterByFirstLetter($var) -{ - return $var[1][0] == $_REQUEST['firstLetter']; -} +$stops = Array(); function navbar() { echo ' <div data-role="navbar"> <ul> <li><a href="stopList.php">Timing Points</a></li> - <li><a href="stopList.php?suburbs=yes">By Suburb</a></li> + <li><a href="stopList.php?bysuburbs=yes">By Suburb</a></li> <li><a href="stopList.php?nearby=yes">Nearby Stops</a></li> <li><a href="stopList.php?allstops=yes">All Stops</a></li> </ul> @@ -18,18 +15,18 @@ '; } // By suburb -if (isset($_REQUEST['suburbs'])) { +if (isset($bysuburbs)) { include_header("Stops by Suburb", "stopList"); navbar(); echo ' <ul data-role="listview" data-filter="true" data-inset="true" >'; - if (!isset($_REQUEST['firstLetter'])) { + if (!isset($firstLetter)) { foreach (range('A', 'Z') as $letter) { - echo "<li><a href=\"stopList.php?firstLetter=$letter&suburbs=yes\">$letter...</a></li>\n"; + echo "<li><a href=\"stopList.php?firstLetter=$letter&bysuburbs=yes\">$letter...</a></li>\n"; } } else { foreach ($suburbs as $suburb) { - if (startsWith($suburb, $_REQUEST['firstLetter'])) { + if (startsWith($suburb, $firstLetter)) { echo '<li><a href="stopList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>'; } } @@ -38,100 +35,95 @@ } else { // Timing Points / All stops - if ($_REQUEST['allstops']) { + if (isset($allstops)) { $listType = 'allstops=yes'; - $url = $APIurl . "/json/stops"; + $stops = getStops(); include_header("All Stops", "stopList"); navbar(); timePlaceSettings(); } - else if ($_REQUEST['nearby']) { + else if (isset($nearby)) { $listType = 'nearby=yes'; - $url = $APIurl . "/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15"; 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 ($_REQUEST['suburb']) { - $suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING); - $listType = "suburb=$suburb"; - $url = $APIurl . "/json/stopzonesearch?q=" . $suburb; + else if (isset($suburb)) { + $stops = getStopsBySuburb($suburb); include_header("Stops in " . ucwords($suburb) , "stopList"); navbar(); - trackEvent("Stop Lists","Stops By Suburb", $suburb); + trackEvent("Stop Lists", "Stops By Suburb", $suburb); } else { - $url = $APIurl . "/json/timingpoints"; + $stops = getStops(true, $firstLetter); include_header("Timing Points / Major Stops", "stopList"); navbar(); timePlaceSettings(); } echo ' <ul data-role="listview" data-filter="true" data-inset="true" >'; - if (!isset($_REQUEST['firstLetter']) && !$_REQUEST['suburb'] && !$_REQUEST['nearby']) { + if (!isset($firstLetter) && !isset($suburb) && !isset($nearby)) { foreach (range('A', 'Z') as $letter) { - echo "<li><a href=\"stopList.php?firstLetter=$letter&$listType\">$letter...</a></li>\n"; + echo "<li><a href=\"stopList.php?firstLetter=$letter&$listType\">$letter...</a></li>\n"; } } else { - $stops = json_decode(getPage($url)); - foreach ($stops as $key => $row) { - $stopName[$key] = $row[1]; - } - // Sort the stops by name - array_multisort($stopName, SORT_ASC, $stops); - if (!isset($_REQUEST['suburb']) && !isset($_REQUEST['nearby'])) { - $stops = array_filter($stops, "filterByFirstLetter"); - } + //var_dump($stops); $stopsGrouped = Array(); - foreach ($stops as $key => $row) { - if ((trim(preg_replace("/\(Platform.*/", "", $stops[$key][1])) != trim(preg_replace("/\(Platform.*/", "", $stops[$key + 1][1]))) || $key + 1 >= sizeof($stops)) { + 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"][] = $row[0]; + $stopsGrouped["stop_ids"][] = $stop['stop_id']; echo '<li>'; if (!startsWith($stopsGrouped['stop_codes'][0], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point: " class="ui-li-icon">'; echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">'; if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { - echo '<span class="ui-li-count">' . distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away</span>'; + echo '<span class="ui-li-count">' . distance($stop['stop_lat'], $stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away</span>'; } - echo bracketsMeanNewLine(trim(preg_replace("/\(Platform.*/", "", $row[1])) . '(' . sizeof($stopsGrouped["stop_ids"]) . ' stops)'); + echo bracketsMeanNewLine(trim(preg_replace("/\(Platform.*/", "", $stop['stop_name'])) . '(' . sizeof($stopsGrouped["stop_ids"]) . ' stops)'); echo "</a></li>\n"; + flush(); + @ob_flush(); $stopsGrouped = Array(); } else { // just a normal stop echo '<li>'; - if (!startsWith($row[5], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">'; - echo '<a href="stop.php?stopid=' . $row[0] . (startsWith($row[5], "Wj") ? '&stopcode=' . $row[5] : "") . '">'; + if (!startsWith($stop['stop_code'], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">'; + echo '<a href="stop.php?stopid=' . $stop['stop_id'] . (startsWith($stop['stop_code'], "Wj") ? '&stopcode=' . $stop['stop_code'] : "") . '">'; if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { - echo '<span class="ui-li-count">' . distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away</span>'; + echo '<span class="ui-li-count">' . distance($stop['stop_lat'], $stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away</span>'; } - echo bracketsMeanNewLine($row[1]); + echo bracketsMeanNewLine($stop['stop_name']); echo "</a></li>\n"; + flush(); + @ob_flush(); } } else { // this is a duplicated line item - if ($key - 1 <= 0 || (trim(preg_replace("/\(Platform.*/", "", $stops[$key][1])) != trim(preg_replace("/\(Platform.*/", "", $stops[$key - 1][1])))) { + 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.*/", "", $row[1])) , + "name" => trim(preg_replace("/\(Platform.*/", "", $stop['stop_name'])) , "stop_ids" => Array( - $row[0] + $stop['stop_id'] ) , "stop_codes" => Array( - $row[5] + $stop['stop_code'] ) ); } else { // subsequent duplicates - $stopsGrouped["stop_ids"][] = $row[0]; + $stopsGrouped["stop_ids"][] = $stop['stop_id'];; } } }