From: maxious Date: Thu, 14 Apr 2011 11:27:28 +0000 Subject: Fix errornous route other trip query X-Git-Url: http://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=d54e99e11f15a8e35589e03b204ccf7fe80199b7 --- Fix errornous route other trip query --- --- a/include/common-session.inc.php +++ b/include/common-session.inc.php @@ -53,4 +53,7 @@ } debug(print_r($_SESSION, true) , "session"); +function current_time() { + return ($_SESSION['time']? $_SESSION['time'] : date("H:i:s")); +} ?> --- a/include/common-template.inc.php +++ b/include/common-template.inc.php @@ -222,7 +222,7 @@
- Current Time? + Current Time?
--- a/include/db/route-dao.inc.php +++ b/include/db/route-dao.inc.php @@ -40,23 +40,49 @@ } function getRouteNextTrip($routeID) { - global $conn; + 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 > '".current_time()."' and routes.route_id = '$routeID' order by arrival_time limit 1"; debug($query,"database"); $result = pg_query($conn, $query); - if (!$result) { + if (!$result) { databaseError(pg_result_error($result)); return Array(); } - return pg_fetch_assoc($result); + $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 * 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 + $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); @@ -112,7 +138,7 @@ 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, + $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 FROM stop_times join trips on trips.trip_id = stop_times.trip_id --- a/include/db/stop-dao.inc.php +++ b/include/db/stop-dao.inc.php @@ -84,18 +84,17 @@ $afterCondition = "AND arrival_time > '$afterTime'"; global $conn; 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, end_times.arrival_time as end_time FROM stop_times join trips on trips.trip_id = stop_times.trip_id -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 - AND stop_sequence = '1') as start_times +join routes on trips.route_id = routes.route_id , (SELECT trip_id,max(arrival_time) as arrival_time from stop_times + WHERE stop_times.arrival_time IS NOT NULL group by trip_id) as end_times WHERE stop_times.stop_id = '$stopID' -AND stop_times.trip_id = start_times.trip_id +AND stop_times.trip_id = end_times.trip_id AND service_id='$service_period' -AND start_times.arrival_time > '$afterTime' -ORDER BY start_time"; +AND end_times.arrival_time > '$afterTime' +ORDER BY end_time"; } 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 @@ -119,7 +118,7 @@ { 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:s")); + if ($time == "") $time = current_time(); if ($limit == "") $limit = 10; $trips = getStopTrips($stopID, $service_period, $time); $timedTrips = Array(); --- a/include/db/trip-dao.inc.php +++ b/include/db/trip-dao.inc.php @@ -49,7 +49,7 @@ points.append((stop.stop_lat, stop.stop_lon)) return points*/ } -function getTimeInterpolatedTrip($tripID) +function getTimeInterpolatedTrip($tripID, $range = "") { global $conn; $query = "SELECT stop_times.trip_id,arrival_time,stop_times.stop_id,stop_lat,stop_lon,stop_name,stop_code, @@ -58,7 +58,7 @@ 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 trips.trip_id = '$tripID' ORDER BY stop_sequence"; +WHERE trips.trip_id = '$tripID' $range ORDER BY stop_sequence"; debug($query, "database"); $result = pg_query($conn, $query); if (!$result) { @@ -111,7 +111,18 @@ } function getTimeInterpolatedTripAtStop($tripID, $stop_sequence) { - foreach (getTimeInterpolatedTrip($tripID) as $tripStop) { + global $conn; + // limit interpolation to between nearest actual points. + $prevTimePoint = pg_fetch_assoc(pg_query($conn," SELECT trip_id,stop_id, + stop_sequence +FROM stop_times +WHERE trip_id = '$tripID' and stop_sequence < $stop_sequence and stop_times.arrival_time IS NOT NULL ORDER BY stop_sequence DESC LIMIT 1")); + $nextTimePoint = pg_fetch_assoc(pg_query($conn," SELECT trip_id,stop_id, + stop_sequence +FROM stop_times +WHERE trip_id = '$tripID' and stop_sequence > $stop_sequence and stop_times.arrival_time IS NOT NULL ORDER BY stop_sequence LIMIT 1")); + $range = "AND stop_sequence >= '{$prevTimePoint['stop_sequence']}' AND stop_sequence <= '{$nextTimePoint['stop_sequence']}'"; + foreach (getTimeInterpolatedTrip($tripID,$range) as $tripStop) { if ($tripStop['stop_sequence'] == $stop_sequence) return $tripStop; } return Array(); @@ -132,6 +143,22 @@ $r = pg_fetch_assoc($result); return $r['arrival_time']; } +function getActiveTrips($time) +{ + global $conn; + if ($time == "") $time = current_time(); + $query = "Select distinct stop_times.trip_id, start_times.arrival_time as start_time, end_times.arrival_time as end_time from stop_times, (SELECT trip_id,arrival_time from stop_times WHERE stop_times.arrival_time IS NOT NULL +AND stop_sequence = '1') as start_times, (SELECT trip_id,max(arrival_time) as arrival_time from stop_times WHERE stop_times.arrival_time IS NOT NULL group by trip_id) as end_times +WHERE start_times.trip_id = end_times.trip_id AND stop_times.trip_id = end_times.trip_id AND $time > start_times.arrival_time AND $time < end_times.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 viaPointNames($tripid, $stop_sequence = "") { global $conn; --- a/routeList.php +++ b/routeList.php @@ -59,7 +59,8 @@ foreach ($routes as $route) { echo '

  • ' . $route['route_short_name'] . "

    " . $route['route_long_name'] . " (" . ucwords($route['service_id']) . ")

    "; if ($_REQUEST['nearby']) { - echo '' .floor($route['distance']) . 'm away'; + $time = getTimeInterpolatedRouteAtStop($route['route_id'], $route['stop_id']); + echo ''.($time['arrival_time']?$time['arrival_time']:"No more trips today")."
    " .floor($route['distance']) . 'm away    '; } echo "
    • \n"; } --- a/stop.php +++ b/stop.php @@ -57,9 +57,9 @@ if (!isset($allStopsTrips[$trip["trip_id"]])) $allStopsTrips[$trip["trip_id"]] = $trip; } } - else { - echo "skipped sequence $tripSequence"; - } + //else { + // echo "skipped sequence $tripSequence"; + //} } } include_header($stop['stop_name'], "stop"); --- a/trip.php +++ b/trip.php @@ -46,8 +46,11 @@ $stopsGrouped["stop_ids"][] = $tripStopTime['stop_id']; $stopsGrouped["endTime"] = $tripStopTime['arrival_time']; echo ''; - - echo '

    ' . $stopsGrouped['startTime'] . ' to ' . $stopsGrouped['endTime'] . '

    '; + echo '

    ' . $stopsGrouped['startTime'] . ' to ' . $stopsGrouped['endTime']; + echo '

    '; + if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { + echo '' . distance($stop['stop_lat'],$stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away'; + } echo bracketsMeanNewLine($tripStopTime["stop_name"]); echo '    '; flush(); @ob_flush(); @@ -57,7 +60,10 @@ // just a normal stop echo ''; echo '

    ' . $tripStopTime['arrival_time'] . '

    '; - echo bracketsMeanNewLine($tripStopTime['stop_name']); + if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { + echo '' . distance($stop['stop_lat'],$stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away'; + } + echo bracketsMeanNewLine($tripStopTime['stop_name']); echo '    '; flush(); @ob_flush(); }