Refactor stop time interpolation
--- a/include/common-geo.inc.php
+++ b/include/common-geo.inc.php
@@ -70,6 +70,7 @@
else return round($km,2)."k";
} else return floor($km * 1000);
}
+
function decodePolylineToArray($encoded)
{
// source: http://latlongeeks.com/forum/viewtopic.php?f=4&t=5
--- a/include/common-session.inc.php
+++ b/include/common-session.inc.php
@@ -17,7 +17,6 @@
}
else {
$geolocate = filter_var($_REQUEST['geolocate'], FILTER_SANITIZE_URL);
- echo $_REQUEST['geolocate'];
if (startsWith($geolocate, "-")) {
$locateparts = explode(",", $geolocate);
$_SESSION['lat'] = $locateparts[0];
--- a/include/common-template.inc.php
+++ b/include/common-template.inc.php
@@ -1,28 +1,27 @@
<?php
- // Copyright 2009 Google Inc. All Rights Reserved.
- $GA_ACCOUNT = "MO-22173039-1";
- $GA_PIXEL = "/lib/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);
- }
-
+// Copyright 2009 Google Inc. All Rights Reserved.
+$GA_ACCOUNT = "MO-22173039-1";
+$GA_PIXEL = "/lib/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 '
@@ -34,27 +33,34 @@
<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.0a4.css" />
+ if (isDebugServer()) {
+ echo '<link rel="stylesheet" href="css/jquery.mobile-1.0a4.css" />
+
<script type="text/javascript" src="js/jquery-1.5.js"></script>
<script>$(document).bind("mobileinit", function(){
$.mobile.ajaxEnabled = false;
});
</script>
<script type="text/javascript" src="js/jquery.mobile-1.0a4.js"></script>';
- else echo '<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a4/jquery.mobile-1.0a4.min.css" />
+ }
+ else {
+ echo '<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a4.1/jquery.mobile-1.0a4.1.min.css" />
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js"></script>
<script>$(document).bind("mobileinit", function(){
$.mobile.ajaxEnabled = false;
});
</script>
- <script type="text/javascript" src="http://code.jquery.com/mobile/1.0a4/jquery.mobile-1.0a4.min.js"></script>';
- if ($datepicker) echo '<script>
+ <script type="text/javascript" src="http://code.jquery.com/mobile/1.0a4.1/jquery.mobile-1.0a4.1.min.js"></script>';
+ }
+ if ($datepicker) {
+ echo '<script>
//reset type=date inputs to text
$( document ).bind( "mobileinit", function(){
$.mobile.page.prototype.options.degradeInputs.date = true;
});
</script>
<script src="js/jQuery.ui.datepicker.js"></script>';
+ }
echo '<style type="text/css">
.ui-navbar {
width: 100%;
@@ -145,17 +151,17 @@
$('#here').show();
});
";
-if (!isset($_SESSION['lat']) || $_SESSION['lat'] == "") echo "geolocate();";
-echo "</script> ";
+ if (!isset($_SESSION['lat']) || $_SESSION['lat'] == "") echo "geolocate();";
+ echo "</script> ";
}
if (isAnalyticsOn()) echo '
-<script type="text/javascript">'."
+<script type="text/javascript">' . "
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-22173039-1']);
_gaq.push(['_trackPageview']);
</script>";
-echo '</head>
+ echo '</head>
<body>
<div id="skip">
<a href="#maincontent">Skip to content</a>
@@ -170,7 +176,7 @@
});
</script>
<div data-role="header" data-position="inline">
- <a href="'.$_SERVER["HTTP_REFERER"].'" data-icon="arrow-l" data-rel="back" class="ui-btn-left">Back</a>
+ <a href="' . $_SERVER["HTTP_REFERER"] . '" data-icon="arrow-l" data-rel="back" class="ui-btn-left">Back</a>
<h1>' . $pageTitle . '</h1>
<a href="/index.php" data-icon="home" class="ui-btn-right">Home</a>
</div><!-- /header -->
@@ -182,8 +188,8 @@
{
echo '<div id="footer"><a href="about.php">About/Contact Us</a> <a href="feedback.php">Feedback/Bug Report</a></a>';
echo '</div>';
- if (isAnalyticsOn()) {
- echo "<script> (function() {
+ if (isAnalyticsOn()) {
+ echo "<script> (function() {
var ga = document.createElement('script'); ga.type =
'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ?
@@ -191,9 +197,9 @@
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
})();</script>";
- $googleAnalyticsImageUrl = googleAnalyticsGetImageUrl();
- echo '<noscript><img src="' . $googleAnalyticsImageUrl . '" /></noscript>';
- }
+ $googleAnalyticsImageUrl = googleAnalyticsGetImageUrl();
+ echo '<noscript><img src="' . $googleAnalyticsImageUrl . '" /></noscript>';
+ }
}
function timePlaceSettings($geolocate = false)
{
@@ -209,7 +215,7 @@
}
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="'.basename($_SERVER['PHP_SELF'])."?".$_SERVER['QUERY_STRING'].'" method="post">
+ <form action="' . basename($_SERVER['PHP_SELF']) . "?" . $_SERVER['QUERY_STRING'] . '" method="post">
<div class="ui-body">
<div data-role="fieldcontain">
<label for="geolocate"> Current Location: </label>
@@ -218,7 +224,7 @@
<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" onClick="var d = new Date();'. "$('#time').val(d.getHours() +':'+ (d.getMinutes().toString().length = 1 ? '0'+ d.getMinutes(): d.getMinutes()));".'">Current Time?</a>
+ <a href="#" name="currentTime" id="currentTime" onClick="var d = new Date();' . "$('#time').val(d.getHours() +':'+ (d.getMinutes().toString().length = 1 ? '0'+ d.getMinutes(): d.getMinutes()));" . '">Current Time?</a>
</div>
<div data-role="fieldcontain">
<label for="service_period"> Service Period: </label>
@@ -234,10 +240,11 @@
</form>
</div></div>';
}
-function trackEvent($category, $action, $label = "", $value = -1) {
- if (isAnalyticsOn()) {
- echo "\n<script> _gaq.push(['_trackEvent', '$category', '$action'".($label != "" ? ", '$label'" : "").($value != -1 ? ", $value" : "")."]);</script>";
- }
+function trackEvent($category, $action, $label = "", $value = - 1)
+{
+ if (isAnalyticsOn()) {
+ echo "\n<script> _gaq.push(['_trackEvent', '$category', '$action'" . ($label != "" ? ", '$label'" : "") . ($value != - 1 ? ", $value" : "") . "]);</script>";
+ }
}
?>
--- a/include/db/route-dao.inc.php
+++ b/include/db/route-dao.inc.php
@@ -12,19 +12,7 @@
}
function getRoutes() {
global $conn;
- $conditions = Array();
- if ($timingPointsOnly) $conditions[] = "substr(stop_code,1,2) != 'Wj'";
- if ($firstLetter != "") $conditions[] = "substr(stop_name,1,1) = '$firstLetter'";
- $query = "Select * from routes";
- if (sizeof($conditions) > 0) {
- if (sizeof($conditions) > 1) {
- $query .= " Where ".implode(" AND ",$conditions)." ";
- }
- else {
- $query .= " Where ".$conditions[0]." ";
- }
- }
- $query .= " order by route_short_name;";
+ $query = "Select * from routes order by route_short_name;";
debug($query,"database");
$result = pg_query($conn, $query);
if (!$result) {
@@ -34,9 +22,14 @@
return pg_fetch_all($result);
}
-function findRouteByNumber($routeNumber) {
+function getRoutesByNumber($routeNumber = "") {
global $conn;
- $query = "Select * from routes where route_short_name = '$routeNumber';";
+ if ($routeNumber != "") {
+ $query = "Select distinct routes.route_id,routes.route_short_name,routes.route_long_name,service_id from routes join trips on trips.route_id =
+routes.route_id join stop_times on stop_times.trip_id = trips.trip_id where route_short_name = '$routeNumber' order by route_short_name;";
+ } else {
+ $query = "SELECT DISTINCT route_short_name from routes order by route_short_name";
+ }
debug($query,"database");
$result = pg_query($conn, $query);
if (!$result) {
@@ -57,7 +50,71 @@
databaseError(pg_result_error($result));
return Array();
}
- return pg_fetch_assoc($result); /*
+ return pg_fetch_assoc($result);
}
+function getRoutesByDestination($destination = "", $service_period = "") {
+ global $conn;
+ if ($service_period == "") $service_period = service_period();
+ if ($destination != "") {
+ $query = "SELECT DISTINCT trips.route_id,route_short_name,route_long_name, service_id
+FROM stop_times join trips on trips.trip_id =
+stop_times.trip_id join routes on trips.route_id = routes.route_id
+WHERE route_long_name = '$destination' AND service_id='$service_period' order by route_short_name";
+ } else {
+ $query = "SELECT DISTINCT route_long_name
+FROM stop_times join trips on trips.trip_id =
+stop_times.trip_id join routes on trips.route_id = routes.route_id
+WHERE service_id='$service_period' order by route_long_name";
+ }
+ debug($query,"database");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ return pg_fetch_all($result);
+}
+
+function getRoutesBySuburb($suburb, $service_period = "") {
+ if ($service_period == "") $service_period = service_period();
+ global $conn;
+ $query = "SELECT DISTINCT service_id,trips.route_id,route_short_name,route_long_name
+FROM stop_times join trips on trips.trip_id = stop_times.trip_id
+join routes on trips.route_id = routes.route_id
+join stops on stops.stop_id = stop_times.stop_id
+WHERE zone_id LIKE '%$suburb;%' AND service_id='$service_period' ORDER BY route_short_name";
+ debug($query,"database");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ return pg_fetch_all($result);
+}
+
+function getRoutesNearby($lat, $lng, $limit = "", $distance = 500) {
+
+
+ if ($service_period == "") $service_period = service_period();
+ if ($limit != "") $limit = " LIMIT $limit ";
+ global $conn;
+ $query = "SELECT service_id,trips.route_id,route_short_name,route_long_name,
+ min(ST_Distance(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), FALSE)) as distance
+FROM stop_times
+join trips on trips.trip_id = stop_times.trip_id
+join routes on trips.route_id = routes.route_id
+join stops on stops.stop_id = stop_times.stop_id
+WHERE service_id='$service_period'
+AND ST_DWithin(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), $distance, FALSE)
+ group by service_id,trips.route_id,route_short_name,route_long_name
+ order by distance $limit";
+ debug($query,"database");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ return pg_fetch_all($result);
+}
?>
--- a/include/db/stop-dao.inc.php
+++ b/include/db/stop-dao.inc.php
@@ -1,33 +1,33 @@
<?php
function getStop($stopID)
{
-global $conn;
- $query = "Select * from stops where stop_id = '$stopID' LIMIT 1";
- debug($query,"database");
+ global $conn;
+ $query = "Select * from stops where stop_id = '$stopID' LIMIT 1";
+ debug($query, "database");
$result = pg_query($conn, $query);
if (!$result) {
databaseError(pg_result_error($result));
return Array();
}
- return pg_fetch_assoc($result);
+ return pg_fetch_assoc($result);
}
function getStops($timingPointsOnly = false, $firstLetter = "")
{
global $conn;
- $conditions = Array();
- if ($timingPointsOnly) $conditions[] = "substr(stop_code,1,2) != 'Wj'";
- if ($firstLetter != "") $conditions[] = "substr(stop_name,1,1) = '$firstLetter'";
+ $conditions = Array();
+ if ($timingPointsOnly) $conditions[] = "substr(stop_code,1,2) != 'Wj'";
+ if ($firstLetter != "") $conditions[] = "substr(stop_name,1,1) = '$firstLetter'";
$query = "Select * from stops";
- if (sizeof($conditions) > 0) {
- if (sizeof($conditions) > 1) {
- $query .= " Where ".implode(" AND ",$conditions)." ";
- }
- else {
- $query .= " Where ".$conditions[0]." ";
- }
- }
- $query .= " order by stop_name;";
- debug($query,"database");
+ if (sizeof($conditions) > 0) {
+ if (sizeof($conditions) > 1) {
+ $query.= " Where " . implode(" AND ", $conditions) . " ";
+ }
+ else {
+ $query.= " Where " . $conditions[0] . " ";
+ }
+ }
+ $query.= " order by stop_name;";
+ debug($query, "database");
$result = pg_query($conn, $query);
if (!$result) {
databaseError(pg_result_error($result));
@@ -35,14 +35,15 @@
}
return pg_fetch_all($result);
}
-function getNearbyStops($lat, $lng, $limit, $distance = 1000)
+function getNearbyStops($lat, $lng, $limit = "", $distance = 1000)
{
- if ($lat == null || $lng == null) return Array();
- global $conn;
- $query = "Select *, ST_Distance(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), FALSE) as distance
+ if ($lat == null || $lng == null) return Array();
+ if ($limit != "") $limit = " LIMIT $limit ";
+ global $conn;
+ $query = "Select *, ST_Distance(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), FALSE) as distance
from stops WHERE ST_DWithin(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), $distance, FALSE)
- order by distance;";
- debug($query,"database");
+ order by distance $limit;";
+ debug($query, "database");
$result = pg_query($conn, $query);
if (!$result) {
databaseError(pg_result_error($result));
@@ -52,9 +53,9 @@
}
function getStopsBySuburb($suburb)
{
-global $conn;
- $query = "Select * from stops where zone_id LIKE '%$suburb;%' order by stop_name;";
- debug($query,"database");
+ global $conn;
+ $query = "Select * from stops where zone_id LIKE '%$suburb;%' order by stop_name;";
+ debug($query, "database");
$result = pg_query($conn, $query);
if (!$result) {
databaseError(pg_result_error($result));
@@ -64,58 +65,79 @@
}
function getStopRoutes($stopID, $service_period)
{
- if ($service_period == "") $service_period = service_period();
- global $conn;
- $query = "SELECT service_id,trips.route_id,route_short_name,route_long_name
+ if ($service_period == "") $service_period = service_period();
+ global $conn;
+ $query = "SELECT service_id,trips.route_id,route_short_name,route_long_name
FROM stop_times join trips on trips.trip_id =
stop_times.trip_id join routes on trips.route_id = routes.route_id WHERE stop_id = '$stopID' AND service_id='$service_period'";
- debug($query,"database");
- $result = pg_query($conn, $query);
- if (!$result) {
- databaseError(pg_result_error($result));
- return Array();
- }
- return pg_fetch_all($result);}
-function getStopTrips($stopID, $service_period = "")
-{
- if ($service_period == "") $service_period = service_period();
- global $conn;
- $query = "SELECT stop_times.trip_id,arrival_time,stop_id,stop_sequence,service_id,trips.route_id,route_short_name,route_long_name
-FROM stop_times join trips on trips.trip_id =
-stop_times.trip_id join routes on trips.route_id = routes.route_id WHERE stop_id = '$stopID' AND service_id='$service_period'";
- debug($query,"database");
+ debug($query, "database");
$result = pg_query($conn, $query);
if (!$result) {
databaseError(pg_result_error($result));
return Array();
}
return pg_fetch_all($result);
-
+}
+function getStopTrips($stopID, $service_period = "", $afterTime = "")
+{
+ if ($service_period == "") $service_period = service_period();
+ $afterCondition = "AND arrival_time > '$afterTime'";
+ global $conn;
+ if ($afterTime != "") {
+ $query = " SELECT stop_times.trip_id,stop_times.arrival_time,stop_times.stop_id,stop_sequence,service_id,trips.route_id,route_short_name,route_long_name, start_times.arrival_time as start_time
+FROM stop_times
+join trips on trips.trip_id =
+stop_times.trip_id
+join routes on trips.route_id = routes.route_id , (SELECT trip_id,arrival_time from stop_times
+ WHERE stop_times.arrival_time IS NOT NULL
+ AND stop_sequence = '1') as start_times
+WHERE stop_times.stop_id = '$stopID'
+AND stop_times.trip_id = start_times.trip_id
+AND service_id='$service_period'
+AND start_times.arrival_time > '$afterTime'
+ORDER BY start_time";
+ }
+ else {
+ $query = "SELECT stop_times.trip_id,arrival_time,stop_times.stop_id,stop_sequence,service_id,trips.route_id,route_short_name,route_long_name
+FROM stop_times
+join trips on trips.trip_id =
+stop_times.trip_id
+join routes on trips.route_id = routes.route_id
+WHERE stop_times.stop_id = '$stopID'
+AND service_id='$service_period'
+ORDER BY arrival_time";
+ }
+ debug($query, "database");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ return pg_fetch_all($result);
}
function getStopTripsWithTimes($stopID, $time = "", $service_period = "", $time_range = "")
{
- if ($service_period == "") $service_period = service_period();
- if ($time_range == "") $time_range = (24*60*60);
- if ($time == "") $time = ($_SESSION['time'] ? $_SESSION['time'] : date("h:i:00"));
- $trips = getStopTrips($stopID,$service_period);
- $timedTrips = Array();
- foreach ($trips as $trip) {
- if ($trip['arrival_time'] != "") {
- if (strtotime($trip['arrival_time']) > strtotime($time) and strtotime($trip['arrival_time']) < (strtotime($time) + $time_range)){
- $timedTrips[] = $trip;
- }
- } else {
- $tripstarttime = getTripStartTime($trip['trip_id']);
- if ($tripstarttime > $time and $tripstarttime < ($time + $time_range)) {
- $timedtrip = getTimeInterpolatedTripStop($trip['trip_id'], $trip['stop_sequence']);
- if (strtotime($timedtrip['arrival_time']) > strtotime($time) and $timedtrip['arrival_time'] < (strtotime($time) + strtotime($time_range))){
- $timedTrips[] = $timedTrip;
- }
- }
- }
- if (sizeof($timedTrips) > limit) break;
- }
- sktimesort($timedTrips,"arrival_time", true);
- return $timedTrips;
+ if ($service_period == "") $service_period = service_period();
+ if ($time_range == "") $time_range = (24 * 60 * 60);
+ if ($time == "") $time = ($_SESSION['time'] ? $_SESSION['time'] : date("H:i:s"));
+ if ($limit == "") $limit = 10;
+ $trips = getStopTrips($stopID, $service_period, $time);
+ $timedTrips = Array();
+ foreach ($trips as $trip) {
+ if ($trip['arrival_time'] != "") {
+ if (strtotime($trip['arrival_time']) > strtotime($time) and strtotime($trip['arrival_time']) < (strtotime($time) + $time_range)) {
+ $timedTrips[] = $trip;
+ }
+ }
+ else {
+ $timedTrip = getTimeInterpolatedTripAtStop($trip['trip_id'], $trip['stop_sequence']);
+ if ($timedTrip['arrival_time'] > $time and strtotime($timedTrip['arrival_time']) < (strtotime($time) + $time_range)) {
+ $timedTrips[] = $timedTrip;
+ }
+ }
+ if (sizeof($timedTrips) > $limit) break;
+ }
+ sktimesort($timedTrips, "arrival_time", true);
+ return $timedTrips;
}
?>
--- a/include/db/trip-dao.inc.php
+++ b/include/db/trip-dao.inc.php
@@ -1,109 +1,143 @@
<?php
-function getTrip($tripID) {
- global $conn;
- $query = "Select * from trips where trip_id = '$tripID' join routes on trips.route_id = routes.route_id LIMIT 1";
- debug($query,"database");
+function getTrip($tripID)
+{
+ global $conn;
+ $query = "Select * from trips where trip_id = '$tripID' join routes on trips.route_id = routes.route_id LIMIT 1";
+ debug($query, "database");
$result = pg_query($conn, $query);
if (!$result) {
databaseError(pg_result_error($result));
return Array();
}
- return pg_fetch_assoc($result);
- }
-function getTripShape() {
- /* def handle_json_GET_tripstoptimes(self, params):
- schedule = self.server.schedule
- try:
- trip = schedule.GetTrip(params.get('trip'))
- except KeyError:
- # if a non-existent trip is searched for, the return nothing
- return
- time_stops = trip.GetTimeInterpolatedStops()
- stops = []
- times = []
- for arr,ts,is_timingpoint in time_stops:
- stops.append(StopToTuple(ts.stop))
- times.append(arr)
- return [stops, times]
-
- def handle_json_GET_tripshape(self, params):
- schedule = self.server.schedule
- try:
- trip = schedule.GetTrip(params.get('trip'))
- except KeyError:
- # if a non-existent trip is searched for, the return nothing
- return
- points = []
- if trip.shape_id:
- shape = schedule.GetShape(trip.shape_id)
- for (lat, lon, dist) in shape.points:
- points.append((lat, lon))
- else:
- time_stops = trip.GetTimeStops()
- for arr,dep,stop in time_stops:
- points.append((stop.stop_lat, stop.stop_lon))
- return points*/
+ return pg_fetch_assoc($result);
}
-function getTimeInterpolatedTrip($tripID) {
- /* rv = []
-
- stoptimes = self.GetStopTimes()
- # If there are no stoptimes [] is the correct return value but if the start
- # or end are missing times there is no correct return value.
- if not stoptimes:
- return []
- if (stoptimes[0].GetTimeSecs() is None or
- stoptimes[-1].GetTimeSecs() is None):
- raise ValueError("%s must have time at first and last stop" % (self))
-
- cur_timepoint = None
- next_timepoint = None
- distance_between_timepoints = 0
- distance_traveled_between_timepoints = 0
-
- for i, st in enumerate(stoptimes):
- if st.GetTimeSecs() != None:
- cur_timepoint = st
- distance_between_timepoints = 0
- distance_traveled_between_timepoints = 0
- if i + 1 < len(stoptimes):
- k = i + 1
- distance_between_timepoints += util.ApproximateDistanceBetweenStops(stoptimes[k-1].stop, stoptimes[k].stop)
- while stoptimes[k].GetTimeSecs() == None:
- k += 1
- distance_between_timepoints += util.ApproximateDistanceBetweenStops(stoptimes[k-1].stop, stoptimes[k].stop)
- next_timepoint = stoptimes[k]
- rv.append( (st.GetTimeSecs(), st, True) )
- else:
- distance_traveled_between_timepoints += util.ApproximateDistanceBetweenStops(stoptimes[i-1].stop, st.stop)
- distance_percent = distance_traveled_between_timepoints / distance_between_timepoints
- total_time = next_timepoint.GetTimeSecs() - cur_timepoint.GetTimeSecs()
- time_estimate = distance_percent * total_time + cur_timepoint.GetTimeSecs()
- rv.append( (int(round(time_estimate)), st, False) )
-
- return rv*/
+function getTripShape()
+{
+ /* def handle_json_GET_tripstopTimes(self, params):
+ schedule = self.server.schedule
+ try:
+ trip = schedule.GetTrip(params.get('trip'))
+ except KeyError:
+ # if a non-existent trip is searched for, the return nothing
+ return
+ time_stops = trip.GetTimeInterpolatedStops()
+ stops = []
+ times = []
+ for arr,ts,is_timingpoint in time_stops:
+ stops.append(StopToTuple(ts.stop))
+ times.append(arr)
+ return [stops, times]
+
+ def handle_json_GET_tripshape(self, params):
+ schedule = self.server.schedule
+ try:
+ trip = schedule.GetTrip(params.get('trip'))
+ except KeyError:
+ # if a non-existent trip is searched for, the return nothing
+ return
+ points = []
+ if trip.shape_id:
+ shape = schedule.GetShape(trip.shape_id)
+ for (lat, lon, dist) in shape.points:
+ points.append((lat, lon))
+ else:
+ time_stops = trip.GetTimeStops()
+ for arr,dep,stop in time_stops:
+ points.append((stop.stop_lat, stop.stop_lon))
+ return points*/
}
-function getTimeInterpolatedTripAtStop($trip_id, $stop_sequence) {
- foreach(getTimeInterpolatedTrip($tripID) as $tripStop) {
- if ($tripStop['stop_sequence'] == $stop_sequence) return $tripStop;
- }
- return Array();
+function getTimeInterpolatedTrip($tripID)
+{
+ global $conn;
+ $query = "SELECT stop_times.trip_id,arrival_time,stop_times.stop_id,stop_lat,stop_lon,
+ stop_sequence,service_id,trips.route_id,route_short_name,route_long_name
+FROM stop_times
+join trips on trips.trip_id = stop_times.trip_id
+join routes on trips.route_id = routes.route_id
+join stops on stops.stop_id = stop_times.stop_id
+WHERE trips.trip_id = '$tripID' ORDER BY stop_sequence";
+ debug($query, "database");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ $stopTimes = pg_fetch_all($result);
+ $cur_timepoint = Array();
+ $next_timepoint = Array();
+ $distance_between_timepoints = 0.0;
+ $distance_traveled_between_timepoints = 0.0;
+ $rv = Array();
+ foreach ($stopTimes as $i => $stopTime) {
+ if ($stopTime['arrival_time'] != "") {
+ // is timepoint
+ $cur_timepoint = $stopTime;
+ $distance_between_timepoints = 0.0;
+ $distance_traveled_between_timepoints = 0.0;
+ if ($i + 1 < sizeof($stopTimes)) {
+ $k = $i + 1;
+ $distance_between_timepoints += distance($stopTimes[$k - 1]["stop_lat"], $stopTimes[$k - 1]["stop_lon"], $stopTimes[$k]["stop_lat"], $stopTimes[$k]["stop_lon"]);
+ while ($stopTimes[$k]["arrival_time"] == "" && $k + 1 < sizeof($stopTimes)) {
+ $k += 1;
+ //echo "k".$k;
+ $distance_between_timepoints += distance($stopTimes[$k - 1]["stop_lat"], $stopTimes[$k - 1]["stop_lon"], $stopTimes[$k]["stop_lat"], $stopTimes[$k]["stop_lon"]);
+ }
+ $next_timepoint = $stopTimes[$k];
+ $rv[] = $stopTime;
+ }
+ }
+ else {
+ // is untimed point
+ //echo "i".$i;
+ $distance_traveled_between_timepoints += distance($stopTimes[$i - 1]["stop_lat"], $stopTimes[$i - 1]["stop_lon"], $stopTimes[$i]["stop_lat"], $stopTimes[$i]["stop_lon"]);
+ //echo "$distance_traveled_between_timepoints / $distance_between_timepoints<br>";
+ $distance_percent = $distance_traveled_between_timepoints / $distance_between_timepoints;
+ if ($next_timepoint["arrival_time"] != "") {
+ $total_time = strtotime($next_timepoint["arrival_time"]) - strtotime($cur_timepoint["arrival_time"]);
+ //echo strtotime($next_timepoint["arrival_time"])." - ".strtotime($cur_timepoint["arrival_time"])."<br>";
+ $time_estimate = ($distance_percent * $total_time) + strtotime($cur_timepoint["arrival_time"]);
+ $stopTime["arrival_time"] = date("H:i:s", $time_estimate);
+ } else {
+ $stopTime["arrival_time"] = $cur_timepoint["arrival_time"];
+ }
+ $rv[] = $stopTime;
+ //var_dump($rv);
+ }
+ }
+ return $rv;
}
-
-function getTripStartTime($tripID) {
- $query = 'SELECT arrival_secs,departure_secs FROM stop_times WHERE trip_id=? ORDER BY stop_sequence LIMIT 1';
-
+function getTimeInterpolatedTripAtStop($tripID, $stop_sequence)
+{
+ foreach (getTimeInterpolatedTrip($tripID) as $tripStop) {
+ if ($tripStop['stop_sequence'] == $stop_sequence) return $tripStop;
+ }
+ return Array();
}
-
+function getTripStartTime($tripID)
+{
+ global $conn;
+ $query = "Select * from stop_times
+ where trip_id = '$tripID'
+ AND arrival_time IS NOT NULL
+ AND stop_sequence = '1'";
+ debug($query, "database");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ $r = pg_fetch_assoc($result);
+ return $r['arrival_time'];
+}
function viaPointNames($tripid, $stopid)
{
- global $conn;
- $query = "SELECT stop_name
+ global $conn;
+ $query = "SELECT stop_name
FROM stop_times join stops on stops.stop_id = stop_times.stop_id
WHERE stop_times.trip_id = '$tripid'
AND stop_sequence > '$stop_sequence'
AND substr(stop_code,1,2) != 'Wj' ORDER BY stop_sequence";
- debug($query,"database");
+ debug($query, "database");
$result = pg_query($conn, $query);
if (!$result) {
databaseError(pg_result_error($result));
--- a/routeList.php
+++ b/routeList.php
@@ -32,62 +32,62 @@
echo '</ul>';
}
else if ($_REQUEST['nearby'] || $_REQUEST['suburb']) {
+ $routes = Array();
if ($_REQUEST['suburb']) {
$suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);
- $url = $APIurl . "/json/stopzonesearch?q=" . $suburb;
- include_header("Routes by Suburb", "routeList");
- trackEvent(