--- a/include/db/stop-dao.inc.php
+++ b/include/db/stop-dao.inc.php
@@ -1,131 +1,159 @@
 <?php
-/* def StopZoneToTuple(stop):
-  """Return tuple as expected by javascript function addStopMarkerFromList"""
-  return (stop.stop_id, stop.stop_name, float(stop.stop_lat),
-          float(stop.stop_lon), stop.location_type, stop.stop_code, stop.zone_id)
-*/
 function getStop($stopID)
 {
-global $conn;
-        $query = "Select * from stops where stop_id = '$stopID' LIMIT 1";
-        debug($query,"database");
-	$result = pg_query($conn, $query);
-	if (!$result) {
-		databaseError(pg_result_error($result));
+	global $conn;
+	$query = "Select * from stops where stop_id = :stopID LIMIT 1";
+	debug($query, "database");
+	$query = $conn->prepare($query);
+	$query->bindParam(":stopID", $stopID);
+	$query->execute();
+	if (!$query) {
+		databaseError($conn->errorInfo());
 		return Array();
 	}
-	return pg_fetch_assoc($result);    
+	return $query->fetch(PDO::FETCH_ASSOC);
 }
 function getStops($timingPointsOnly = false, $firstLetter = "")
 {
 	global $conn;
-        $conditions = Array();
-        if ($timingPointsOnly) $conditions[] = "substr(stop_code,1,2) != 'Wj'";
-        if ($firstLetter != "") $conditions[] = "substr(stop_name,1,1) = '$firstLetter'";
+	$conditions = Array();
+	if ($timingPointsOnly) $conditions[] = "substr(stop_code,1,2) != 'Wj'";
+	if ($firstLetter != "") $conditions[] = "substr(stop_name,1,1) = :firstLetter";
 	$query = "Select * from stops";
-        if (sizeof($conditions) > 0) {
-            if (sizeof($conditions) > 1) {
-                $query .= " Where ".implode(" AND ",$conditions)." ";
-            }
-            else {
-                $query .= " Where ".$conditions[0]." ";
-            }
-        }
-        $query .= " order by stop_name;";
-        debug($query,"database");
-	$result = pg_query($conn, $query);
-	if (!$result) {
-		databaseError(pg_result_error($result));
+	if (sizeof($conditions) > 0) {
+		if (sizeof($conditions) > 1) {
+			$query.= " Where " . implode(" AND ", $conditions) . " ";
+		}
+		else {
+			$query.= " Where " . $conditions[0] . " ";
+		}
+	}
+	$query.= " order by stop_name;";
+	$query = $conn->prepare($query);
+        $query->bindParam(":firstLetter", $firstLetter);
+	$query->execute();
+	if (!$query) {
+		databaseError($conn->errorInfo());
 		return Array();
 	}
-	return pg_fetch_all($result);
+	return $query->fetchAll();
 }
-function getNearbyStops($lat, $lng, $limit, $distance = 1000)
+function getNearbyStops($lat, $lng, $limit = "", $distance = 1000)
 {
-   if ($lat == null || $lng == null) return Array();
-   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;";
-        debug($query,"database");
-	$result = pg_query($conn, $query);
-	if (!$result) {
-		databaseError(pg_result_error($result));
+	if ($lat == null || $lng == null) return Array();
+	if ($limit != "") $limitSQL = " 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 $limitSQL;";
+	debug($query, "database");
+        $query = $conn->prepare($query);
+	$query->bindParam(":distance", $distance);
+	$query->bindParam(":limit", $limit);
+	$query->execute();
+	if (!$query) {
+		databaseError($conn->errorInfo());
 		return Array();
 	}
-	return pg_fetch_all($result);
+	return $query->fetchAll();
 }
 function getStopsBySuburb($suburb)
 {
-global $conn;
-        $query = "Select * from stops where zone_id LIKE '%$suburb;%' order by stop_name;";
-        debug($query,"database");
-	$result = pg_query($conn, $query);
-	if (!$result) {
-		databaseError(pg_result_error($result));
+	global $conn;
+	$query = "Select * from stops where zone_id LIKE :suburb order by stop_name;";
+	debug($query, "database");
+	$query = $conn->prepare($query);
+        $suburb = "%" . $suburb . ";%";
+	$query->bindParam(":suburb", $suburb);
+	$query->execute();
+	if (!$query) {
+		databaseError($conn->errorInfo());
 		return Array();
 	}
-	return pg_fetch_all($result);
+	return $query->fetchAll();
 }
 function getStopRoutes($stopID, $service_period)
 {
-        if ($service_period == "") $service_period = service_period();
-	/*
-	 def handle_json_GET_stoproutes(self, params):
-	   """Given a stop_id return all routes to visit the stop."""
-	   schedule = self.server.schedule
-	   stop = schedule.GetStop(params.get('stop', None))
-	   service_period = params.get('service_period', None)
-	   trips = stop.GetTrips(schedule)
-	   result = {}
-	   for trip in trips:
-	     route = schedule.GetRoute(trip.route_id)
-	     if service_period == None or trip.service_id == service_period:
-	       if not route.route_short_name+route.route_long_name+trip.service_id in result:
-	         result[route.route_short_name+route.route_long_name+trip.service_id] = (route.route_id, route.route_short_name, route.route_long_name, trip.trip_id, trip.service_id)
-	   return result
-	*/
-}
-function getStopTrips($stopID, $service_period = "")
-{
-    if ($service_period == "") $service_period = service_period();
-    global $conn;
-        $query = "SELECT stop_times.trip_id,arrival_time,stop_id,stop_sequence,service_id,trips.route_id,route_short_name,route_long_name
+	if ($service_period == "") $service_period = service_period();
+	global $conn;
+	$query = "SELECT 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 WHERE stop_id = '$stopID' AND service_id='$service_period'";
-        debug($query,"database");
-	$result = pg_query($conn, $query);
-	if (!$result) {
-		databaseError(pg_result_error($result));
+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");
+	$query = $conn->prepare($query);
+	$query->bindParam(":service_period", $service_period);
+	$query->bindParam(":stopID", $stopID);
+	$query->execute();
+	if (!$query) {
+		databaseError($conn->errorInfo());
 		return Array();
 	}
-	return pg_fetch_all($result);
-
+	return $query->fetchAll();
 }
-function getStopTripsWithTimes($stopID, $time = "", $service_period = "", $time_range = "")
+function getStopTrips($stopID, $service_period = "", $afterTime = "")
 {
-       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:00"));
-       $trips = getStopTrips($stopID,$service_period);
-       $timedTrips = Array();
-	  foreach ($trips as $trip) {
-            if ($trip['arrival_time'] != "") {
-                if (strtotime($trip['arrival_time']) > strtotime($time) and strtotime($trip['arrival_time']) < (strtotime($time) + $time_range)){
-                $timedTrips[] = $trip;
-                }
-            } else {
-	     $tripstarttime = getTripStartTime($trip['trip_id']);
-	     if ($tripstarttime > $time and $tripstarttime < ($time + $time_range)) {
-	       $timedtrip = getTimeInterpolatedTripStop($trip['trip_id'], $trip['stop_sequence']);
-	       if (strtotime($timedtrip['arrival_time']) > strtotime($time) and $timedtrip['arrival_time'] < (strtotime($time) + strtotime($time_range))){
-	         $timedTrips[] = $timedTrip;
-	       }
-             }
-            }
-            if (sizeof($timedTrips) > limit) break;
-          }
-	   sktimesort($timedTrips,"arrival_time", true);
-           return $timedTrips;
+	if ($service_period == "") $service_period = service_period();
+	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, 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,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 = end_times.trip_id
+AND service_id=:service_period
+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
+FROM stop_times
+join trips on trips.trip_id =
+stop_times.trip_id
+join routes on trips.route_id = routes.route_id
+WHERE stop_times.stop_id = :stopID
+AND service_id=:service_period
+ORDER BY arrival_time";
+	}
+	debug($query, "database");
+	$query = $conn->prepare($query);
+	$query->bindParam(":service_period", $service_period);
+	$query->bindParam(":stopID", $stopID);
+        if ($afterTime != "") $query->bindParam(":afterTime", $afterTime);
+	$query->execute();
+	if (!$query) {
+		databaseError($conn->errorInfo());
+		return Array();
+	}
+	return $query->fetchAll();
+}
+function getStopTripsWithTimes($stopID, $time = "", $service_period = "", $time_range = "", $limit = "")
+{
+	if ($service_period == "") $service_period = service_period();
+	if ($time_range == "") $time_range = (24 * 60 * 60);
+	if ($time == "") $time = current_time();
+	if ($limit == "") $limit = 10;
+	$trips = getStopTrips($stopID, $service_period, $time);
+	$timedTrips = Array();
+	if ($trips && sizeof($trips) > 0) {
+            foreach ($trips as $trip) {
+		if ($trip['arrival_time'] != "") {
+			if (strtotime($trip['arrival_time']) > strtotime($time) and strtotime($trip['arrival_time']) < (strtotime($time) + $time_range)) {
+				$timedTrips[] = $trip;
+			}
+		}
+		else {
+			$timedTrip = getTimeInterpolatedTripAtStop($trip['trip_id'], $trip['stop_sequence']);
+			if ($timedTrip['arrival_time'] > $time and strtotime($timedTrip['arrival_time']) < (strtotime($time) + $time_range)) {
+				$timedTrips[] = $timedTrip;
+			}
+		}
+		if (sizeof($timedTrips) > $limit) break;
+	}
+	sktimesort($timedTrips, "arrival_time", true);
+        }
+	return $timedTrips;
 }
 ?>