--- a/trip.php +++ b/trip.php @@ -1,57 +1,85 @@ 0)) $tripid = $trips[0][1]; +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']) { + $trip = getRouteNextTrip($routeid); + $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); -// Track the event -$owa->trackEvent($event); - } -timePlaceSettings(); -echo '
'.midnight_seconds_to_time($times[$key]).'
'; -echo '' . $stopsGrouped['startTime'] . ' to ' . $stopsGrouped['endTime'] . '
'; + echo bracketsMeanNewLine($tripStopTime["stop_name"]); + echo '' . $tripStopTime['arrival_time'] . '
'; + echo bracketsMeanNewLine($tripStopTime['stop_name']); + echo ''; + flush(); @ob_flush(); + } + } + 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 '