projects / busui.git / commitdiff
search:
summary | shortlog | log | commit | commitdiff | tree
unified | plain
Refactor route list
Refactor route list

file:a/include/db/route-dao.inc.php -> file:b/include/db/route-dao.inc.php
<?php <?php
   
function getRoute($routeID) { function getRoute($routeID) {
/* $query = "Select * from routes where route_id = '$routeID' LIMIT 1";
def handle_json_GET_routerow(self, params): debug($query,"database");
schedule = self.server.schedule $result = pg_query($conn, $query);
route = schedule.GetRoute(params.get('route', None)) if (!$result) {
return [transitfeed.Route._FIELD_NAMES, route.GetFieldValuesTuple()] databaseError(pg_result_error($result));
*/ return Array();
  }
  return pg_fetch_assoc($result);
} }
function getRoutes() { function getRoutes() {
/* def handle_json_GET_routes(self, params): global $conn;
"""Return a list of all routes.""" $conditions = Array();
schedule = self.server.schedule if ($timingPointsOnly) $conditions[] = "substr(stop_code,1,2) != 'Wj'";
result = [] if ($firstLetter != "") $conditions[] = "substr(stop_name,1,1) = '$firstLetter'";
for r in schedule.GetRouteList(): $query = "Select * from routes";
servicep = None if (sizeof($conditions) > 0) {
for t in schedule.GetTripList(): if (sizeof($conditions) > 1) {
if t.route_id == r.route_id: $query .= " Where ".implode(" AND ",$conditions)." ";
servicep = t.service_period }
break else {
result.append( (r.route_id, r.route_short_name, r.route_long_name, servicep.service_id) ) $query .= " Where ".$conditions[0]." ";
result.sort(key = lambda x: x[1:3]) }
return result }
*/ $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) { function findRouteByNumber($routeNumber) {
/* global $conn;
def handle_json_GET_routesearch(self, params): $query = "Select * from routes where route_short_name = '$routeNumber';";
"""Return a list of routes with matching short name.""" debug($query,"database");
schedule = self.server.schedule $result = pg_query($conn, $query);
routeshortname = params.get('routeshortname', None) if (!$result) {
result = [] databaseError(pg_result_error($result));
for r in schedule.GetRouteList(): return Array();
if r.route_short_name == routeshortname: }
servicep = None return pg_fetch_all($result);
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  
*/  
} }
   
function getRouteNextTrip($routeID) { function getRouteNextTrip($routeID) {
/* $query = "select * from routes join trips on trips.route_id = routes.route_id
def handle_json_GET_routetrips(self, params): join stop_times on stop_times.trip_id = trips.trip_id where
""" Get a trip for a route_id (preferablly the next one) """ arrival_time > CURRENT_TIME and routes.route_id = '$routeID' order by
schedule = self.server.schedule arrival_time limit 1";
query = params.get('route_id', None).lower() debug($query,"database");
result = [] $result = pg_query($conn, $query);
for t in schedule.GetTripList(): if (!$result) {
if t.route_id == query: databaseError(pg_result_error($result));
try: return Array();
starttime = t.GetStartTime() }
except: return pg_fetch_assoc($result); /*
print "Error for GetStartTime of trip #" + t.trip_id + sys.exc_info()[0] }
else:  
cursor = t._schedule._connection.cursor()  
cursor.execute(  
'SELECT arrival_secs,departure_secs FROM stop_times WHERE '  
'trip_id=? ORDER BY stop_sequence DESC LIMIT 1', (t.trip_id,))  
(arrival_secs, departure_secs) = cursor.fetchone()  
if arrival_secs != None:  
endtime = arrival_secs  
elif departure_secs != None:  
endtime = departure_secs  
else:  
endtime =0  
result.append ( (starttime, t.trip_id, endtime) )  
return sorted(result, key=lambda trip: trip[2])  
*/  
}  
   
?> ?>
file:a/include/db/stop-dao.inc.php -> file:b/include/db/stop-dao.inc.php
<?php <?php
/* def StopZoneToTuple(stop):  
"""Return tuple as expected by javascript function addStopMarkerFromList"""  
return (stop.stop_id, stop.stop_name, float(stop.stop_lat),  
float(stop.stop_lon), stop.location_type, stop.stop_code, stop.zone_id)  
*/  
function getStop($stopID) function getStop($stopID)
{ {
global $conn; global $conn;
$query = "Select * from stops where stop_id = '$stopID' LIMIT 1"; $query = "Select * from stops where stop_id = '$stopID' LIMIT 1";
debug($query,"database"); debug($query,"database");
$result = pg_query($conn, $query); $result = pg_query($conn, $query);
if (!$result) { if (!$result) {
databaseError(pg_result_error($result)); databaseError(pg_result_error($result));
return Array(); return Array();
} }
return pg_fetch_assoc($result); return pg_fetch_assoc($result);
} }
function getStops($timingPointsOnly = false, $firstLetter = "") function getStops($timingPointsOnly = false, $firstLetter = "")
{ {
global $conn; global $conn;
$conditions = Array(); $conditions = Array();
if ($timingPointsOnly) $conditions[] = "substr(stop_code,1,2) != 'Wj'"; if ($timingPointsOnly) $conditions[] = "substr(stop_code,1,2) != 'Wj'";
if ($firstLetter != "") $conditions[] = "substr(stop_name,1,1) = '$firstLetter'"; if ($firstLetter != "") $conditions[] = "substr(stop_name,1,1) = '$firstLetter'";
$query = "Select * from stops"; $query = "Select * from stops";
if (sizeof($conditions) > 0) { if (sizeof($conditions) > 0) {
if (sizeof($conditions) > 1) { if (sizeof($conditions) > 1) {
$query .= " Where ".implode(" AND ",$conditions)." "; $query .= " Where ".implode(" AND ",$conditions)." ";
} }
else { else {
$query .= " Where ".$conditions[0]." "; $query .= " Where ".$conditions[0]." ";
} }
} }
$query .= " order by stop_name;"; $query .= " order by stop_name;";
debug($query,"database"); debug($query,"database");
$result = pg_query($conn, $query); $result = pg_query($conn, $query);
if (!$result) { if (!$result) {
databaseError(pg_result_error($result)); databaseError(pg_result_error($result));
return Array(); return Array();
} }
return pg_fetch_all($result); 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(); if ($lat == null || $lng == null) return Array();
global $conn; global $conn;
$query = "Select *, ST_Distance(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), FALSE) as distance $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) from stops WHERE ST_DWithin(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), $distance, FALSE)
order by distance;"; order by distance;";
debug($query,"database"); debug($query,"database");
$result = pg_query($conn, $query); $result = pg_query($conn, $query);
if (!$result) { if (!$result) {
databaseError(pg_result_error($result)); databaseError(pg_result_error($result));
return Array(); return Array();
} }
return pg_fetch_all($result); return pg_fetch_all($result);
} }
function getStopsBySuburb($suburb) function getStopsBySuburb($suburb)
{ {
global $conn; global $conn;
$query = "Select * from stops where zone_id LIKE '%$suburb;%' order by stop_name;"; $query = "Select * from stops where zone_id LIKE '%$suburb;%' order by stop_name;";
debug($query,"database"); debug($query,"database");
$result = pg_query($conn, $query); $result = pg_query($conn, $query);
if (!$result) { if (!$result) {
databaseError(pg_result_error($result)); databaseError(pg_result_error($result));
return Array(); return Array();
} }
return pg_fetch_all($result); return pg_fetch_all($result);
} }
function getStopRoutes($stopID, $service_period) function getStopRoutes($stopID, $service_period)
{ {
if ($service_period == "") $service_period = service_period(); if ($service_period == "") $service_period = service_period();
/* global $conn;
def handle_json_GET_stoproutes(self, params): $query = "SELECT service_id,trips.route_id,route_short_name,route_long_name
"""Given a stop_id return all routes to visit the stop.""" FROM stop_times join trips on trips.trip_id =
schedule = self.server.schedule stop_times.trip_id join routes on trips.route_id = routes.route_id WHERE stop_id = '$stopID' AND service_id='$service_period'";
stop = schedule.GetStop(params.get('stop', None)) debug($query,"database");
service_period = params.get('service_period', None) $result = pg_query($conn, $query);
trips = stop.GetTrips(schedule) if (!$result) {
result = {} databaseError(pg_result_error($result));
for trip in trips: return Array();
route = schedule.GetRoute(trip.route_id) }
if service_period == None or trip.service_id == service_period: return pg_fetch_all($result);}
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  
*/  
}  
function getStopTrips($stopID, $service_period = "") function getStopTrips($stopID, $service_period = "")
{ {
if ($service_period == "") $service_period = service_period(); if ($service_period == "") $service_period = service_period();
global $conn; 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 $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 = 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'"; 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); $result = pg_query($conn, $query);
if (!$result) { if (!$result) {
databaseError(pg_result_error($result)); databaseError(pg_result_error($result));
return Array(); return Array();
} }
return pg_fetch_all($result); return pg_fetch_all($result);
   
} }
function getStopTripsWithTimes($stopID, $time = "", $service_period = "", $time_range = "") function getStopTripsWithTimes($stopID, $time = "", $service_period = "", $time_range = "")
{ {
if ($service_period == "") $service_period = service_period(); if ($service_period == "") $service_period = service_period();
if ($time_range == "") $time_range = (24*60*60); if ($time_range == "") $time_range = (24*60*60);
if ($time == "") $time = ($_SESSION['time'] ? $_SESSION['time'] : date("h:i:00")); if ($time == "") $time = ($_SESSION['time'] ? $_SESSION['time'] : date("h:i:00"));
$trips = getStopTrips($stopID,$service_period); $trips = getStopTrips($stopID,$service_period);
$timedTrips = Array(); $timedTrips = Array();
foreach ($trips as $trip) { foreach ($trips as $trip) {
if ($trip['arrival_time'] != "") { if ($trip['arrival_time'] != "") {
if (strtotime($trip['arrival_time']) > strtotime($time) and strtotime($trip['arrival_time']) < (strtotime($time) + $time_range)){ if (strtotime($trip['arrival_time']) > strtotime($time) and strtotime($trip['arrival_time']) < (strtotime($time) + $time_range)){
$timedTrips[] = $trip; $timedTrips[] = $trip;
} }
} else { } else {
$tripstarttime = getTripStartTime($trip['trip_id']); $tripstarttime = getTripStartTime($trip['trip_id']);
if ($tripstarttime > $time and $tripstarttime < ($time + $time_range)) { if ($tripstarttime > $time and $tripstarttime < ($time + $time_range)) {
$timedtrip = getTimeInterpolatedTripStop($trip['trip_id'], $trip['stop_sequence']); $timedtrip = getTimeInterpolatedTripStop($trip['trip_id'], $trip['stop_sequence']);
if (strtotime($timedtrip['arrival_time']) > strtotime($time) and $timedtrip['arrival_time'] < (strtotime($time) + strtotime($time_range))){ if (strtotime($timedtrip['arrival_time']) > strtotime($time) and $timedtrip['arrival_time'] < (strtotime($time) + strtotime($time_range))){
$timedTrips[] = $timedTrip; $timedTrips[] = $timedTrip;
} }
} }
} }
if (sizeof($timedTrips) > limit) break; if (sizeof($timedTrips) > limit) break;
} }
sktimesort($timedTrips,"arrival_time", true); sktimesort($timedTrips,"arrival_time", true);
return $timedTrips; return $timedTrips;
} }
?> ?>
Unnamed repository; edit this file to name it for gitweb.
GitPHP by Chris Han