From: maxious <maxious@lambdacomplex.org>
Date: Sat, 09 Apr 2011 03:32:02 +0000
Subject: Refactor stop time interpolation
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=9cf61536f5c7ab396a5b3bd38a8e1b00bd75d962
---
Refactor stop time interpolation
---


--- a/include/common-geo.inc.php
+++ b/include/common-geo.inc.php
@@ -70,6 +70,7 @@
 	  else return round($km,2)."k";
 	} else return floor($km * 1000);
 }
+
 function decodePolylineToArray($encoded)
 {
 	// source: http://latlongeeks.com/forum/viewtopic.php?f=4&t=5

--- a/include/common-session.inc.php
+++ b/include/common-session.inc.php
@@ -17,7 +17,6 @@
 	}
 	else {
 		$geolocate = filter_var($_REQUEST['geolocate'], FILTER_SANITIZE_URL);
-		echo $_REQUEST['geolocate'];
 		if (startsWith($geolocate, "-")) {
 			$locateparts = explode(",", $geolocate);
 			$_SESSION['lat'] = $locateparts[0];

--- a/include/db/stop-dao.inc.php
+++ b/include/db/stop-dao.inc.php
@@ -1,33 +1,33 @@
 <?php
 function getStop($stopID)
 {
-global $conn;
-        $query = "Select * from stops where stop_id = '$stopID' LIMIT 1";
-        debug($query,"database");
+	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));
 		return Array();
 	}
-	return pg_fetch_assoc($result);    
+	return pg_fetch_assoc($result);
 }
 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");
+	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));
@@ -37,13 +37,13 @@
 }
 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
+	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 $limit;";
-        debug($query,"database");
+	debug($query, "database");
 	$result = pg_query($conn, $query);
 	if (!$result) {
 		databaseError(pg_result_error($result));
@@ -53,9 +53,9 @@
 }
 function getStopsBySuburb($suburb)
 {
-global $conn;
-        $query = "Select * from stops where zone_id LIKE '%$suburb;%' order by stop_name;";
-        debug($query,"database");
+	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));
@@ -65,60 +65,79 @@
 }
 function getStopRoutes($stopID, $service_period)
 {
-        if ($service_period == "") $service_period = service_period();
-    global $conn;
-        $query = "SELECT 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");
+	debug($query, "database");
 	$result = pg_query($conn, $query);
 	if (!$result) {
 		databaseError(pg_result_error($result));
 		return Array();
 	}
 	return pg_fetch_all($result);
