--- a/stopList.php
+++ b/stopList.php
@@ -63,7 +63,7 @@
timePlaceSettings();
}
echo '
';
- if (!isset($_REQUEST['firstLetter']) && !$_REQUEST['suburb']) {
+ if (!isset($_REQUEST['firstLetter']) && !$_REQUEST['suburb'] && !$_REQUEST['nearby']) {
foreach (range('A', 'Z') as $letter) {
echo "- $letter...
\n";
}
@@ -75,9 +75,9 @@
}
// Sort the stops by name
array_multisort($stopName, SORT_ASC, $stops);
- if (!isset($_REQUEST['suburb'])){
+ if (!isset($_REQUEST['suburb']) && !isset($_REQUEST['nearby'])){
$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)) {
@@ -90,7 +90,7 @@
if (!startsWith($stopsGrouped['stop_codes'][0], "Wj")) echo '';
echo '';
if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
- echo '' . floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])) . 'm away';
+ echo '' . distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
}
echo bracketsMeanNewLine(trim(preg_replace("/\(Platform.*/","",$row[1])) . '(' . sizeof($stopsGrouped["stop_ids"]) . ' stops)');
echo "\n";
@@ -102,7 +102,7 @@
if (!startsWith($row[5], "Wj")) echo '';
echo '';
if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
- echo '' . floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])) . 'm away';
+ echo '' . distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
}
echo bracketsMeanNewLine($row[1]);
echo "\n";
@@ -131,7 +131,6 @@
}
}
echo '
';
- var_dump ($stopsGrouped);
}
include_footer();
?>