From: maxious Date: Fri, 08 Apr 2011 07:08:00 +0000 Subject: Refactoring of route list page X-Git-Url: https://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=4fe326fa39f33a3907402442d1d8b767568160c3 --- Refactoring of route list page --- --- 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 @@ -35,13 +35,14 @@ } 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 ($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;"; + order by distance $limit;"; debug($query,"database"); $result = pg_query($conn, $query); if (!$result) { @@ -75,7 +76,9 @@ databaseError(pg_result_error($result)); return Array(); } - return pg_fetch_all($result);} + return pg_fetch_all($result); + } + function getStopTrips($stopID, $service_period = "") { if ($service_period == "") $service_period = service_period(); --- a/routeList.php +++ b/routeList.php @@ -32,62 +32,62 @@ echo ''; } 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("Route Lists", "Routes By Suburb", $suburb); + include_header($suburb ." - ".ucwords(service_period()), "routeList"); + navbar(); + timePlaceSettings(); + trackEvent("Route Lists", "Routes By Suburb", $suburb); + $routes = getRoutesBySuburb($suburb); + } if ($_REQUEST['nearby']) { - $url = $APIurl . "/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15"; include_header("Routes Nearby", "routeList", true, true); - timePlaceSettings(true); + trackEvent("Route Lists", "Routes Nearby", $_SESSION['lat'].",".$_SESSION['lon']); + navbar(); + timePlaceSettings(true); if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") { include_footer(); die(); } + $routes = getRoutesNearby($_SESSION['lat'],$_SESSION['lon']); } - $stops = json_decode(getPage($url)); - $routes = Array(); - foreach ($stops as $stop) { - $url = $APIurl . "/json/stoproutes?stop=" . $stop[0]; - $stoproutes = json_decode(getPage($url)); - foreach ($stoproutes as $route) { - if (!isset($routes[$route[0]])) $routes[$route[0]] = $route; + + echo '