--- a/trip.php +++ b/trip.php @@ -1,56 +1,143 @@ 0)) $tripid = $trips[0][1]; + +/* + * 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'); +$routetrips = Array(); +if (isset($routeid) && !isset($tripid)) { + $trip = getRouteNextTrip($routeid,$directionid); + + if (!($trip)) { + $trip = getRouteFirstTrip($routeid,$directionid); + } + $tripid = $trip['trip_id']; +} else { + $trip = getTrip($tripid); + $routeid = $trip['route_id']; } -$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); +$directionid = $trip['direction_id']; +$service_period = strtolower($trip["service_id"]); +$destination = getTripDestination($trip['trip_id']); +include_header("Route " . $trip['route_id'] . ' to ' . $destination['stop_name'], "trip"); +trackEvent("Route/Trip View", "View Route", $trip['route_id'] . ' ' . $destination['stop_name'], $routeid); +echo '
' . midnight_seconds_to_time($times[$key]) . '
'; - echo ' to ';
+ if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
+ echo '
' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
+ }
+ echo '
';
+ echo '
+
+ ';
+ if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
+ echo '
' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
+ }
+ echo '