Hide viaPoints when display width is less than 480px
--- a/common-geo.inc.php
+++ b/common-geo.inc.php
@@ -51,7 +51,7 @@
if ($collapsible) $output.= '</div>';
return $output;
}
-function distance($lat1, $lng1, $lat2, $lng2)
+function distance($lat1, $lng1, $lat2, $lng2, $roundLargeValues = false)
{
$pi80 = M_PI / 180;
$lat1*= $pi80;
@@ -64,7 +64,10 @@
$a = sin($dlat / 2) * sin($dlat / 2) + cos($lat1) * cos($lat2) * sin($dlng / 2) * sin($dlng / 2);
$c = 2 * atan2(sqrt($a) , sqrt(1 - $a));
$km = $r * $c;
- return $km * 1000;
+ if ($roundLargeValues) {
+ if ($km < 1) return floor($km * 1000);
+ else return round($km,2)."k";
+ } else return floor($km * 1000);
}
function decodePolylineToArray($encoded)
{
--- a/common-template.inc.php
+++ b/common-template.inc.php
@@ -1,11 +1,37 @@
<?php
+ // Copyright 2009 Google Inc. All Rights Reserved.
+ $GA_ACCOUNT = "MO-22173039-1";
+ $GA_PIXEL = "/ga.php";
+
+ function googleAnalyticsGetImageUrl() {
+ global $GA_ACCOUNT, $GA_PIXEL;
+ $url = "";
+ $url .= $GA_PIXEL . "?";
+ $url .= "utmac=" . $GA_ACCOUNT;
+ $url .= "&utmn=" . rand(0, 0x7fffffff);
+ $referer = $_SERVER["HTTP_REFERER"];
+ $query = $_SERVER["QUERY_STRING"];
+ $path = $_SERVER["REQUEST_URI"];
+ if (empty($referer)) {
+ $referer = "-";
+ }
+ $url .= "&utmr=" . urlencode($referer);
+ if (!empty($path)) {
+ $url .= "&utmp=" . urlencode($path);
+ }
+ $url .= "&guid=ON";
+ return str_replace("&", "&", $url);
+ }
+
function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false)
{
echo '
<!DOCTYPE html>
-<html>
- <head>
+<html lang="en">
+ <head>
+ <meta charset="UTF-8">
<title>' . $pageTitle . '</title>';
+ <meta name="google-site-verification" content="-53T5Qn4TB_de1NyfR_ZZkEVdUNcNFSaYKSFkWKx-sY" />
if ($datepicker) echo '<link rel="stylesheet" href="css/jquery.ui.datepicker.mobile.css" />';
if (isDebugServer()) echo '<link rel="stylesheet" href="css/jquery-mobile-1.0a3.css" />
<script type="text/javascript" src="js/jquery-1.5.js"></script>
@@ -20,7 +46,7 @@
});
</script>
<script src="js/jQuery.ui.datepicker.js"></script>';
-echo '<style type="text/css">
+ echo '<style type="text/css">
.ui-navbar {
width: 100%;
}
@@ -44,11 +70,40 @@
body {
background-color: #F0F0F0;
}
-</style>
-<meta name="apple-mobile-web-app-capable" content="yes" />
+ #jqm-homeheader {
+ text-align: center;
+ }
+ .viaPoints {
+ display: none;
+ text-size: 0.2em;
+ }
+ .min-width-480px .viaPoints {
+ display: block;
+ }
+ // source http://webaim.org/techniques/skipnav/
+ #skip a, #skip a:hover, #skip a:visited
+{
+position:absolute;
+left:0px;
+top:-500px;
+width:1px;
+height:1px;
+overflow:hidden;
+}
+
+#skip a:active, #skip a:focus
+{
+position:static;
+width:auto;
+height:auto;
+}
+</style>';
+ if (strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPod')) {
+ echo '<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<link rel="apple-touch-startup-image" href="startup.png" />
<link rel="apple-touch-icon" href="apple-touch-icon.png" />';
+ }
if ($geolocate) {
echo "<script>
@@ -63,13 +118,21 @@
}
if (navigator.geolocation) {
- navigator.geolocation.getCurrentPosition(success, error);
+var options = {
+ enableHighAccuracy: false,
+ timeout: 60000,
+ maximumAge: 10000
+}
+ navigator.geolocation.getCurrentPosition(success, error, options);
}
</script> ";
}
echo '</head>
<body>
+ <div id="skip">
+ <a href="#maincontent">Skip to content</a>
+ </div>
';
if ($opendiv) {
echo '<div data-role="page">
@@ -82,6 +145,7 @@
<div data-role="header">
<h1>' . $pageTitle . '</h1>
</div><!-- /header -->
+ <a name="maincontent" id="maincontent"></a>
<div data-role="content"> ';
}
}
@@ -95,6 +159,10 @@
}
echo '<div id="footer"><a href="about.php">About/Contact Us</a> <a href="feedback.php">Feedback/Bug Report</a></a>';
echo '</div>';
+ if (!isDebug()) {
+ $googleAnalyticsImageUrl = googleAnalyticsGetImageUrl();
+ echo '<img src="' . $googleAnalyticsImageUrl . '" />';
+ }
}
function timePlaceSettings($geolocate = false)
{
@@ -109,22 +177,22 @@
or enter an address/co-ordinates in the box below.</div>';
}
echo '<div data-role="collapsible" data-collapsed="' . !$geoerror . '">
- <h3>Change Time/Place (' . (isset($_SESSION['time']) ? $_SESSION['time'] : "Current Time,") . ' '.ucwords(service_period()).')...</h3>
- <form action="" method="post">
+ <h3>Change Time/Place (' . (isset($_SESSION['time']) ? $_SESSION['time'] : "Current Time,") . ' ' . ucwords(service_period()) . ')...</h3>
+ <form action="'.basename($_SERVER['PHP_SELF']).'" method="post">
<div class="ui-body">
<div data-role="fieldcontain">
<label for="geolocate"> Current Location: </label>
- <input type="text" id="geolocate" name="geolocate" value="' . (isset($_SESSION['lat']) && isset($_SESSION['lon']) ? $_SESSION['lat'] . "," . $_SESSION['lon'] : "Enter co-ordinates or address here") . '"/> <a href="#" style="display:none" name="here" id="here"/>Here?</a>
+ <input type="text" id="geolocate" name="geolocate" value="' . (isset($_SESSION['lat']) && isset($_SESSION['lon']) ? $_SESSION['lat'] . "," . $_SESSION['lon'] : "Enter co-ordinates or address here") . '"/> <a href="#" style="display:none" name="here" id="here">Here?</a>
</div>
<div data-role="fieldcontain">
<label for="time"> Time: </label>
- <input type="time" name="time" id="time" value="' . (isset($_SESSION['time']) ? $_SESSION['time'] : date("H:i")) . '"/> <a href="#" name="currentTime" id="currentTime"/>Current Time?</a>
+ <input type="time" name="time" id="time" value="' . (isset($_SESSION['time']) ? $_SESSION['time'] : date("H:i")) . '"/> <a href="#" name="currentTime" id="currentTime">Current Time?</a>
</div>
<div data-role="fieldcontain">
<label for="service_period"> Service Period: </label>
- <select name="service_period">';
+ <select name="service_period" id="service_period">';
foreach ($service_periods as $service_period) {
- echo "<option value=\"$service_period\"" . (service_period() === $service_period ? "SELECTED" : "") . '>' . ucwords($service_period) . '</option>';
+ echo "<option value=\"$service_period\"" . (service_period() === $service_period ? " SELECTED" : "") . '>' . ucwords($service_period) . '</option>';
}
echo '</select>
<a href="#" style="display:none" name="currentPeriod" id="currentPeriod"/>Current Period?</a>
--- a/common.inc.php
+++ b/common.inc.php
@@ -25,31 +25,31 @@
$_SESSION['time'] = filter_var($_REQUEST['time'], FILTER_SANITIZE_STRING);
}
if (isset($_REQUEST['geolocate'])) {
-
$geocoded = false;
if (isset($_REQUEST['lat']) && isset($_REQUEST['lon'])) {
$_SESSION['lat'] = trim(filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
$_SESSION['lon'] = trim(filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
}
else {
- $geolocate = filter_var($_REQUEST['geolocate'], FILTER_SANITIZE_URL);
- echo $_REQUEST['geolocate'];
- if (startsWith($geolocate, "-")) {
- $locateparts = explode(",",$geolocate);
- $_SESSION['lat'] = $locateparts[0];
- $_SESSION['lon'] =$locateparts[1];
- } else {
- $contents = geocode($geolocate, true);
- print_r($contents);
- if (isset($contents[0]->centroid)) {
- $geocoded = true;
- $_SESSION['lat'] = $contents[0]->centroid->coordinates[0];
- $_SESSION['lon'] = $contents[0]->centroid->coordinates[1];
+ $geolocate = filter_var($_REQUEST['geolocate'], FILTER_SANITIZE_URL);
+ echo $_REQUEST['geolocate'];
+ if (startsWith($geolocate, "-")) {
+ $locateparts = explode(",", $geolocate);
+ $_SESSION['lat'] = $locateparts[0];
+ $_SESSION['lon'] = $locateparts[1];
}
else {
- $_SESSION['lat'] = "";
- $_SESSION['lon'] = "";
- }
+ $contents = geocode($geolocate, true);
+ print_r($contents);
+ if (isset($contents[0]->centroid)) {
+ $geocoded = true;
+ $_SESSION['lat'] = $contents[0]->centroid->coordinates[0];
+ $_SESSION['lon'] = $contents[0]->centroid->coordinates[1];
+ }
+ else {
+ $_SESSION['lat'] = "";
+ $_SESSION['lon'] = "";
+ }
}
}
}
@@ -66,6 +66,31 @@
function debug($msg, $debugReason = "other")
{
if (isDebug($debugReason)) echo "\n<!-- " . date(DATE_RFC822) . "\n $msg -->\n";
+}
+function isJQueryMobileDevice()
+{
+ // http://forum.jquery.com/topic/what-is-the-best-way-to-detect-all-useragents-which-can-handle-jquery-mobile#14737000002087897
+ $user_agent = $_SERVER['HTTP_USER_AGENT'];
+ return preg_match('/iphone/i', $user_agent)
+ || preg_match('/android/i', $user_agent)
+ || preg_match('/webos/i', $user_agent)
+ || preg_match('/ios/i', $user_agent)
+ || preg_match('/bada/i', $user_agent)
+ || preg_match('/maemo/i', $user_agent)
+ || preg_match('/meego/i', $user_agent)
+ || preg_match('/fennec/i', $user_agent)
+ || (preg_match('/symbian/i', $user_agent)
+ && preg_match('/s60/i', $user_agent)
+ && $browser['majorver'] >= 5)
+ || (preg_match('/symbian/i', $user_agent)
+ && preg_match('/platform/i', $user_agent)
+ && $browser['majorver'] >= 3)
+ || (preg_match('/blackberry/i', $user_agent)
+ && $browser['majorver'] >= 5)
+ || (preg_match('/opera mobile/i', $user_agent)
+ && $browser['majorver'] >= 10)
+ || (preg_match('/opera mini/i', $user_agent)
+ && $browser['majorver'] >= 5);
}
function isFastDevice()
{
@@ -129,5 +154,27 @@
{
return str_replace(")", "</small>", str_replace("(", "<br><small>", $input));
}
+function sksort(&$array, $subkey = "id", $sort_ascending = false)
+{
+ if (count($array)) $temp_array[key($array) ] = array_shift($array);
+ foreach ($array as $key => $val) {
+ $offset = 0;
+ $found = false;
+ foreach ($temp_array as $tmp_key => $tmp_val) {
+ if (!$found and strtolower($val[$subkey]) > strtolower($tmp_val[$subkey])) {
+ $temp_array = array_merge((array)array_slice($temp_array, 0, $offset) , array(
+ $key => $val
+ ) , array_slice($temp_array, $offset));
+ $found = true;
+ }
+ $offset++;
+ }
+ if (!$found) $temp_array = array_merge($temp_array, array(
+ $key => $val
+ ));
+ }
+ if ($sort_ascending) $array = array_reverse($temp_array);
+ else $array = $temp_array;
+}
?>
--- /dev/null
+++ b/ga.php
@@ -1,1 +1,187 @@
+<?php
+/**
+ Copyright 2009 Google Inc. All Rights Reserved.
+**/
+
+ // Tracker version.
+ define("VERSION", "4.4sh");
+
+ define("COOKIE_NAME", "__utmmobile");
+
+ // The path the cookie will be available to, edit this to use a different
+ // cookie path.
+ define("COOKIE_PATH", "/");
+
+ // Two years in seconds.
+ define("COOKIE_USER_PERSISTENCE", 63072000);
+
+ // 1x1 transparent GIF
+ $GIF_DATA = array(
+ chr(0x47), chr(0x49), chr(0x46), chr(0x38), chr(0x39), chr(0x61),
+ chr(0x01), chr(0x00), chr(0x01), chr(0x00), chr(0x80), chr(0xff),
+ chr(0x00), chr(0xff), chr(0xff), chr(0xff), chr(0x00), chr(0x00),
+ chr(0x00), chr(0x2c), chr(0x00), chr(0x00), chr(0x00), chr(0x00),
+ chr(0x01), chr(0x00), chr(0x01), chr(0x00), chr(0x00), chr(0x02),
+ chr(0x02), chr(0x44), chr(0x01), chr(0x00), chr(0x3b)
+ );
+
+ // The last octect of the IP address is removed to anonymize the user.
+ function getIP($remoteAddress) {
+ if (empty($remoteAddress)) {
+ return "";
+ }
+
+ // Capture the first three octects of the IP address and replace the forth
+ // with 0, e.g. 124.455.3.123 becomes 124.455.3.0
+ $regex = "/^([^.]+\.[^.]+\.[^.]+\.).*/";
+ if (preg_match($regex, $remoteAddress, $matches)) {
+ return $matches[1] . "0";
+ } else {
+ return "";
+ }
+ }
+
+ // Generate a visitor id for this hit.
+ // If there is a visitor id in the cookie, use that, otherwise
+ // use the guid if we have one, otherwise use a random number.
+ function getVisitorId($guid, $account, $userAgent, $cookie) {
+
+ // If there is a value in the cookie, don't change it.
+ if (!empty($cookie)) {
+ return $cookie;
+ }
+
+ $message = "";
+ if (!empty($guid)) {
+ // Create the visitor id using the guid.
+ $message = $guid . $account;
+ } else {
+ // otherwise this is a new user, create a new random id.
+ $message = $userAgent . uniqid(getRandomNumber(), true);
+ }
+
+ $md5String = md5($message);
+
+ return "0x" . substr($md5String, 0, 16);
+ }
+
+ // Get a random number string.
+ function getRandomNumber() {
+ return rand(0, 0x7fffffff);
+ }
+
+ // Writes the bytes of a 1x1 transparent gif into the response.
+ function writeGifData() {
+ global $GIF_DATA;
+ header("Content-Type: image/gif");
+ header("Cache-Control: " .
+ "private, no-cache, no-cache=Set-Cookie, proxy-revalidate");
+ header("Pragma: no-cache");
+ header("Expires: Wed, 17 Sep 1975 21:32:10 GMT");
+ echo join($GIF_DATA);
+ }
+
+ // Make a tracking request to Google Analytics from this server.
+ // Copies the headers from the original request to the new one.
+ // If request containg utmdebug parameter, exceptions encountered
+ // communicating with Google Analytics are thown.
+ function sendRequestToGoogleAnalytics($utmUrl) {
+ $options = array(
+ "http" => array(
+ "method" => "GET",
+ "user_agent" => $_SERVER["HTTP_USER_AGENT"],
+ "header" => ("Accepts-Language: " . $_SERVER["HTTP_ACCEPT_LANGUAGE"]))
+ );
+ if (!empty($_GET["utmdebug"])) {
+ $data = file_get_contents(
+ $utmUrl, false, stream_context_create($options));
+ } else {
+ $data = @file_get_contents(
+ $utmUrl, false, stream_context_create($options));
+ }
+ }
+
+ // Track a page view, updates all the cookies and campaign tracker,
+ // makes a server side request to Google Analytics and writes the transparent
+ // gif byte data to the response.
+ function trackPageView() {
+ $timeStamp = time();
+ $domainName = $_SERVER["SERVER_NAME"];
+ if (empty($domainName)) {
+ $domainName = "";
+ }
+
+ // Get the referrer from the utmr parameter, this is the referrer to the
+ // page that contains the tracking pixel, not the referrer for tracking
+ // pixel.
+ $documentReferer = $_GET["utmr"];
+ if (empty($documentReferer) && $documentReferer !== "0") {
+ $documentReferer = "-";
+ } else {
+ $documentReferer = urldecode($documentReferer);
+ }
+ $documentPath = $_GET["utmp"];
+ if (empty($documentPath)) {
+ $documentPath = "";
+ } else {
+ $documentPath = urldecode($documentPath);
+ }
+
+ $account = $_GET["utmac"];
+ $userAgent = $_SERVER["HTTP_USER_AGENT"];
+ if (empty($userAgent)) {
+ $userAgent = "";
+ }
+
+ // Try and get visitor cookie from the request.
+ $cookie = $_COOKIE[COOKIE_NAME];
+
+ $guidHeader = $_SERVER["HTTP_X_DCMGUID"];
+ if (empty($guidHeader)) {
+ $guidHeader = $_SERVER["HTTP_X_UP_SUBNO"];
+ }
+ if (empty($guidHeader)) {
+ $guidHeader = $_SERVER["HTTP_X_JPHONE_UID"];
+ }
+ if (empty($guidHeader)) {
+ $guidHeader = $_SERVER["HTTP_X_EM_UID"];
+ }
+
+ $visitorId = getVisitorId($guidHeader, $account, $userAgent, $cookie);
+
+ // Always try and add the cookie to the response.
+ setrawcookie(
+ COOKIE_NAME,
+ $visitorId,
+ $timeStamp + COOKIE_USER_PERSISTENCE,
+ COOKIE_PATH);
+
+ $utmGifLocation = "http://www.google-analytics.com/__utm.gif";
+
+ // Construct the gif hit url.
+ $utmUrl = $utmGifLocation . "?" .
+ "utmwv=" . VERSION .
+ "&utmn=" . getRandomNumber() .
+ "&utmhn=" . urlencode($domainName) .
+ "&utmr=" . urlencode($documentReferer) .
+ "&utmp=" . urlencode($documentPath) .
+ "&utmac=" . $account .
+ "&utmcc=__utma%3D999.999.999.999.999.1%3B" .
+ "&utmvid=" . $visitorId .
+ "&utmip=" . getIP($_SERVER["REMOTE_ADDR"]);
+
+ sendRequestToGoogleAnalytics($utmUrl);
+
+ // If the debug parameter is on, add a header to the response that contains
+ // the url that was used to contact Google Analytics.
+ if (!empty($_GET["utmdebug"])) {
+ header("X-GA-MOBILE-URL:" . $utmUrl);
+ }
+ // Finally write the gif data to the response.
+ writeGifData();
+ }
+?><?php
+ trackPageView();
+?>
+
--- a/index.php
+++ b/index.php
@@ -5,9 +5,10 @@
<div data-role="page">
<div data-role="content">
<div id="jqm-homeheader">
- <center><h3>busness time</h3><br><small>Canberra Bus Timetables and Trip Planner</small></center>
+ <h1>busness time</h1><br><small>Canberra Bus Timetables and Trip Planner</small>
</div>
- <a href="tripPlanner.php" data-role="button" data-icon="navigation">Launch Trip Planner...</a>
+ <a name="maincontent" id="maincontent"></a>
+ <a href="tripPlanner.php" data-role="button" data-icon="navigation">Launch Trip Planner...</a>
<ul data-role="listview" data-inset="true" data-theme="c" data-dividertheme="b">
<li data-role="list-divider">Timetables - Stops</li>
<li><a href="stopList.php">Major (Timing Point) Stops</a></li>
@@ -19,6 +20,7 @@
<li data-role="list-divider">Timetables - Routes</li>
<li><a href="routeList.php">Routes By Final Destination</a></li>
<li><a href="routeList.php?bynumber=yes">Routes By Number</a></li>
+ <li><a href="routeList.php?bysuburb=yes">Routes By Suburb</a></li>
<li><a class="nearby" href="routeList.php?nearby=yes">Nearby Routes</a></li>
</ul>
<?php
--- a/routeList.php
+++ b/routeList.php
@@ -1,7 +1,8 @@
<?php
include ('common.inc.php');
-include_header("Routes", "routeList");
-echo '
+function navbar()
+{
+ echo '
<div data-role="navbar">
<ul>
<li><a href="routeList.php">By Final Destination...</a></li>
@@ -11,16 +12,57 @@
</ul>
</div>
';
-echo ' <ul data-role="listview" data-inset="true">';
-$url = $APIurl . "/json/routes";
-$contents = json_decode(getPage($url));
-function printRoutes($routes)
-{
+}
+if ($_REQUEST['bysuburb']) {
+ include_header("Routes by Suburb", "routeList");
+ navbar();
+ echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';
+ if (!isset($_REQUEST['firstLetter'])) {
+ foreach (range('A', 'Z') as $letter) {
+ echo "<li><a href=\"routeList.php?firstLetter=$letter&bysuburb=yes\">$letter...</a></li>\n";
+ }
+ }
+ else {
+ foreach ($suburbs as $suburb) {
+ if (startsWith($suburb, $_REQUEST['firstLetter'])) {
+ echo '<li><a href="routeList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>';
+ }
+ }
+ }
+ echo '</ul>';
+}
+else if ($_REQUEST['nearby'] || $_REQUEST['suburb']) {
+ if ($_REQUEST['suburb']) {
+ $suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);
+ $url = $APIurl . "/json/stopzonesearch?q=" . $suburb;
+ include_header("Routes by Suburb", "routeList");
+ }
+ if ($_REQUEST['nearby']) {
+ $url = $APIurl . "/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15";
+ include_header("Routes Nearby", "routeList");
+ }
+ $stops = json_decode(getPage($url));
+ $routes = Array();
+ foreach ($stops as $stop) {
+ $url = $APIurl . "/json/stoproutes?stop=" . $stop[0];
+ $stoproutes = json_decode(getPage($url));
+ foreach ($stoproutes as $route) {
+ if (!isset($routes[$route[0]])) $routes[$route[0]] = $route;
+ }
+ }
+ navbar();
+ echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';
+ sksort($routes, 1, true);
foreach ($routes as $row) {
- echo '<li>' . $row[1] . ' <a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . " (" . ucwords($row[3]) . ")</a></li>\n";
+ echo '<li>' . $row[1] . ' <a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . " (" . ucwords($row[4]) . ")</a></li>\n";
}
}
-if ($_REQUEST['bynumber']) {
+else if ($_REQUEST['bynumber']) {
+ include_header("Routes by Number", "routeList");
+ navbar();
+ echo ' <ul data-role="listview" data-inset="true">';
+ $url = $APIurl . "/json/routes";
+ $contents = json_decode(getPage($url));
$routeSeries = Array();
$seriesRange = Array();
foreach ($contents as $key => $row) {
@@ -54,11 +96,19 @@
echo '<a name="' . $series . '"></a>';
if ($series <= 9) echo '<li>' . $series . "<ul>\n";
else echo "<li>{$seriesRange[$series]['min']}-{$seriesRange[$series]['max']}<ul>\n";
- printRoutes($routes);
+ foreach ($routes 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 {
+ include_header("Routes by Destination", "routeList");
+ navbar();
+ echo ' <ul data-role="listview" data-inset="true">';
+ $url = $APIurl . "/json/routes";
+ $contents = json_decode(getPage($url));
+ // by destination!
foreach ($contents as $key => $row) {
$routeDestinations[$row[2]][] = $row;
}
@@ -73,7 +123,9 @@
foreach ($routeDestinations as $destination => $routes) {
echo '<a name="' . $destination . '"></a>';
echo '<li>' . $destination . "... <ul>\n";
- printRoutes($routes);
+ foreach ($routes 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";
}
}
--- a/schedule_viewer.py
+++ b/schedule_viewer.py
@@ -281,6 +281,23 @@
result.append( (r.route_id, r.route_short_name, r.route_long_name, servicep.service_id) )
result.sort(key = lambda x: x[1:3])
return result
+
+ def handle_json_GET_routesearch(self, params):
+ """Return a list of routes with matching short name."""
+ schedule = self.server.schedule
+ routeshortname = params.get('routeshortname', None)
+ result = []
+ for r in schedule.GetRouteList():
+ if r.route_short_name == routeshortname:
+ servicep = None
+ for t in schedule.GetTripList():
+ if t.route_id == r.route_id:
+ servicep = t.service_period
+ break
+ result.append( (r.route_id, r.route_short_name, r.route_long_name, servicep.service_id) )
+ result.sort(key = lambda x: x[1:3])
+ return result
+
def handle_json_GET_routerow(self, params):
schedule = self.server.schedule
@@ -477,8 +494,8 @@
result = {}
for trip in trips:
route = schedule.GetRoute(trip.route_id)
- if not trip.route_short_name+route.route_long_name in result:
- result[trip.route_short_name+route.route_long_name] = (route.route_id, route.route_short_name, route.route_long_name, trip.trip_id)
+ if not route.route_short_name+route.route_long_name+trip.service_id in result:
+ result[route.route_short_name+route.route_long_name+trip.service_id] = (route.route_id, route.route_short_name, route.route_long_name, trip.trip_id, trip.service_id)
return result
def handle_json_GET_stopalltrips(self, params):
@@ -509,6 +526,8 @@
if service_period == None or trip.service_id == service_period:
result.append((time, (trip.trip_id, trip_name, trip.service_id), tp))
return result
+
+
def handle_json_GET_stoptrips(self, params):
"""Given a stop_id and time in seconds since midnight return the next
--- a/stop.php
+++ b/stop.php
@@ -48,7 +48,7 @@
}
include_header($stop[1], "stop");
timePlaceSettings();
-echo '<div data-role="content" class="ui-content" role="main">';
+echo '<div data-role="content" class="ui-content" role="main"> <a name="maincontent" id="maincontent"></a>';
echo $stopLinks;
if (sizeof($stops) > 0) {
echo '<p>' . staticmap($stopPositions) . '</p>';
@@ -72,10 +72,8 @@
foreach ($trips as $row) {
echo '<li>';
echo '<h3><a href="trip.php?stopid=' . $stopid . '&tripid=' . $row[1][0] . '">' . $row[1][1];
- if (isFastDevice()) {
- $viaPoints = viaPointNames($row[1][0], $stopid);
- if ($viaPoints != "") echo '<br><small>Via: ' . $viaPoints . '</small>';
- }
+ $viaPoints = viaPointNames($row[1][0], $stopid);
+ if ($viaPoints != "") echo '<div class="viaPoints">Via: ' . $viaPoints . '</div>';
if (sizeof($tripStopNumbers) > 0) {
echo '<br><small>Boarding At: ';
foreach ($tripStopNumbers[$row[1][0]] as $key) {
--- a/stopList.php
+++ b/stopList.php
@@ -1,7 +1,8 @@
<?php
include ('common.inc.php');
-function filterByFirstLetter($var) {
- return $var[1][0] == $_REQUEST['firstLetter'];
+function filterByFirstLetter($var)
+{
+ return $var[1][0] == $_REQUEST['firstLetter'];
}
function navbar()
{
@@ -21,14 +22,16 @@
include_header("Stops by Suburb", "stopList");
navbar();
echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';
- foreach ($suburbs as $suburb) {
- if (!isset($_REQUEST['firstLetter'])) {
- foreach (range('A', 'Z') as $letter) {
- echo "<li><a href=\"stopList.php?firstLetter=$letter&suburbs=yes\">$letter...</a></li>\n";
+ 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 {
+ foreach ($suburbs as $suburb) {
+ if (startsWith($suburb, $_REQUEST['firstLetter'])) {
+ echo '<li><a href="stopList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>';
}
- }
- else if (startsWith($suburb, $_REQUEST['firstLetter'])) {
- echo '<li><a href="stopList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>';
}
}
echo '</ul>';
@@ -48,6 +51,10 @@
include_header("Nearby Stops", "stopList");
navbar();
timePlaceSettings(true);
+ if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") {
+ include_footer();
+ die();
+ }
}
else if ($_REQUEST['suburb']) {
$suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);
@@ -63,7 +70,7 @@
timePlaceSettings();
}
echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';
- if (!isset($_REQUEST['firstLetter']) && !$_REQUEST['suburb']) {
+ if (!isset($_REQUEST['firstLetter']) && !$_REQUEST['suburb'] && !$_REQUEST['nearby']) {
foreach (range('A', 'Z') as $letter) {
echo "<li><a href=\"stopList.php?firstLetter=$letter&$listType\">$letter...</a></li>\n";
}
@@ -75,48 +82,47 @@
}
// Sort the stops by name
array_multisort($stopName, SORT_ASC, $stops);
- if (!isset($_REQUEST['suburb'])){
- $stops = array_filter($stops, "filterByFirstLetter");
+ 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)) {
- 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[