--- a/busui/trip.php +++ b/busui/trip.php @@ -1,23 +1,41 @@ <?php include('common.inc.php'); -$url = $APIurl."/json/triprows?trip=".$_REQUEST['tripid']; +$tripid = $_REQUEST['tripid']; +$stopid = $_REQUEST['stopid']; +if ($_REQUEST['routeid']) { + $url = $APIurl."/json/routetrips?route_id=".$_REQUEST['routeid']; + $trips = json_decode(getPage($url)); +debug(print_r($trips,true)); +foreach ($trips as $trip) + { + if ($trip[0] < midnight_seconds()) { + $tripid = $trip[1]; + break; + } + } + if (!($tripid > 0)) $tripid = $trips[0][1]; +} +$url = $APIurl."/json/triprows?trip=".$tripid; $trips = array_flatten(json_decode(getPage($url))); -print_r($trips); - +debug(print_r($trips,true)); include_header("Stops on ". $trips[1]->route_short_name . ' '. $trips[1]->route_long_name); -echo ' <ul data-role="listview" >'; +echo ' <ul data-role="listview" data-inset="true">'; - - -$url = $APIurl."/json/tripstoptimes?trip=".$_REQUEST['tripid']; +$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>'.midnight_seconds_to_time($times[$key]).' <a href="stop.php?stopid='.$row[0].'">'.$row[1].'</a></li>'; + 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>'; } echo '</ul>'; include_footer();