--- a/include/db/trip-dao.inc.php +++ b/include/db/trip-dao.inc.php @@ -75,8 +75,9 @@ $distance_between_timepoints+= distance($stopTimes[$k - 1]["stop_lat"], $stopTimes[$k - 1]["stop_lon"], $stopTimes[$k]["stop_lat"], $stopTimes[$k]["stop_lon"]); } $next_timepoint = $stopTimes[$k]; - $rv[] = $stopTime; + } + $rv[] = $stopTime; } else { // is untimed point @@ -94,10 +95,11 @@ $stopTime["arrival_time"] = $cur_timepoint["arrival_time"]; } $rv[] = $stopTime; - //var_dump($rv); + } } + //var_dump($rv); return $rv; } function getTripPreviousTimePoint($tripID, $stop_sequence) @@ -171,6 +173,22 @@ $r = $query->fetch(PDO::FETCH_ASSOC); return $r['arrival_time']; } +function getTripEndTime($tripID) +{ + global $conn; + $query = "SELECT trip_id,max(arrival_time) as arrival_time from stop_times + WHERE stop_times.arrival_time IS NOT NULL and trip_id = :tripID group by trip_id"; + debug($query, "database"); + $query = $conn->prepare($query); + $query->bindParam(":tripID", $tripID); + $query->execute(); + if (!$query) { + databaseError($conn->errorInfo()); + return Array(); + } + $r = $query->fetch(PDO::FETCH_ASSOC); + return $r['arrival_time']; +} function getActiveTrips($time) { global $conn;