--- a/trip.php
+++ b/trip.php
@@ -1,56 +1,98 @@
 <?php
-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);
-if ($_REQUEST['routeid']) {
-	$url = $APIurl . "/json/routetrips?route_id=" . $routeid;
-	$trips = json_decode(getPage($url));
-	debug(print_r($trips, true));
-	foreach ($trips as $trip) {
-		if ($trip[0] < midnight_seconds()) {
-			$tripid = $trip[1];
-			break;
+include ('include/common.inc.php');
+$routetrips = Array();
+if (isset($routeid) && !isset($tripid)) {
+	$trip = getRouteNextTrip($routeid);
+	$tripid = $trip['trip_id'];
+}
+else {
+	$trip = getTrip($tripid);
+	$routeid = $trip["route_id"];
+}
+$routetrips = getRouteTrips($routeid);
+include_header("Stops on " . $trip['route_short_name'] . ' ' . $trip['route_long_name'], "trip");
+trackEvent("Route/Trip View", "View Route", $trip['route_short_name'] . ' ' . $trip['route_long_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> ';
+foreach (getRouteTrips($routeid) as $othertrip) {
+	echo '<a href="trip.php?tripid=' . $othertrip['trip_id'] . "&amp;routeid=" . $routeid . '">' . str_replace("  ", ":00", str_replace(":00", " ", $othertrip['arrival_time'])) . '</a> ';
+}
+flush();
+@ob_flush();
+echo '<h2>Other directions/timing periods:</h2> ';
+$otherDir = 0;
+foreach (getRoutesByNumber($trip['route_short_name']) as $row) {
+	if ($row['route_id'] != $routeid) {
+		echo '<a href="trip.php?routeid=' . $row['route_id'] . '">' . $row['route_long_name'] . ' (' . ucwords($row['service_id']) . ')</a> ';
+		$otherDir++;
+	}
+}
+if ($otherDir == 0) echo "None";
+echo '</span><span class="content-primary">';
+flush();
+@ob_flush();
+echo '  <ul data-role="listview"  data-inset="true">';
+$stopsGrouped = Array();
+$tripStopTimes = getTimeInterpolatedTrip($tripid);
+echo '<li data-role="list-divider">' . $tripStopTimes[0]['arrival_time'] . ' to ' . $tripStopTimes[sizeof($tripStopTimes) - 1]['arrival_time'] . ' ' . $trip['route_long_name'] . ' (' . ucwords($tripStopTimes[0]['service_id']) . ')</li>';
+foreach ($tripStopTimes as $key => $tripStopTime) {
+	if (($tripStopTimes[$key]["stop_name"] != $tripStopTimes[$key + 1]["stop_name"]) || $key + 1 >= sizeof($tripStopTimes)) {
+		echo '<li>';
+		if (!startsWith($tripStopTime['stop_code'], "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"][] = $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 bracketsMeanNewLine($tripStopTime["stop_name"]);
+			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 bracketsMeanNewLine($tripStopTime['stop_name']);
+			echo '</a></li>';
+			flush();
+			@ob_flush();
 		}
 	}
-	if (!($tripid > 0)) $tripid = $trips[0][1];
-}
-$url = $APIurl . "/json/triprows?trip=" . $tripid;
-$trips = array_flatten(json_decode(getPage($url)));
-debug(print_r($trips, true));
-include_header("Stops on " . $trips[1]->route_short_name . ' ' . $trips[1]->route_long_name, "trip");
-if (isMetricsOn()) {
-	// Create a new Instance of the tracker
-	$owa = new owa_php();
-	// Set the ID of the site being tracked
-	$owa->setSiteId($owaSiteID);
-	// Create a new event object
-	$event = $owa->makeEvent();
-	// Set the Event Type, in this case a "video_play"
-	$event->setEventType('view_trip');
-	// Set a property
-	$event->set('trip_id', $tripid);
-	$event->set('route_id', $routeid);
-	$event->set('stop_id', $stopid);
-	// Track the event
-	$owa->trackEvent($event);
-}
-timePlaceSettings();
-echo '  <ul data-role="listview"  data-inset="true">';
-$url = $APIurl . "/json/tripstoptimes?trip=" . $tripid;
-$json = json_decode(getPage($url));
-debug(print_r($json, true));
-$stops = $json[0];
-$times = $json[1];
-foreach ($stops as $key => $row) {
-	echo '<li>';
-	echo '<h3><a href="stop.php?stopid=' . $row[0] . '">' . bracketsMeanNewLine($row[1]);
-	if ($row[0] == $stopid) echo "<br><small> Current Location</small>";
-	echo '</a></h3>';
-	echo '<p class="ui-li-aside">' . midnight_seconds_to_time($times[$key]) . '</p>';
-	echo '</li>';
+	else {
+		// this is a duplicated line item
+		if ($key - 1 <= 0 || ($tripStopTimes[$key]['stop_name'] != $tripStopTimes[$key - 1]['stop_name'])) {
+			// first duplicate
+			$stopsGrouped = Array(
+				"name" => $tripStopTime['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();
 ?>