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

file:a/include/db/stop-dao.inc.php -> file:b/include/db/stop-dao.inc.php
<?php <?php
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();
if ($limit != "") $limit = " LIMIT $limit "; if ($limit != "") $limit = " LIMIT $limit ";
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 $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);
} }
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; global $conn;
$query = "SELECT service_id,trips.route_id,route_short_name,route_long_name $query = "SELECT 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 getStopTrips($stopID, $service_period = "", $afterTime = "") function getStopTrips($stopID, $service_period = "", $afterTime = "")
{ {
if ($service_period == "") $service_period = service_period(); if ($service_period == "") $service_period = service_period();
$afterCondition = "AND arrival_time > '$afterTime'"; $afterCondition = "AND arrival_time > '$afterTime'";
global $conn; global $conn;
if ($afterTime != "") { 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 $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 FROM stop_times
join trips on trips.trip_id = join trips on trips.trip_id =
stop_times.trip_id stop_times.trip_id
join routes on trips.route_id = routes.route_id , (SELECT trip_id,arrival_time from stop_times 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 WHERE stop_times.arrival_time IS NOT NULL
AND stop_sequence = '1') as start_times AND stop_sequence = '1') as start_times
WHERE stop_times.stop_id = '$stopID' WHERE stop_times.stop_id = '$stopID'
AND stop_times.trip_id = start_times.trip_id AND stop_times.trip_id = start_times.trip_id
AND service_id='$service_period' AND service_id='$service_period'
AND start_times.arrival_time > '$afterTime' AND start_times.arrival_time > '$afterTime'
ORDER BY start_time"; ORDER BY start_time";
} }
else { 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 $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 FROM stop_times
join trips on trips.trip_id = join trips on trips.trip_id =
stop_times.trip_id stop_times.trip_id
join routes on trips.route_id = routes.route_id join routes on trips.route_id = routes.route_id
WHERE stop_times.stop_id = '$stopID' WHERE stop_times.stop_id = '$stopID'
AND service_id='$service_period' AND service_id='$service_period'
ORDER BY arrival_time"; ORDER BY arrival_time";
} }
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 = "", $limit = "")
{ {
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:s")); if ($time == "") $time = ($_SESSION['time'] ? $_SESSION['time'] : date("H:i:s"));
if ($limit == "") $limit = 10; if ($limit == "") $limit = 10;
$trips = getStopTrips($stopID, $service_period, $time); $trips = getStopTrips($stopID, $service_period, $time);
$timedTrips = Array(); $timedTrips = Array();
foreach ($trips as $trip) { if ($trips && sizeof($trips) > 0) {
  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 {
$timedTrip = getTimeInterpolatedTripAtStop($trip['trip_id'], $trip['stop_sequence']); $timedTrip = getTimeInterpolatedTripAtStop($trip['trip_id'], $trip['stop_sequence']);
if ($timedTrip['arrival_time'] > $time and strtotime($timedTrip['arrival_time']) < (strtotime($time) + $time_range)) { if ($timedTrip['arrival_time'] > $time and strtotime($timedTrip['arrival_time']) < (strtotime($time) + $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;
} }
?> ?>
file:a/layar_api.php -> file:b/layar_api.php
<?php <?php
include ('include/common.inc.php'); include ('include/common.inc.php');
$output = Array(); $output = Array();
$output['hotspots'] = Array(); $output['hotspots'] = Array();
$output['layer'] = "canberrabusstops"; $output['layer'] = "canberrabusstops";
$max_page = 10; //$max_page = 10;
$max_results = 50; //$max_results = 50;
$page_start = 0 + filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT); //$page_start = 0 + filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT);
$page_end = $max_page + filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT); //$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); $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); $lon = filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
   
$contents = getStopsNearby($lat, $lon, 50); $contents = getNearbyStops($lat, $lon, 50);
   
$stopNum = 0; $stopNum = 0;
foreach ($contents as $stop) { foreach ($contents as $stop) {
$stopNum++; $stopNum++;
if ($stopNum > $page_start && $stopNum <= $page_end) { // if ($stopNum > $page_start && $stopNum <= $page_end) {
$hotspot = Array(); $hotspot = Array();
$hotspot['id'] = $stop[id]; $hotspot['id'] = $stop['stop_id'];
$hotspot['title'] = $stop[name]; $hotspot['title'] = $stop['stop_name'];
$hotspot['type'] = 0; $hotspot['type'] = 0;
$hotspot['lat'] = floor($stop[lat] * 1000000); $hotspot['lat'] = floor($stop['stop_lat'] * 1000000);
$hotspot['lon'] = floor($stop[lon] * 1000000); $hotspot['lon'] = floor($stop['stop_lon'] * 1000000);
$hotspot['distance'] = distance($stop[lat], $stop[lon], $_REQUEST['lat'], $_REQUEST['lon']); $hotspot['distance'] = floor($stop['distance']);
$hotspot['actions'] = Array( $hotspot['actions'] = Array(
Array( Array(
"label" => 'View more trips/information', "label" => 'View more trips/information',
'uri' => 'http://bus.lambdacomplex.org/' . 'stop.php?stopid=' . $stop[id] 'uri' => 'http://bus.lambdacomplex.org/' . 'stop.php?stopid=' . $stop['stop_id']
) )
); );
   
$url = $APIurl . "/json/stoptrips?stop=" . $row[0] . "&time=" . midnight_seconds() . "&service_period=" . service_period() . "&limit=4&time_range=" . strval(90 * 60); $trips = getStopTripsWithTimes($stop['stop_id'],"","","",3);
$trips = getStopTrips($stopID);  
foreach ($trips as $key => $row) { foreach ($trips as $key => $row) {
if ($key < 3) { if ($key < 3) {
$hotspot['line' . strval($key + 2) ] = $row[1][1] . ' @ ' . midnight_seconds_to_time($row[0]); $hotspot['line' . strval($key + 2) ] = $row['route_short_name'] . ' '. $row['route_long_name']. ' @ ' . $row['arrival_time'];
} }
} }
if (sizeof($trips) == 0) $hotspot['line2'] = 'No trips in the near future.'; if (sizeof($trips) == 0) $hotspot['line2'] = 'No trips in the near future.';
$output['hotspots'][] = $hotspot; $output['hotspots'][] = $hotspot;
} // }
} }
if (sizeof($hotspot) > 0) { if (sizeof($hotspot) > 0) {
$output['errorString'] = 'ok'; $output['errorString'] = 'ok';
$output['errorCode'] = 0; $output['errorCode'] = 0;
} }
else { else {
$output['errorString'] = 'no results, try increasing range'; $output['errorString'] = 'no results, try increasing range';
$output['errorCode'] = 21; $output['errorCode'] = 21;
} }
if ($page_end >= $max_results || sizeof($hotspot) < $max_page) { /*if ($page_end >= $max_results || sizeof($hotspot) < $max_page) {*/
$output["morePages"] = false; $output["morePages"] = false;
$output["nextPageKey"] = null; $output["nextPageKey"] = null;
} /*}
else { else {
$output["morePages"] = true; $output["morePages"] = true;
$output["nextPageKey"] = $page_end; $output["nextPageKey"] = $page_end;
} }*/
echo json_encode($output); echo json_encode($output);
?> ?>
   
Unnamed repository; edit this file to name it for gitweb.
GitPHP by Chris Han