--- a/stopList.php +++ b/stopList.php @@ -22,10 +22,9 @@ echo ' <div data-role="navbar"> <ul> - <li><a href="stopList.php">Timing Points</a></li> + <li><a href="stopList.php">Stops by Name</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> </div> '; @@ -37,8 +36,8 @@ navbar(); echo ' <ul data-role="listview" data-filter="true" data-inset="true" >'; if (!isset($firstLetter)) { - foreach (range('A', 'Z') as $letter) { - echo "<li><a href=\"stopList.php?firstLetter=$letter&bysuburbs=yes\">$letter...</a></li>\n"; + 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 "<li><a href=\"stopList.php?firstLetter=$letter&bysuburbs=yes\">$letter...</a></li>\n"; } } else { foreach ($suburbs as $suburb) { @@ -50,12 +49,7 @@ echo '</ul>'; } else { // Timing Points / All stops - if (isset($allstops)) { - $listType = 'allstops=yes'; - $stops = getStops(); - include_header("All Stops", "stopList"); - navbar(); - } else if (isset($nearby)) { + if (isset($nearby)) { $listType = 'nearby=yes'; include_header("Nearby Stops", "stopList", true, true); trackEvent("Stop Lists", "Stops Nearby", $_SESSION['lat'] . "," . $_SESSION['lon']); @@ -77,7 +71,7 @@ $sub_stop["stop_lon"] ); } - echo staticmap($stopPositions, 0, "iconb", true, true); + echo staticmap($stopPositions, true, true); placeSettings(); echo '</span><span class="content-primary">'; } else if (isset($suburb)) { @@ -86,32 +80,33 @@ navbar(); trackEvent("Stop Lists", "Stops By Suburb", $suburb); } else { - $stops = getStops(true, $firstLetter); - include_header("Timing Points / Major Stops", "stopList"); + $listType = 'allstops=yes'; + $stops = getStops($firstLetter); + include_header("Stops by Name", "stopList"); navbar(); - } + } echo ' <ul data-role="listview" data-filter="true" data-inset="true" >'; - 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"; + if (!isset($firstLetter) && !isset($suburb) && !isset($nearby)) { // all stops by letter + foreach (range('A', 'Y') as $letter) { // no streets start with X or Z + if ($letter != "X") echo "<li><a href=\"stopList.php?firstLetter=$letter&$listType\">$letter...</a></li>\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 (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 '<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']) . '">'; + echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '&stopcodes=' . implode(",", $stopsGrouped['stop_codes']) . '">'; if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { 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.*/", "", $stop['stop_name'])) . '(' . sizeof($stopsGrouped["stop_ids"]) . ' stops)'); + echo stopGroupTitle($stop['stop_name'],$stop['stop_desc']) . '<br><small>' . sizeof($stopsGrouped["stop_ids"]) . ' stops</small>'; echo "</a></li>\n"; flush(); @ob_flush(); @@ -119,20 +114,18 @@ } else { // just a normal stop echo '<li>'; - 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'] : "") . '">'; + echo '<a href="stop.php?stopid=' . $stop['stop_id'] . '&stopcode=' . $stop['stop_code'] . '">'; if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { echo '<span class="ui-li-count">' . distance($stop['stop_lat'], $stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away</span>'; } - echo bracketsMeanNewLine($stop['stop_name']); + echo $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]['stop_name'])) != trim(preg_replace("/\(Platform.*/", "", $stops[$key - 1]['stop_name'])))) { + 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'])), @@ -146,7 +139,7 @@ } else { // subsequent duplicates $stopsGrouped["stop_ids"][] = $stop['stop_id']; - ; + } } }