--- a/trip.php
+++ b/trip.php
@@ -1,96 +1,162 @@
 <?php
+
+/*
+ *    Copyright 2010,2011 Alexander Sadleir 
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ */
 include ('include/common.inc.php');
-$tripid = filter_var($_REQUEST['tripid'], FILTER_SANITIZE_NUMBER_INT);
-$stopid = filter_var($_REQUEST['stopid'], FILTER_SANITIZE_NUMBER_INT);
-$routeid = filter_var($_REQUEST['routeid'], FILTER_SANITIZE_NUMBER_INT);
 $routetrips = Array();
-if ($_REQUEST['routeid'] && !$_REQUEST['tripid']) {
-	$tripid = 0;
-	$url = $APIurl . "/json/routetrips?route_id=" . $routeid;
-	$routetrips = json_decode(getPage($url));
-	foreach ($routetrips as $trip) {
-		if ($trip[0] > midnight_seconds()) {
-			$tripid = $trip[1];
-			break;
-		}
-	}
-	if ($tripid == 0) $tripid = $routetrips[0][1];
+if (isset($routeids) && !isset($tripid)) {
+    foreach ($routeids as $routeid) {
+        $possibleTrip = getRouteNextTrip($routeid);
+        if (!isset($trip) || strtotime($possibleTrip['departure_time']) < strtotime($trip['departure_time'])) {
+            $trip = getRouteNextTrip($routeid);
+        }
+    }
+    $tripid = $trip['trip_id'];
+} else {
+    $trip = getTrip($tripid);
+    $similarRoutes = getRoutesByNumber($trip['route_short_name'], $trip['direction_id'], service_period_day($trip["service_id"]));
+    $routeids = Array();
+    foreach ($similarRoutes as $similarRoute) {
+        $routeids[] = $similarRoute['route_id'];
+    }
+    $routeids = array_unique($routeids);
 }
-$url = $APIurl . "/json/triprows?trip=" . $tripid;
-$trips = array_flatten(json_decode(getPage($url)));
-if (sizeof($routetrips) == 0) {
-	$routeid = $trips[1]->route_id;
-	$url = $APIurl . "/json/routetrips?route_id=" . $trips[1]->route_id;
-	$routetrips = json_decode(getPage($url));
+$directionid = $trip['direction_id'];
+$service_period = service_period_day($trip["service_id"]);
+$destination = getTripDestination($trip['trip_id']);
+include_header("Stops on " . $trip['route_short_name'] . ' ' . $destination['stop_name'], "trip");
+trackEvent("Route/Trip View", "View Route", $trip['route_short_name'] . ' ' . $destination['stop_name'], $routeid);
+echo '<span class="content-secondary">';
+echo '<a href="' . $trip['route_url'] . '">View Original Timetable/Map</a>';
+echo '<h2>Via:</h2> <small>' . viaPointNames($tripid) . '</small>';
+echo '<h2>Other Trips:</h2> ';
+echo "getRoutesTrips(".print_r($routeids,true).", {$trip['direction_id']}, $service_period)  $tripid";
+$routeTrips = getRoutesTrips($routeids, $trip['direction_id'], $service_period);
+foreach ($routeTrips as $key => $othertrip) {
+   // if ($othertrip['trip_id'] != $tripid) {
+        echo '<a href="trip.php?tripid=' . $othertrip['trip_id'] . "&amp;routeids=" . implode(",", $routeids) . '">' . str_replace("  ", ":00", str_replace(":00", " ", $othertrip['arrival_time'])) . '</a> ';
+  //  } else {
+        // skip this trip but look forward/back
+        if ($key - 1 > 0)
+            $prevTrip = $routeTrips[$key - 1]['trip_id'];
+        if ($key + 1 < sizeof($routeTrips))
+            $nextTrip = $routeTrips[$key + 1]['trip_id'];
+   // }
 }
-include_header("Stops on " . $trips[1]->route_short_name . ' ' . $trips[1]->route_long_name, "trip");
-$url = $APIurl . "/json/tripstoptimes?trip=" . $tripid;
-$json = json_decode(getPage($url));
-$stops = $json[0];
-$times = $json[1];
-$viaPoints = Array();
-foreach ($stops as $stop) {
-	if (!startsWith($stop[5], "Wj")) {
-		$viaPoints[] = $stop[1];
-	}
+flush();
+@ob_flush();
+echo '<h2>Other directions/timing periods:</h2> ';
+$otherDir = 0;
+$filteredRoutes = Array();
+foreach (getRoutesByNumber($trip['route_short_name']) as $row) {
+
+    foreach (getRouteHeadsigns($row['route_id']) as $headsign) {
+        if ( $headsign['direction_id'] != $directionid || service_period_day($headsign['service_id']) != $service_period) {
+           echo "{$headsign['direction_id']} != $directionid || ".service_period_day($headsign['service_id'])." != $service_period <br>";
+            $start = $headsign['stop_name'];
+
+            $serviceday = service_period_day($headsign['service_id']);
+            $key = $row['route_short_name'] . "." . $headsign['direction_id'];
+            if (isset($filteredRoutes[$key])) {
+                $filteredRoutes[$key]['route_ids'][] = $row['route_id'];
+                $filteredRoutes[$key]['route_ids'] = array_unique($filteredRoutes[$key]['route_ids']);
+            } else {
+                $filteredRoutes[$key]['route_short_name'] = $row['route_short_name'];
+                $filteredRoutes[$key]['route_long_name'] = "Starting at " . $start;
+                $filteredRoutes[$key]['service_id'] = $serviceday;
+                $filteredRoutes[$key]['direction_id'] = $headsign['direction_id'];
+            }
+        }
+    }
 }
-echo '<p><h2>Via:</h2> ' . implode(", ", $viaPoints) . '</small></p>';
-echo '<p><h2>Other Trips:</h2> ';
-foreach ($routetrips as $othertrip) {
-	echo '<a href="trip.php?tripid=' . $othertrip[1] . "&routeid=" . $routeid . '">' . midnight_seconds_to_time($othertrip[0]) . '</a> ';
+foreach ($filteredRoutes as $key => $row) {
+    echo '<a href="trip.php?routeids=' . implode(",",$row['route_ids']) . '&directionid='.$row['direction_id'].'">' . $row['route_long_name'] . ' (' . ucwords($row['service_id']) . ')</a> ';
+    $otherDir++;
 }
-echo '</p><p><h2>Other directions/timing periods:</h2> ';
-$url = $APIurl . "/json/routesearch?routeshortname=" . $trips[1]->route_short_name;
-$json = json_decode(getPage($url));
-foreach ($json as $row) {
-	if ($row[0] != $routeid) echo '<a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . ' (' . ucwords($row[3]) . ')</a> ';
+
+if ($otherDir == 0) {
+    echo "None";
 }
+echo '</span><span class="content-primary">';
+flush();
+@ob_flush();
+echo "<div class='ui-header' style='overflow: visible; height: 1.5em'>";
+if ($nextTrip)
+    echo '<a href="trip.php?tripid=' . $nextTrip . "&amp;routeids=" . implode(",", $routeids) . '" data-icon="arrow-r" class="ui-btn-right">Next Trip</a>';
+if ($prevTrip)
+    echo '<a href="trip.php?tripid=' . $prevTrip . "&amp;routeids=" . implode(",", $routeids) . '" data-icon="arrow-l" class="ui-btn-left">Previous Trip</a>';
+echo "</div>";
 echo '  <ul data-role="listview"  data-inset="true">';
-echo '<li data-role="list-divider">' . midnight_seconds_to_time($times[0]) . '-' . midnight_seconds_to_time($times[sizeof($times) - 1]) . ' ' . $trips[1]->route_long_name . '</li>';
 $stopsGrouped = Array();
-foreach ($stops as $key => $row) {
-	if (($stops[$key][1] != $stops[$key + 1][1]) || $key + 1 >= sizeof($stops)) {
-		echo '<li>';
-		if (!startsWith($row[5], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">';
-		if (sizeof($stopsGrouped) > 0) {
-			// print and empty grouped stops
-			// subsequent duplicates
-			$stopsGrouped["stop_ids"][] = $row[0];
-			$stopsGrouped["endTime"] = $times[$key];
-			echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">';
-			echo '<p class="ui-li-aside">' . midnight_seconds_to_time($stopsGrouped['startTime']) . ' to ' . midnight_seconds_to_time($stopsGrouped['endTime']) . '</p>';
-			echo bracketsMeanNewLine($row[1]);
-			echo '</a></li>';
-			$stopsGrouped = Array();
-		}
-		else {
-			// just a normal stop
-			echo '<a href="stop.php?stopid=' . $row[0] . (startsWith($row[5], "Wj") ? '&stopcode=' . $row[5] : "") . '">';
-			echo '<p class="ui-li-aside">' . midnight_seconds_to_time($times[$key]) . '</p>';
-			echo bracketsMeanNewLine($row[1]);
-			echo '</a></li>';
-		}
-	}
-	else {
-		// this is a duplicated line item
-		if ($key - 1 <= 0 || ($stops[$key][1] != $stops[$key - 1][1])) {
-			// first duplicate
-			$stopsGrouped = Array(
-				"name" => $row[1],
-				"startTime" => $times[$key],
-				"stop_ids" => Array(
-					$row[0]
-				)
-			);
-		}
-		else {
-			// subsequent duplicates
-			$stopsGrouped["stop_ids"][] = $row[0];
-			$stopsGrouped["endTime"] = $times[$key];
-		}
-	}
+$tripStopTimes = getTripStopTimes($tripid);
+echo '<li data-role="list-divider">' . $tripStopTimes[0]['arrival_time'] . ' to ' . $tripStopTimes[sizeof($tripStopTimes) - 1]['arrival_time'] . ' towards ' . $destination['stop_name'] . ' (' . ucwords(service_period_day($tripStopTimes[0]['service_id'])) . ')</li>';
+foreach ($tripStopTimes as $key => $tripStopTime) {
+    if ($key + 1 > sizeof($tripStopTimes) || stopCompare($tripStopTimes[$key]["stop_name"]) != stopCompare($tripStopTimes[$key + 1]["stop_name"])) {
+        echo '<li>';
+
+        if (sizeof($stopsGrouped) > 0) {
+            // print and empty grouped stops
+            // subsequent duplicates
+            $stopsGrouped["stop_ids"][] = $tripStopTime['stop_id'];
+            $stopsGrouped["endTime"] = $tripStopTime['arrival_time'];
+            echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">';
+            echo '<p class="ui-li-aside">' . $stopsGrouped['startTime'] . ' to ' . $stopsGrouped['endTime'];
+            if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
+                echo '<br>' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
+            }
+            echo '</p>';
+            echo stopGroupTitle($tripStopTime['stop_name'], $tripStopTime['stop_desc']) . '<br><small>' . sizeof($stopsGrouped["stop_ids"]) . ' stops</small>';
+
+            echo '</a></li>';
+            flush();
+            @ob_flush();
+            $stopsGrouped = Array();
+        } else {
+            // just a normal stop
+            echo '<a href="stop.php?stopid=' . $tripStopTime['stop_id'] . (startsWith($tripStopTime['stop_code'], "Wj") ? '&amp;stopcode=' . $tripStopTime['stop_code'] : "") . '">';
+            echo '<p class="ui-li-aside">' . $tripStopTime['arrival_time'];
+            if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
+                echo '<br>' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
+            }
+            echo '</p>';
+            echo $tripStopTime['stop_name'];
+            echo '</a></li>';
+            flush();
+            @ob_flush();
+        }
+    } else {
+        // this is a duplicated line item
+        if ($key - 1 <= 0 || stopCompare($tripStopTimes[$key]['stop_name']) != stopCompare($tripStopTimes[$key - 1]['stop_name'])) {
+            // first duplicate
+            $stopsGrouped = Array(
+                "name" => trim(preg_replace("/\(Platform.*/", "", $stop['stop_name'])),
+                "startTime" => $tripStopTime['arrival_time'],
+                "stop_ids" => Array(
+                    $tripStopTime['stop_id']
+                )
+            );
+        } else {
+            // subsequent duplicates
+            $stopsGrouped["stop_ids"][] = $tripStopTime['stop_id'];
+            $stopsGrouped["endTime"] = $tripStopTime['arrival_time'];
+        }
+    }
 }
 echo '</ul>';
+echo '</span>';
 include_footer();
 ?>