--- a/trip.php +++ b/trip.php @@ -32,8 +32,8 @@ $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_short_name'] . ' ' . $destination['stop_name'], $routeid); -echo '<span class="content-secondary">'; +trackEvent("Route/Trip View", "View Route", $trip['route_id'] . ' ' . $destination['stop_name'], $routeid); +echo '<div class="content-secondary">'; echo '<a href="' . $trip['route_url'] . '">View Original Timetable/Map</a> '; echo '<a href="geo/trip.kml.php?tripid='.$tripid.'">View Trip in Google Earth</a> '; echo '<a href="geo/route.kml.php?routeid='.$routeid.'">View Route in Google Earth</a>'; @@ -59,7 +59,7 @@ foreach (getRouteHeadsigns($routeid) as $headsign) { if ($headsign['direction_id'] != $directionid || strtolower($headsign['service_id']) != $service_period) { - echo '<a href="trip.php?routeid=' . $routeid . '&directionid=' . $headsign['direction_id'] . '&service_period=' . $headsign['service_id'] . '"> Starting at ' . $headsign['stop_name'] . ' (' . $headsign['service_id'] . ')</a> '; + echo '<a href="trip.php?routeid=' . $routeid . '&directionid=' . $headsign['direction_id'] . '&service_period=' . $headsign['service_id'] . '"> Starting at ' . $headsign['stop_name'] . ' (' . $headsign['service_id'] . ')</a> '; $otherDir++; } } @@ -67,21 +67,23 @@ if ($otherDir == 0) { echo "None"; } -echo '</span><span class="content-primary">'; +echo '</div><div class="content-primary">'; flush(); @ob_flush(); echo "<div class='ui-header' style='overflow: visible; height: 1.5em'>"; -if ($nextTrip) +if (isset($nextTrip)) { echo '<a href="trip.php?tripid=' . $nextTrip . "&routeid=" . $routeid . '" data-icon="arrow-r" class="ui-btn-right">Next Trip</a>'; -if ($prevTrip) +} +if (isset($prevTrip)) { echo '<a href="trip.php?tripid=' . $prevTrip . "&routeid=" . $routeid . '" data-icon="arrow-l" class="ui-btn-left">Previous Trip</a>'; +} echo "</div>"; echo ' <ul data-role="listview" data-inset="true">'; $stopsGrouped = Array(); $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(strtolower($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"])) { + if ($key + 1 >= sizeof($tripStopTimes) || stopCompare($tripStopTimes[$key]["stop_name"]) != stopCompare($tripStopTimes[$key + 1]["stop_name"])) { echo '<li>'; if (sizeof($stopsGrouped) > 0) { @@ -89,13 +91,13 @@ // 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']; + echo '<a class="vevent" href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">'; + echo '<p class="ui-li-aside"> <time class="dtstart" datetime="'.date("c",strtotime($stopsGrouped['startTime'])).'">' . $stopsGrouped['startTime'] . '</time> to <time class="dtend" datetime="'.date("c",strtotime($stopsGrouped['endTime'])).'">' . $stopsGrouped['endTime'] . '</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 stopGroupTitle($tripStopTime['stop_name'], $tripStopTime['stop_desc']) . '<br><small>' . sizeof($stopsGrouped["stop_ids"]) . ' stops</small>'; + echo '</p><span class="summary">'; + echo stopGroupTitle($tripStopTime['stop_name'], $tripStopTime['stop_desc']) . '</span><br><small>' . sizeof($stopsGrouped["stop_ids"]) . ' stops</small>'; echo '</a></li>'; flush(); @@ -103,14 +105,17 @@ $stopsGrouped = Array(); } else { // just a normal stop - echo '<a href="stop.php?stopid=' . $tripStopTime['stop_id'] . (startsWith($tripStopTime['stop_code'], "Wj") ? '&stopcode=' . $tripStopTime['stop_code'] : "") . '">'; - echo '<p class="ui-li-aside">' . $tripStopTime['arrival_time']; + echo '<span itemscope itemtype="http://schema.org/BusStop" class="vevent"> <a itemprop="url" href="stop.php?stopid=' . $tripStopTime['stop_id'] . (startsWith($tripStopTime['stop_code'], "Wj") ? '&stopcode=' . $tripStopTime['stop_code'] : "") . '">'; + echo '<p class="ui-li-aside geo"><time class="dtstart" datetime="'.date("c",strtotime($trip['arrival_time'])).'">' . $tripStopTime['arrival_time'].'</time>'; + echo '<abbr class="latitude" title="'.$tripStopTime['stop_lat'].'"></abbr> + <abbr class="longitude" title="'.$tripStopTime['stop_lon'].'"></abbr><meta itemprop="latitude" content="'.$tripStopTime['stop_lat'].'" /> + <meta itemprop="longitude" content="'.$tripStopTime['stop_lon'].'" />'; 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 '</p><span class="summary" itemprop="name">'; echo $tripStopTime['stop_name']; - echo '</a></li>'; + echo '</span></a></li>'; flush(); @ob_flush(); } @@ -119,7 +124,6 @@ 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'] @@ -133,7 +137,7 @@ } } echo '</ul>'; -echo '</span>'; +echo '</div>'; include_footer(); ?>