projects / busui.git / commitdiff
search:
summary | shortlog | log | commit | commitdiff | tree
unified | plain
Fix retrieving routes by number/number range
Fix retrieving routes by number/number range

file:b/include/common-request.inc.php (new)
  <?php
  if (isset($_REQUEST['firstLetter'])) {
  $firstLetter = filter_var($_REQUEST['firstLetter'], FILTER_SANITIZE_STRING);
  }
  if (isset($_REQUEST['bysuburbs'])) {
  $bysuburbs = true;
  }
  if (isset($_REQUEST['bynumber'])) {
  $bynumber = true;
  }
  if (isset($_REQUEST['allstops'])) {
  $allstops = true;
  }
  if (isset($_REQUEST['nearby'])) {
  $nearby = true;
  }
  if (isset($_REQUEST['suburb'])) {
  $suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);
  }
  $pageKey = 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);
  $max_distance = filter_var($_REQUEST['radius'], FILTER_SANITIZE_NUMBER_INT);
  if (isset($_REQUEST['numberSeries'])) {
  $numberSeries = filter_var($_REQUEST['numberSeries'], FILTER_SANITIZE_NUMBER_INT);
  }
  if (isset($_REQUEST['routeDestination'])) {
  $routeDestination = urldecode(filter_var($_REQUEST['routeDestination'], FILTER_SANITIZE_ENCODED));
  }
  if (isset($_REQUEST['stopcode'])) {
  $stopcode = filter_var($_REQUEST['stopcode'], FILTER_SANITIZE_STRING);
  }
  if (isset($_REQUEST['stopids'])) {
  $stopids = explode(",", filter_var($_REQUEST['stopids'], FILTER_SANITIZE_STRING));
  }
  if (isset($_REQUEST['tripid'])) {
  $tripid = filter_var($_REQUEST['tripid'], FILTER_SANITIZE_NUMBER_INT);
  }
  if (isset($_REQUEST['stopid'])) {
  $stopid = filter_var($_REQUEST['stopid'], FILTER_SANITIZE_NUMBER_INT);
  }
  if (isset($_REQUEST['stopid'])) {
  $routeid = filter_var($_REQUEST['routeid'], FILTER_SANITIZE_NUMBER_INT);
  }
  ?>
file:a/include/db/route-dao.inc.php -> file:b/include/db/route-dao.inc.php
<?php <?php
  function getRoute($routeID)
