--- a/stopList.php +++ b/stopList.php @@ -1,5 +1,8 @@ <?php include ('common.inc.php'); +function filterByFirstLetter($var) { + return $var[1][0] == $_REQUEST['firstLetter']; +} function navbar() { echo ' @@ -19,19 +22,28 @@ navbar(); echo ' <ul data-role="listview" data-filter="true" data-inset="true" >'; foreach ($suburbs as $suburb) { - echo '<li><a href="stopList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>'; + if (!isset($_REQUEST['firstLetter'])) { + foreach (range('A', 'Z') as $letter) { + echo "<li><a href=\"stopList.php?firstLetter=$letter&suburbs=yes\">$letter...</a></li>\n"; + } + } + else if (startsWith($suburb, $_REQUEST['firstLetter'])) { + echo '<li><a href="stopList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>'; + } } echo '</ul>'; } else { // Timing Points / All stops if ($_REQUEST['allstops']) { + $listType = 'allstops=yes'; $url = $APIurl . "/json/stops"; include_header("All Stops", "stopList"); navbar(); timePlaceSettings(); } else if ($_REQUEST['nearby']) { + $listType = 'nearby=yes'; $url = $APIurl . "/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15"; include_header("Nearby Stops", "stopList"); navbar(); @@ -39,6 +51,7 @@ } else if ($_REQUEST['suburb']) { $suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING); + $listType = "suburb=$suburb"; $url = $APIurl . "/json/stopzonesearch?q=" . $suburb; include_header("Stops in " . ucwords($suburb) , "stopList"); if (isMetricsOn()) { @@ -63,73 +76,76 @@ navbar(); timePlaceSettings(); } - echo '<div class="noscriptnav"> Go to letter: '; - foreach (range('A', 'Z') as $letter) { - echo "<a href=\"#$letter\">$letter</a> "; - } - echo "</div> - <script> -$('.noscriptnav').hide(); - </script>"; echo ' <ul data-role="listview" data-filter="true" data-inset="true" >'; - $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); - $firstletter = ""; - $stopsGrouped = Array(); - foreach ($stops as $key => $row) { - if (substr($row[1], 0, 1) != $firstletter) { - echo "<a name=$firstletter></a>"; - $firstletter = substr($row[1], 0, 1); - } - if (($stops[$key][1] != $stops[$key + 1][1]) || $key + 1 >= sizeof($stops)) { - if (sizeof($stopsGrouped) > 0) { - // print and empty grouped stops - // subsequent duplicates - $stopsGrouped["stop_ids"][] = $row[0]; - echo '<li><a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">'; - if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { - echo '<span class="ui-li-count">' . floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])) . 'm away</span>'; - } - echo bracketsMeanNewLine($row[1].'('.sizeof($stopsGrouped["stop_ids"]).' stops)'); - echo "</a></li>\n"; - $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">'; - - 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 (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { - echo '<span class="ui-li-count">' . floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])) . 'm away</span>'; - } - echo bracketsMeanNewLine($row[1]); - echo "</a></li>\n"; - } - } - else { - // this is a duplicated line item - if ($key - 1 <= 0 || ($stops[$key][1] != $stops[$key - 1][1])) { - // first duplicate - $stopsGrouped = Array( - "name" => $row[1], - "stop_ids" => Array( - $row[0] - ) - ); - } - else { - // subsequent duplicates - $stopsGrouped["stop_ids"][] = $row[0]; - } + if (!isset($_REQUEST['firstLetter']) && !$_REQUEST['suburb']) { + foreach (range('A', 'Z') as $letter) { + 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'])){ + $stops = array_filter($stops, "filterByFirstLetter"); + } + $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)) { + if (sizeof($stopsGrouped) > 0) { + // print and empty grouped stops + // subsequent duplicates + $stopsGrouped["stop_ids"][] = $row[0]; + 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">' . floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])) . 'm away</span>'; + } + echo bracketsMeanNewLine(trim(preg_replace("/\(Platform.*/","",$row[1])) . '(' . sizeof($stopsGrouped["stop_ids"]) . ' stops)'); + echo "</a></li>\n"; + $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 (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { + echo '<span class="ui-li-count">' . floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])) . 'm away</span>'; + } + echo bracketsMeanNewLine($row[1]); + echo "</a></li>\n"; + } + + } 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])))) { + // first duplicate + $stopsGrouped = Array( + "name" => trim(preg_replace("/\(Platform.*/","",$row[1])), + "stop_ids" => Array( + $row[0] + ), + "stop_codes" => Array( + $row[5] + ) + ); + } + else { + // subsequent duplicates + $stopsGrouped["stop_ids"][] = $row[0]; + } + } + + } + } echo '</ul>'; + var_dump ($stopsGrouped); } include_footer(); ?>