--- a/routeList.php +++ b/routeList.php @@ -36,16 +36,16 @@ $suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING); $url = $APIurl . "/json/stopzonesearch?q=" . $suburb; include_header("Routes by Suburb", "routeList"); - trackEvent("Route Lists","Routes By Suburb", $suburb); + trackEvent("Route Lists", "Routes By Suburb", $suburb); } if ($_REQUEST['nearby']) { $url = $APIurl . "/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15"; include_header("Routes Nearby", "routeList", true, true); - timePlaceSettings(true); - if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") { - include_footer(); - die(); - } + timePlaceSettings(true); + if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") { + include_footer(); + die(); + } } $stops = json_decode(getPage($url)); $routes = Array(); @@ -63,7 +63,7 @@ echo '<li>' . $row[1] . ' <a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . " (" . ucwords($row[4]) . ")</a></li>\n"; } } -else if ($_REQUEST['bynumber']) { +else if ($_REQUEST['bynumber'] || $_REQUEST['numberSeries']) { include_header("Routes by Number", "routeList"); navbar(); echo ' <ul data-role="listview" data-inset="true">'; @@ -87,25 +87,20 @@ $routeSeries[$seriesNum][$seriesNum . "-" . $row[1] . "-" . $row[0]] = $row; } } - ksort($routeSeries); - ksort($seriesRange); - echo '<div class="noscriptnav"> Go to route numbers: '; - foreach ($seriesRange as $series => $range) { - if ($range['min'] == $range['max']) echo "<a href=\"#$series\">$series</a> "; - else echo "<a href=\"#$series\">{$range['min']}-{$range['max']}</a> "; + if ($_REQUEST['bynumber']) { + ksort($routeSeries); + ksort($seriesRange); + foreach ($routeSeries as $series => $routes) { + echo '<li><a href="' . curPageURL() . 'routeList.php?numberSeries=' . $series . '">'; + if ($series <= 9) echo $series; + else echo "{$seriesRange[$series]['min']}-{$seriesRange[$series]['max']}"; + echo "</a></li>\n"; + } } - echo "</div> - <script> - $('.noscriptnav').hide(); - </script>"; - foreach ($routeSeries as $series => $routes) { - echo '<a name="' . $series . '"></a>'; - if ($series <= 9) echo '<li>' . $series . "<ul>\n"; - else echo "<li>{$seriesRange[$series]['min']}-{$seriesRange[$series]['max']}<ul>\n"; - foreach ($routes as $row) { + else if ($_REQUEST['numberSeries']) { + foreach ($routeSeries[$_REQUEST['numberSeries']] as $row) { echo '<li>' . $row[1] . ' <a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . " (" . ucwords($row[3]) . ")</a></li>\n"; } - echo "</ul></li>\n"; } } else { @@ -115,24 +110,18 @@ $url = $APIurl . "/json/routes"; $contents = json_decode(getPage($url)); // by destination! - foreach ($contents as $key => $row) { + foreach ($contents as $row) { $routeDestinations[$row[2]][] = $row; } - echo '<div class="noscriptnav"> Go to Destination: '; - foreach (ksort($routeDestinations) as $destination => $routes) { - echo "<a href=\"#$destination\">$destination</a> "; - } - echo "</div> - <script> - $('.noscriptnav').hide(); - </script>"; - foreach ($routeDestinations as $destination => $routes) { - echo '<a name="' . $destination . '"></a>'; - echo '<li>' . $destination . "... <ul>\n"; - foreach ($routes as $row) { + if ($_REQUEST['routeDestination']) { + foreach ($routeDestinations[urldecode($_REQUEST['routeDestination'])] as $row) { echo '<li>' . $row[1] . ' <a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . " (" . ucwords($row[3]) . ")</a></li>\n"; } - echo "</ul></li>\n"; + } + else { + foreach ($routeDestinations as $destination => $routes) { + echo '<li><a href="' . curPageURL() . 'routeList.php?routeDestination=' . urlencode($destination) . '">' . $destination . "... </a></li>\n"; + } } } echo "</ul>\n";