Upgrade to jQuery Mobile Alpha 4.1 in production mode
--- a/about.php
+++ b/about.php
@@ -12,7 +12,7 @@
href="https://github.com/maxious/ACTBus-data">transit
feed</a> and <a href="https://github.com/maxious/ACTBus-ui">this
site</a> available from github.<br />
-Uses jQuery Mobile, PHP, Ruby, Python, Google Transit Feed Specification tools, OpenTripPlanner, OpenLayers, OpenStreetMap, Cloudmade Geocoder and Tile Service<br />
+Uses jQuery Mobile, PHP, PostgreSQL, OpenTripPlanner, OpenLayers, OpenStreetMap, Cloudmade Geocoder and Tile Service<br />
<br />
Feedback encouraged; contact maxious@lambdacomplex.org<br />
<br />
--- a/aws/awsStartup.sh
+++ /dev/null
@@ -1,29 +1,1 @@
-#!/bin/bash
-#this script should be run from a fresh git checkout from http://maxious.lambdacomplex.org
-#ami base must have yum install lighttpd-fastcgi, git, tomcat6
-#screen php-cli php-gd tomcat6-webapps tomcat6-admin-webapps svn maven2
-#http://www.how2forge.org/installing-lighttpd-with-php5-and-mysql-support-on-fedora-12
-cp /root/aws.php /tmp/
-mkdir /var/www/lib/staticmaplite/cache
-chcon -h system_u:object_r:httpd_sys_content_t /var/www
-chcon -R -h root:object_r:httpd_sys_content_t /var/www/*
-chcon -R -t httpd_sys_content_rw_t /var/www/lib/staticmaplite/cache
-chmod -R 777 /var/www/lib/staticmaplite/cache
-wget http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip \
--O /var/www/cbrfeed.zip
-easy_install transitfeed
-easy_install simplejson
-screen -S viewsh -X quit
-screen -S viewsh -d -m /var/www/view.sh
-
-wget http://s3-ap-southeast-1.amazonaws.com/busresources/Graph.obj \
--O /tmp/Graph.obj
-rm -rfv /usr/share/tomcat6/webapps/opentripplanner*
-wget http://s3-ap-southeast-1.amazonaws.com/busresources/opentripplanner-webapp.war \
--O /usr/share/tomcat6/webapps/opentripplanner-webapp.war
-wget http://s3-ap-southeast-1.amazonaws.com/busresources/opentripplanner-api-webapp.war \
--O /usr/share/tomcat6/webapps/opentripplanner-api-webapp.war
-/etc/init.d/tomcat6 restart
-
-
--- a/include/common-session.inc.php
+++ b/include/common-session.inc.php
@@ -9,7 +9,7 @@
$_SESSION['time'] = filter_var($_REQUEST['time'], FILTER_SANITIZE_STRING);
sessionUpdated();
}
-if (isset($_REQUEST['geolocate'])) {
+if (isset($_REQUEST['geolocate']) && $_REQUEST['geolocate'] != "Enter co-ordinates or address here") {
$geocoded = false;
if (isset($_REQUEST['lat']) && isset($_REQUEST['lon'])) {
$_SESSION['lat'] = trim(filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
--- 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 "<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/common-transit.inc.php
+++ b/include/common-transit.inc.php
@@ -16,58 +16,5 @@
return 'weekday';
}
}
-function midnight_seconds()
-{
- // from http://www.perturb.org/display/Perlfunc__Seconds_Since_Midnight.html
- if (isset($_SESSION['time'])) {
- $time = strtotime($_SESSION['time']);
- return (date("G", $time) * 3600) + (date("i", $time) * 60) + date("s", $time);
- }
- return (date("G") * 3600) + (date("i") * 60) + date("s");
-}
-function midnight_seconds_to_time($seconds)
-{
- if ($seconds > 0) {
- $midnight = mktime(0, 0, 0, date("n") , date("j") , date("Y"));
- return date("h:ia", $midnight + $seconds);
- }
- else {
- return "";
- }
-}
-function viaPoints($tripid, $stopid, $timingPointsOnly = false)
-{
- global $APIurl;
- $url = $APIurl . "/json/tripstoptimes?trip=" . $tripid;
- $json = json_decode(getPage($url));
- debug(print_r($json, true));
- $stops = $json[0];
- $times = $json[1];
- $foundStop = false;
- $viaPoints = Array();
- foreach ($stops as $key => $row) {
- if ($foundStop) {
- if (!$timingPointsOnly || !startsWith($row[5], "Wj")) {
- $viaPoints[] = Array(
- "id" => $row[0],
- "name" => $row[1],
- "time" => $times[$key]
- );
- }
- }
- else {
- if ($row[0] == $stopid) $foundStop = true;
- }
- }
- return $viaPoints;
-}
-function viaPointNames($tripid, $stopid)
-{
- $points = viaPoints($tripid, $stopid, true);
- $pointNames = Array();
- foreach ($points as $point) {
- $pointNames[] = $point['name'];
- }
- return implode(", ", $pointNames);
-}
+
?>
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -1,19 +1,15 @@
<?php
date_default_timezone_set('Australia/ACT');
-$APIurl = "http://localhost:8765";
$debugOkay = Array(
"session",
"json",
"phperror",
- "awsgtfs",
"awsotp",
//"squallotp",
//"vanilleotp",
+ "database",
"other"
);
-if (isDebug("awsgtfs")) {
- $APIurl = "http://bus-main.lambdacomplex.org:8765";
-}
$cloudmadeAPIkey = "daa03470bb8740298d4b10e3f03d63e6";
$googleMapsAPIkey = "ABQIAAAA95XYXN0cki3Yj_Sb71CFvBTPaLd08ONybQDjcH_VdYtHHLgZvRTw2INzI_m17_IoOUqH3RNNmlTk1Q";
$otpAPIurl = 'http://localhost:8080/opentripplanner-api-webapp/';
@@ -31,8 +27,8 @@
include_once ("common-geo.inc.php");
include_once ("common-net.inc.php");
include_once ("common-transit.inc.php");
-
include_once ("common-session.inc.php");
+include_once ("common-db.inc.php");
include_once ("common-template.inc.php");
function isDebugServer()
@@ -143,5 +139,42 @@
if ($sort_ascending) $array = array_reverse($temp_array);
else $array = $temp_array;
}
+function sktimesort(&$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 strtotime($val[$subkey]) > strtotime($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;
+}
+function r_implode( $glue, $pieces )
+{
+ foreach( $pieces as $r_pieces )
+ {
+ if( is_array( $r_pieces ) )
+ {
+ $retVal[] = r_implode( $glue, $r_pieces );
+ }
+ else
+ {
+ $retVal[] = $r_pieces;
+ }
+ }
+ return implode( $glue, $retVal );
+}
?>
--- /dev/null
+++ b/include/db/route-dao.inc.php
@@ -1,1 +1,63 @@
+<?php
+function getRoute($routeID) {
+ $query = "Select * from routes where route_id = '$routeID' 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 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;";
+ debug($query,"database");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ return pg_fetch_all($result);
+}
+
+function findRouteByNumber($routeNumber) {
+ global $conn;
+ $query = "Select * from routes where route_short_name = '$routeNumber';";
+ debug($query,"database");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ return pg_fetch_all($result);
+}
+
+function getRouteNextTrip($routeID) {
+ $query = "select * from routes join trips on trips.route_id = routes.route_id
+join stop_times on stop_times.trip_id = trips.trip_id where
+arrival_time > CURRENT_TIME and routes.route_id = '$routeID' order by
+arrival_time limit 1";
+ debug($query,"database");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ return pg_fetch_assoc($result); /*
+ }
+
+?>
--- /dev/null
+++ b/include/db/stop-dao.inc.php
@@ -1,1 +1,121 @@
+<?php
+function getStop($stopID)
+{
+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);
+}
+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'";
+ $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");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ return pg_fetch_all($result);
+}
+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
+ from stops WHERE ST_DWithin(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), $distance, FALSE)
+ order by distance;";
+ debug($query,"database");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ return pg_fetch_all($result);
+}
+function getStopsBySuburb($suburb)
+{
+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));
+ return Array();
+ }
+ return pg_fetch_all($result);
+}
+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
+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");
+ $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;
+}
+?>
--- /dev/null
+++ b/include/db/trip-dao.inc.php
@@ -1,1 +1,115 @@
+<?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");
+ $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*/
+}
+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 getTimeInterpolatedTripAtStop($trip_id, $stop_sequence) {
+ foreach(getTimeInterpolatedTrip($tripID) as $tripStop) {
+ if ($tripStop['stop_sequence'] == $stop_sequence) return $tripStop;
+ }
+ return Array();
+}
+
+function getTripStartTime($tripID) {
+ $query = 'SELECT arrival_secs,departure_secs FROM stop_times WHERE trip_id=? ORDER BY stop_sequence LIMIT 1';
+
+}
+
+function viaPointNames($tripid, $stopid)
+{
+ 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");
+ $result = pg_query($conn, $query);
+ if (!$result) {
+ databaseError(pg_result_error($result));
+ return Array();
+ }
+ $pointNames = pg_fetch_all($result);
+ return r_implode(", ", $pointNames);
+}
+?>
--- a/labs/tripPlannerTester.kml.php
+++ b/labs/tripPlannerTester.kml.php
@@ -159,8 +159,7 @@
$regionTimes[] = $time;
}
}
- flush();
- ob_flush();
+ flush(); @ob_flush();
curl_close($ch);
}
}
--- a/layar_api.php
+++ b/layar_api.php
@@ -9,29 +9,29 @@
$page_end = $max_page + filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT);
$lat = filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
$lon = filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
-$url = $APIurl . "/json/neareststops?lat=$lat&lon=$lon&limit=50";
-$contents = json_decode(getPage($url));
-debug(print_r($contents, true));
+
+$contents = getStopsNearby($lat, $lon, 50);
+
$stopNum = 0;
-foreach ($contents as $row) {
+foreach ($contents as $stop) {
$stopNum++;
if ($stopNum > $page_start && $stopNum <= $page_end) {
$hotspot = Array();
- $hotspot['id'] = $row[0];
- $hotspot['title'] = $row[1];
+ $hotspot['id'] = $stop[id];
+ $hotspot['title'] = $stop[name];
$hotspot['type'] = 0;
- $hotspot['lat'] = floor($row[2] * 1000000);
- $hotspot['lon'] = floor($row[3] * 1000000);
- $hotspot['distance'] = distance($row[2], $row[3], $_REQUEST['lat'], $_REQUEST['lon']);
+ $hotspot['lat'] = floor($stop[lat] * 1000000);
+ $hotspot['lon'] = floor($stop[lon] * 1000000);
+ $hotspot['distance'] = distance($stop[lat], $stop[lon], $_REQUEST['lat'], $_REQUEST['lon']);
$hotspot['actions'] = Array(
Array(
"label" => 'View more trips/information',
- 'uri' => 'http://bus.lambdacomplex.org/' . 'stop.php?stopid=' . $row[0]
+ 'uri' => 'http://bus.lambdacomplex.org/' . 'stop.php?stopid=' . $stop[id]
)
);
+
$url = $APIurl . "/json/stoptrips?stop=" . $row[0] . "&time=" . midnight_seconds() . "&service_period=" . service_period() . "&limit=4&time_range=" . strval(90 * 60);
- $trips = json_decode(getPage($url));
- debug(print_r($trips, true));
+ $trips = getStopTrips($stopID);
foreach ($trips as $key => $row) {
if ($key < 3) {
$hotspot['line' . strval($key + 2) ] = $row[1][1] . ' @ ' . midnight_seconds_to_time($row[0]);
--- /dev/null
+++ b/lib/postgis.sh
@@ -1,1 +1,3 @@
+createlang -d dbname plpgsql
+psql -d transitdata -f postgis.sql
--- /dev/null
+++ b/lib/postgis.sql
@@ -1,1 +1,7788 @@
-
+-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+--
+-- $Id: postgis.sql.in.c 5385 2010-03-09 00:22:41Z pramsey $
+--
+-- PostGIS - Spatial Types for PostgreSQL
+-- http://postgis.refractions.net
+-- Copyright 2001-2003 Refractions Research Inc.
+--
+-- This is free software; you can redistribute and/or modify it under
+-- the terms of the GNU General Public Licence. See the COPYING file.
+--
+-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+--
+-- WARNING: Any change in this file must be evaluated for compatibility.
+-- Changes cleanly handled by postgis_upgrade.sql are fine,