function getRoute($routeID) { {
global $conn; global $conn;
$query = "Select * from routes where route_id = '$routeID' LIMIT 1"; $query = "Select * from routes where route_id = '$routeID' 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 getRoutes() { function getRoutes()
global $conn; {
  global $conn;
$query = "Select * from routes order by route_short_name;"; $query = "Select * from routes order by route_short_name;";
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 getRoutesByNumber($routeNumber = "") {  
global $conn;  
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) {  
databaseError(pg_result_error($result));  
return Array();  
}  
return pg_fetch_all($result);  
}  
   
function getRouteNextTrip($routeID) {  
global $conn;  
$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();  
}  
$r = pg_fetch_assoc($result);  
// past last trip of the day special case  
if (sizeof($r) == 0) {  
$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 routes.route_id = '$routeID' order by  
arrival_time DESC limit 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;  
}  
   
function getTimeInterpolatedRouteAtStop($routeID, $stop_id)  
{  
$nextTrip = getRouteNextTrip($routeID);  
if ($nextTrip['trip_id']){  
foreach (getTimeInterpolatedTrip($nextTrip['trip_id']) as $tripStop) {  
if ($tripStop['stop_id'] == $stop_id) return $tripStop;  
}  
}  
return Array();  
}  
   
function getRouteTrips($routeID) {  
global $conn;  
$query = "select routes.route_id,trips.trip_id,service_id,arrival_time, stop_id, stop_sequence from routes join trips on trips.route_id = routes.route_id  
join stop_times on stop_times.trip_id = trips.trip_id where routes.route_id = '$routeID' and stop_sequence = '1' 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 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); $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 getRoutesByNumber($routeNumber = "")
function getRoutesBySuburb($suburb, $service_period = "") { {
if ($service_period == "") $service_period = service_period(); global $conn;
global $conn; if ($routeNumber != "") {
$query = "SELECT DISTINCT service_id,trips.route_id,route_short_name,route_long_name $query = "Select distinct routes.route_id,routes.route_short_name,routes.route_long_name,service_id from routes join trips on trips.route_id =
FROM stop_times join trips on trips.trip_id = stop_times.trip_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;";
join routes on trips.route_id = routes.route_id }
join stops on stops.stop_id = stop_times.stop_id else {
WHERE zone_id LIKE '%$suburb;%' AND service_id='$service_period' ORDER BY route_short_name"; $query = "SELECT DISTINCT route_short_name from routes order by route_short_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 getRoutesByNumberSeries($routeNumberSeries = "")
function getRoutesNearby($lat, $lng, $limit = "", $distance = 500) { {
  global $conn;
  if (strlen($routeNumberSeries) == 1) {
if ($service_period == "") $service_period = service_period(); return getRoutesByNumber($routeNumberSeries);
if ($limit != "") $limit = " LIMIT $limit "; }
global $conn; $seriesMin = substr($routeNumberSeries, 0, -1) . "0";
$query = "SELECT service_id,trips.route_id,route_short_name,route_long_name,min(stops.stop_id) as stop_id, $seriesMax = substr($routeNumberSeries, 0, -1) . "9";
  $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 to_number(route_short_name, 'FM999') between $seriesMin and $seriesMax 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 getRouteNextTrip($routeID)
  {
  global $conn;
  $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();
  }
  $r = pg_fetch_assoc($result);
  // past last trip of the day special case
  if (sizeof($r) == 0) {
  $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 routes.route_id = '$routeID' order by
  arrival_time DESC limit 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;
  }
  function getTimeInterpolatedRouteAtStop($routeID, $stop_id)
  {
  $nextTrip = getRouteNextTrip($routeID);
  if ($nextTrip['trip_id']) {
  foreach (getTimeInterpolatedTrip($nextTrip['trip_id']) as $tripStop) {
  if ($tripStop['stop_id'] == $stop_id) return $tripStop;
  }
  }
  return Array();
  }
  function getRouteTrips($routeID)
  {
  global $conn;
  $query = "select routes.route_id,trips.trip_id,service_id,arrival_time, stop_id, stop_sequence from routes join trips on trips.route_id = routes.route_id
  join stop_times on stop_times.trip_id = trips.trip_id where routes.route_id = '$routeID' and stop_sequence = '1' 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 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(stops.stop_id) as stop_id,
min(ST_Distance(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), FALSE)) as distance min(ST_Distance(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), FALSE)) as distance
FROM stop_times FROM stop_times
join trips on trips.trip_id = stop_times.trip_id join trips on trips.trip_id = stop_times.trip_id
join routes on trips.route_id = routes.route_id join routes on trips.route_id = routes.route_id
join stops on stops.stop_id = stop_times.stop_id join stops on stops.stop_id = stop_times.stop_id
WHERE service_id='$service_period' WHERE service_id='$service_period'
AND ST_DWithin(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), $distance, FALSE) 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 group by service_id,trips.route_id,route_short_name,route_long_name
order by distance $limit"; order by distance $limit";
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);
} }
?> ?>
file:a/routeList.php -> file:b/routeList.php
<?php <?php
include ('include/common.inc.php'); include ('include/common.inc.php');
function navbar() function navbar()
{ {
echo ' echo '
<div data-role="navbar"> <div data-role="navbar">
<ul> <ul>
<li><a href="routeList.php">By Final Destination...</a></li> <li><a href="routeList.php">By Final Destination...</a></li>
<li><a href="routeList.php?bynumber=yes">By Number... </a></li> <li><a href="routeList.php?bynumber=yes">By Number... </a></li>
<li><a href="routeList.php?bysuburbs=yes">By Suburb... </a></li> <li><a href="routeList.php?bysuburbs=yes">By Suburb... </a></li>
<li><a href="routeList.php?nearby=yes">Nearby... </a></li> <li><a href="routeList.php?nearby=yes">Nearby... </a></li>
</ul> </ul>
</div> </div>
'; ';
} }
if (isset($bysuburbs)) { if (isset($bysuburbs)) {
include_header("Routes by Suburb", "routeList"); include_header("Routes by Suburb", "routeList");
navbar(); navbar();
echo ' <ul data-role="listview" data-filter="true" data-inset="true" >'; echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';
if (!isset($firstLetter)) { if (!isset($firstLetter)) {
foreach (range('A', 'Z') as $letter) { foreach (range('A', 'Z') as $letter) {
echo "<li><a href=\"routeList.php?firstLetter=$letter&amp;bysuburbs=yes\">$letter...</a></li>\n"; echo "<li><a href=\"routeList.php?firstLetter=$letter&amp;bysuburbs=yes\">$letter...</a></li>\n";
} }
} }
else { else {
foreach ($suburbs as $suburb) { foreach ($suburbs as $suburb) {
if (startsWith($suburb, $firstLetter)) { if (startsWith($suburb, $firstLetter)) {
echo '<li><a href="routeList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>'; echo '<li><a href="routeList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>';
} }
} }
} }
echo '</ul>'; echo '</ul>';
} }
else if (isset($nearby) || isset($suburb)) { else if (isset($nearby) || isset($suburb)) {
$routes = Array(); $routes = Array();
if ($suburb) { if ($suburb) {
include_header($suburb . " - " . ucwords(service_period()) , "routeList"); include_header($suburb . " - " . ucwords(service_period()) , "routeList");
navbar(); navbar();
timePlaceSettings();