-        }
-        
-function getStopTrips($stopID, $service_period = "")
+}
+function getStopTrips($stopID, $service_period = "", $afterTime = "")
 {
-    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
-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");
+	if ($service_period == "") $service_period = service_period();
+	$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
+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 
+WHERE stop_times.stop_id = '$stopID'
+AND stop_times.trip_id = start_times.trip_id
+AND service_id='$service_period'
+AND start_times.arrival_time > '$afterTime'
+ORDER BY start_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");
 	$result = pg_query($conn, $query);
 	if (!$result) {
 		databaseError(pg_result_error($result));
 		return Array();
 	}
 	return pg_fetch_all($result);
-
 }
 function getStopTripsWithTimes($stopID, $time = "", $service_period = "", $time_range = "")
 {
-       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();
+	if ($time_range == "") $time_range = (24 * 60 * 60);
+	if ($time == "") $time = ($_SESSION['time'] ? $_SESSION['time'] : date("H:i:s"));
+	if ($limit == "") $limit = 10;
+	$trips = getStopTrips($stopID, $service_period, $time);
+	$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 {
+			$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;
 }
 ?>

--- a/include/db/trip-dao.inc.php
+++ b/include/db/trip-dao.inc.php
@@ -1,109 +1,143 @@
 <?php
-function getTrip($tripID) {
-    global $conn;
-        $query = "Select * from trips where trip_id = '$tripID' join routes on trips.route_id = routes.route_id LIMIT 1";
-        debug($query,"database");
+function getTrip($tripID)
+{
+	global $conn;
+	$query = "Select * from trips where trip_id = '$tripID' join routes on trips.route_id = routes.route_id LIMIT 1";
+	debug($query, "database");
 	$result = pg_query($conn, $query);
 	if (!$result) {
 		databaseError(pg_result_error($result));
 		return Array();
 	}
-	return pg_fetch_assoc($result);    
-   }
-function getTripShape() {
-    /* def handle_json_GET_tripstoptimes(self, params):
-    schedule = self.server.schedule
-    try:
-      trip = schedule.GetTrip(params.get('trip'))
-    except KeyError:
-       # if a non-existent trip is searched for, the return nothing
-      return
-    time_stops = trip.GetTimeInterpolatedStops()
-    stops = []
-    times = []
-    for arr,ts,is_timingpoint in time_stops:
-      stops.append(StopToTuple(ts.stop))
-      times.append(arr)
-    return [stops, times]
-
-  def handle_json_GET_tripshape(self, params):
-    schedule = self.server.schedule
-    try:
-      trip = schedule.GetTrip(params.get('trip'))
-    except KeyError:
-       # if a non-existent trip is searched for, the return nothing
-      return
-    points = []
-    if trip.shape_id:
-      shape = schedule.GetShape(trip.shape_id)
-      for (lat, lon, dist) in shape.points:
-        points.append((lat, lon))
-    else:
-      time_stops = trip.GetTimeStops()
-      for arr,dep,stop in time_stops:
-        points.append((stop.stop_lat, stop.stop_lon))
-    return points*/
+	return pg_fetch_assoc($result);
 }
-function getTimeInterpolatedTrip($tripID) {
-    /*     rv = []
-
-    stoptimes = self.GetStopTimes()
-    # If there are no stoptimes [] is the correct return value but if the start
-    # or end are missing times there is no correct return value.
-    if not stoptimes:
-      return []
-    if (stoptimes[0].GetTimeSecs() is None or
-        stoptimes[-1].GetTimeSecs() is None):
-      raise ValueError("%s must have time at first and last stop" % (self))
-
-    cur_timepoint = None
-    next_timepoint = None
-    distance_between_timepoints = 0
-    distance_traveled_between_timepoints = 0
-
-    for i, st in enumerate(stoptimes):
-      if st.GetTimeSecs() != None:
-        cur_timepoint = st
-        distance_between_timepoints = 0
-        distance_traveled_between_timepoints = 0
-        if i + 1 < len(stoptimes):
-          k = i + 1
-          distance_between_timepoints += util.ApproximateDistanceBetweenStops(stoptimes[k-1].stop, stoptimes[k].stop)
-          while stoptimes[k].GetTimeSecs() == None:
-            k += 1
-            distance_between_timepoints += util.ApproximateDistanceBetweenStops(stoptimes[k-1].stop, stoptimes[k].stop)
-          next_timepoint = stoptimes[k]
-        rv.append( (st.GetTimeSecs(), st, True) )
-      else:
-        distance_traveled_between_timepoints += util.ApproximateDistanceBetweenStops(stoptimes[i-1].stop, st.stop)
-        distance_percent = distance_traveled_between_timepoints / distance_between_timepoints
-        total_time = next_timepoint.GetTimeSecs() - cur_timepoint.GetTimeSecs()
-        time_estimate = distance_percent * total_time + cur_timepoint.GetTimeSecs()
-        rv.append( (int(round(time_estimate)), st, False) )
-
-    return rv*/
+function getTripShape()
+{
+	/* def handle_json_GET_tripstopTimes(self, params):
+	   schedule = self.server.schedule
+	   try:
+	     trip = schedule.GetTrip(params.get('trip'))
+	   except KeyError:
+	      # if a non-existent trip is searched for, the return nothing
+	     return
+	   time_stops = trip.GetTimeInterpolatedStops()
+	   stops = []
+	   times = []
+	   for arr,ts,is_timingpoint in time_stops:
+	     stops.append(StopToTuple(ts.stop))
+	     times.append(arr)
+	   return [stops, times]
+	
+	 def handle_json_GET_tripshape(self, params):
+	   schedule = self.server.schedule
+	   try:
+	     trip = schedule.GetTrip(params.get('trip'))
+	   except KeyError:
+	      # if a non-existent trip is searched for, the return nothing
+	     return
+	   points = []
+	   if trip.shape_id:
+	     shape = schedule.GetShape(trip.shape_id)
+	     for (lat, lon, dist) in shape.points:
+	       points.append((lat, lon))
+	   else:
+	     time_stops = trip.GetTimeStops()
+	     for arr,dep,stop in time_stops:
+	       points.append((stop.stop_lat, stop.stop_lon))
+	   return points*/
 }
-function getTimeInterpolatedTripAtStop($trip_id, $stop_sequence) {
-   foreach(getTimeInterpolatedTrip($tripID) as $tripStop) {
-    if ($tripStop['stop_sequence'] == $stop_sequence) return $tripStop;
-   }
-   return Array();
+function getTimeInterpolatedTrip($tripID)
+{
+	global $conn;
+	$query = "SELECT stop_times.trip_id,arrival_time,stop_times.stop_id,stop_lat,stop_lon,
+	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
+join stops on stops.stop_id = stop_times.stop_id
+WHERE trips.trip_id = '$tripID' ORDER BY stop_sequence";
+	debug($query, "database");
+	$result = pg_query($conn, $query);
+	if (!$result) {
+		databaseError(pg_result_error($result));
+		return Array();
+	}
+	$stopTimes = pg_fetch_all($result);
+	$cur_timepoint = Array();
+	$next_timepoint = Array();
+	$distance_between_timepoints = 0.0;
+	$distance_traveled_between_timepoints = 0.0;
+	$rv = Array();
+	foreach ($stopTimes as $i => $stopTime) {
+		if ($stopTime['arrival_time'] != "") {
+		    // is timepoint
+			$cur_timepoint = $stopTime;
+			$distance_between_timepoints = 0.0;
+			$distance_traveled_between_timepoints = 0.0;
+			if ($i + 1 < sizeof($stopTimes)) {
+				$k = $i + 1;
+				$distance_between_timepoints += distance($stopTimes[$k - 1]["stop_lat"], $stopTimes[$k - 1]["stop_lon"], $stopTimes[$k]["stop_lat"], $stopTimes[$k]["stop_lon"]);
+				while ($stopTimes[$k]["arrival_time"] == "" && $k + 1 < sizeof($stopTimes)) {
+					$k += 1;
+					//echo "k".$k;
+					$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;
+			}
+		}
+		else {
+		    // is untimed point
+		    //echo "i".$i;
+			$distance_traveled_between_timepoints += distance($stopTimes[$i - 1]["stop_lat"], $stopTimes[$i - 1]["stop_lon"], $stopTimes[$i]["stop_lat"], $stopTimes[$i]["stop_lon"]);
+			//echo "$distance_traveled_between_timepoints / $distance_between_timepoints<br>";
+			$distance_percent = $distance_traveled_between_timepoints / $distance_between_timepoints;
+			if ($next_timepoint["arrival_time"] != "") {
+			$total_time = strtotime($next_timepoint["arrival_time"]) - strtotime($cur_timepoint["arrival_time"]);
+			//echo strtotime($next_timepoint["arrival_time"])." - ".strtotime($cur_timepoint["arrival_time"])."<br>";
+			$time_estimate = ($distance_percent * $total_time) + strtotime($cur_timepoint["arrival_time"]);
+			$stopTime["arrival_time"] = date("H:i:s", $time_estimate);
+			} else {
+			    $stopTime["arrival_time"] = $cur_timepoint["arrival_time"];
+			}
+			$rv[] = $stopTime;
+			//var_dump($rv);
+		}
+	}
+	return $rv;
 }
-
-function getTripStartTime($tripID) {
-    $query = 'SELECT arrival_secs,departure_secs FROM stop_times WHERE trip_id=? ORDER BY stop_sequence LIMIT 1';
-    
+function getTimeInterpolatedTripAtStop($tripID, $stop_sequence)
+{
+    	foreach (getTimeInterpolatedTrip($tripID) as $tripStop) {
+		if ($tripStop['stop_sequence'] == $stop_sequence) return $tripStop;
+	}
+	return Array();
 }
-
+function getTripStartTime($tripID)
+{
+    	global $conn;
+	$query = "Select * from stop_times
+	where trip_id = '$tripID'
+	AND arrival_time IS NOT NULL
+	AND stop_sequence = '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['arrival_time'];
+}
 function viaPointNames($tripid, $stopid)
 {
-    global $conn;
-        $query = "SELECT stop_name
+	global $conn;
+	$query = "SELECT stop_name
 FROM stop_times join stops on stops.stop_id = stop_times.stop_id
 WHERE stop_times.trip_id = '$tripid'
 AND stop_sequence > '$stop_sequence'
 AND substr(stop_code,1,2) != 'Wj' ORDER BY stop_sequence";
-        debug($query,"database");
+	debug($query, "database");
 	$result = pg_query($conn, $query);
 	if (!$result) {
 		databaseError(pg_result_error($result));

--- a/stop.php
+++ b/stop.php
@@ -94,8 +94,8 @@
 	foreach ($trips as $trip) {
 		echo '<li>';
 		echo '<a href="trip.php?stopid=' . $stopid . '&tripid=' . $trip['trip_id'] . '"><h3>' . $trip['route_short_name'] . " " . $trip['route_long_name'] . "</h3><p>";
-		$viaPoints = viaPointNames($trip['trip_id'], $trip['stop_sequence']);
-		if ($viaPoints != "") echo '<br><span class="viaPoints">Via: ' . $viaPoints . '</span>';
+		//$viaPoints = viaPointNames($trip['trip_id'], $trip['stop_sequence']);
+		//if ($viaPoints != "") echo '<br><span class="viaPoints">Via: ' . $viaPoints . '</span>';
 		if (sizeof($tripStopNumbers) > 0) {
 			echo '<br><small>Boarding At: ';
 			foreach ($tripStopNumbers[$trip['trip_id']] as $key) {