Map on nearby stops
--- a/include/common-geo.inc.php
+++ b/include/common-geo.inc.php
@@ -1,7 +1,7 @@
<?php
// SELECT array_to_string(array(SELECT REPLACE(name_2006, ',', '\,') as name FROM suburbs order by name), ',')
$suburbs = explode(",", "Acton,Ainslie,Amaroo,Aranda,Banks,Barton,Belconnen,Bonner,Bonython,Braddon,Bruce,Calwell,Campbell,Chapman,Charnwood,Chifley,Chisholm,City,Conder,Cook,Curtin,Deakin,Dickson,Downer,Duffy,Dunlop,Evatt,Fadden,Farrer,Fisher,Florey,Flynn,Forrest,Franklin,Fraser,Fyshwick,Garran,Gilmore,Giralang,Gordon,Gowrie,Greenway,Griffith,Gungahlin,Hackett,Hall,Harrison,Hawker,Higgins,Holder,Holt,Hughes,Hume,Isaacs,Isabella Plains,Kaleen,Kambah,Kingston,Latham,Lawson,Lyneham,Lyons,Macarthur,Macgregor,Macquarie,Mawson,McKellar,Melba,Mitchell,Monash,Narrabundah,Ngunnawal,Nicholls,Oaks Estate,O'Connor,O'Malley,Oxley,Page,Palmerston,Parkes,Pearce,Phillip,Pialligo,Red Hill,Reid,Richardson,Rivett,Russell,Scullin,Spence,Stirling,Symonston,Tharwa,Theodore,Torrens,Turner,Wanniassa,Waramanga,Watson,Weetangera,Weston,Yarralumla");
-function staticmap($mapPoints, $zoom = 0, $markerImage = "iconb", $collapsible = true)
+function staticmap($mapPoints, $zoom = 0, $markerImage = "iconb", $collapsible = true, $twotone = false)
{
global $labsPath;
$width = 300;
@@ -13,14 +13,11 @@
$metersperpixel[13] = 19.093 * $width;
$metersperpixel[14] = 9.547 * $width;
$metersperpixel[15] = 4.773 * $width;
- $metersperpixel[16] = 2.387 * $width;
+ //$metersperpixel[16] = 2.387 * $width;
// $metersperpixel[17]=1.193*$width;
$center = "";
$markers = "";
- $minlat = 999;
- $minlon = 999;
- $maxlat = 0;
- $maxlon = 0;
+ $mapwidthinmeters = 50;
if (sizeof($mapPoints) < 1) return "map error";
if (sizeof($mapPoints) === 1) {
if ($zoom == 0) $zoom = 14;
@@ -29,27 +26,30 @@
}
else {
foreach ($mapPoints as $index => $mapPoint) {
- $markers.= $mapPoint[0] . "," . $mapPoint[1] . "," . $markerImage . ($index + 1);
+ if ($twotone && $index == 0) {
+ $markers.= $mapPoint[0] . "," . $mapPoint[1] . "," . "iconr" . ($index + 1);
+ $center = "{$mapPoints[0][0]},{$mapPoints[0][1]}";
+ }
+ else {
+ $markers.= $mapPoint[0] . "," . $mapPoint[1] . "," . $markerImage . ($index + 1);
+ }
if ($index + 1 != sizeof($mapPoints)) $markers.= "|";
- if ($mapPoint[0] < $minlat) $minlat = $mapPoint[0];
- if ($mapPoint[0] > $maxlat) $maxlat = $mapPoint[0];
- if ($mapPoint[1] < $minlon) $minlon = $mapPoint[1];
- if ($mapPoint[1] > $maxlon) $maxlon = $mapPoint[1];
+ $dist = distance($mapPoints[0][0], $mapPoint[0][1], $mapPoint[0], $mapPoint[1]);
+ $mapwidthinmeters = ($dist > $mapwidthinmeters ? $dist : $mapwidthinmeters);
$totalLat+= $mapPoint[0];
$totalLon+= $mapPoint[1];
}
if ($zoom == 0) {
$mapwidthinmeters = distance($minlat, $minlon, $minlat, $maxlon);
foreach (array_reverse($metersperpixel, true) as $zoomLevel => $maxdistance) {
- if ($zoom == 0 && $mapwidthinmeters < ($maxdistance + 50)) $zoom = $zoomLevel;
+ if ($zoom == 0 && $mapwidthinmeters * 1.5 < ($maxdistance)) $zoom = $zoomLevel;
}
}
$center = $totalLat / sizeof($mapPoints) . "," . $totalLon / sizeof($mapPoints);
}
$output = "";
if ($collapsible) $output.= '<div class="map" data-role="collapsible" data-collapsed="true"><h3>Open Map...</h3>';
- $output.= '<img class="map" src="' . curPageURL() . '/'. $labsPath. '/lib/staticmaplite/staticmap.php?center=' . $center . '&zoom=' . $zoom . '&size=' . $width . 'x' . $height . '&markers=' .
-$markers . '" width=' . $width . ' height=' . $height . '>';
+ $output.= '<img class="map" src="' . curPageURL() . '/' . $labsPath . '/lib/staticmaplite/staticmap.php?center=' . $center . '&zoom=' . $zoom . '&size=' . $width . 'x' . $height . '&markers=' . $markers . '" width=' . $width . ' height=' . $height . '>';
if ($collapsible) $output.= '</div>';
return $output;
}
@@ -67,11 +67,11 @@
$c = 2 * atan2(sqrt($a) , sqrt(1 - $a));
$km = $r * $c;
if ($roundLargeValues) {
- if ($km < 1) return floor($km * 1000);
- else return round($km,2)."k";
- } else return floor($km * 1000);
+ if ($km < 1) return floor($km * 1000);
+ else return round($km, 2) . "k";
+ }
+ else return floor($km * 1000);
}
-
function decodePolylineToArray($encoded)
{
// source: http://latlongeeks.com/forum/viewtopic.php?f=4&t=5
--- a/include/common-request.inc.php
+++ b/include/common-request.inc.php
@@ -15,7 +15,7 @@
$nearby = true;
}
if (isset($_REQUEST['suburb'])) {
- $suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);
+ $suburb = $_REQUEST['suburb'];
}
$pageKey = filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT);
$lat = filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
--- a/include/common-template.inc.php
+++ b/include/common-template.inc.php
@@ -138,21 +138,7 @@
-moz-border-radius: 15px;
border-radius: 15px;
}
-
-/*#leftcolumn {
- float: none;
-}
-.min-width-768px #leftcolumn {
- float: left;
- width: 30%;
-}
-#rightcolumn {
- float: none;
-}
-.min-width-768px #rightcolumn {
- float: right;
- width: 68%;
-}*/
+
#footer {
clear:both;
@@ -175,6 +161,134 @@
width:auto;
height:auto;
}
+
+
+// adaptive layout from jQuery Mobile docs site
+.type-interior .content-secondary {
+ border-right: 0;
+ border-left: 0;
+ margin: 10px -15px 0;
+ background: #fff;
+ border-top: 1px solid #ccc;
+}
+.type-home .ui-content {
+ margin-top: 5px;
+}
+.type-interior .ui-content {
+ padding-bottom: 0;
+}
+.content-secondary .ui-collapsible-contain {
+ padding: 10px 15px;
+
+}
+.content-secondary .ui-collapsible-heading {
+ margin: 0 0 30px;
+}
+.content-secondary .ui-collapsible-heading-collapsed,
+.content-secondary .ui-collapsible-content {
+ padding:0;
+ margin: 0;
+}
+@media all and (min-width: 650px){
+.content-secondary {
+ text-align: left;
+ float: left;
+ width: 45%;
+ background: none;
+ border-top: 0;
+ }
+ .content-secondary,
+ .type-interior .content-secondary {
+ margin: 30px 0 20px 2%;
+ padding: 20px 4% 0 0;
+ background: none;
+ }
+ .type-index .content-secondary {
+ padding: 0;
+ }
+ .type-index .content-secondary .ui-listview {
+ margin: 0;
+ }
+ .content-primary {
+ width: 45%;
+ float: right;
+ margin-top: 30px;
+ margin-right: 1%;
+ padding-right: 1%;
+ }
+ .content-primary ul:first-child {
+ margin-top: 0;
+ }
+
+ .type-interior .content-primary {
+ padding: 1.5em 6% 3em 0;
+ margin: 0;
+ }
+ /* fix up the collapsibles - expanded on desktop */
+ .content-secondary .ui-collapsible-heading {
+ display: none;
+ }
+ .content-secondary .ui-collapsible-contain {
+ margin:0;
+ }
+ .content-secondary .ui-collapsible-content {
+ display: block;
+ margin: 0;
+ padding: 0;
+ }
+ .type-interior .content-secondary .ui-li-divider {
+ padding-top: 1em;
+ padding-bottom: 1em;
+ }
+ .type-interior .content-secondary {
+ margin: 0;
+ padding: 0;
+ }
+
+}
+@media all and (min-width: 750px){
+ .type-home .ui-content,
+ .type-interior .ui-content {
+ background-position: 39%;
+ }
+ .content-secondary {
+ width: 34%;
+ }
+ .content-primary {
+ width: 56%;
+ padding-right: 1%;
+ }
+ .type-interior .ui-content {
+ background-position: 34%;
+ }
+}
+
+@media all and (min-width: 1200px){
+ .type-home .ui-content{
+ background-position: 38.5%;
+ }
+ .type-interior .ui-content {
+ background-position: 30%;
+ }
+ .content-secondary {
+ width: 30%;
+ padding-right:6%;
+ margin: 30px 0 20px 5%;
+ }
+ .type-interior .content-secondary {
+ margin: 0;
+ padding: 0;
+ }
+ .content-primary {
+ width: 50%;
+ margin-right: 5%;
+ padding-right: 3%;
+ }
+ .type-interior .content-primary {
+ width: 60%;
+ }
+}
+
</style>';
if (strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPod') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPad')) {
echo '<meta name="apple-mobile-web-app-capable" content="yes" />
@@ -208,10 +322,6 @@
$(document).ready(function() {
$('#here').click(function(event) { $('#geolocate').val(geolocate()); return false;});
$('#here').show();
- /*if ($.mobile.media('screen and (min-width: 768px)')) {
- $('map a:first').click();
- $('#settings a:first').click();
- }*/
});
";
if (!isset($_SESSION['lat']) || $_SESSION['lat'] == "") echo "geolocate();";
--- a/include/common-transit.inc.php
+++ b/include/common-transit.inc.php
@@ -23,9 +23,12 @@
return 'weekday';
}
}
-function midnight_seconds()
+function midnight_seconds($time = "")
{
// from http://www.perturb.org/display/Perlfunc__Seconds_Since_Midnight.html
+ if ($time != "") {
+ return (date("G", $time) * 3600) + (date("i", $time) * 60) + date("s", $time);
+ }
if (isset($_SESSION['time'])) {
$time = strtotime($_SESSION['time']);
return (date("G", $time) * 3600) + (date("i", $time) * 60) + date("s", $time);
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -6,7 +6,7 @@
"phperror",
"awsotp",
//"squallotp",
- "vanilleotp",
+ //"vanilleotp",
"database",
"other"
);
--- a/labs/myway_timeliness.php
+++ b/labs/myway_timeliness.php
@@ -1,16 +1,6 @@
<?php
include ('../include/common.inc.php');
include_header("MyWay Deltas", "mywayDelta");
-//collect all observation not in delta
-$query = "select * from myway_timingdeltas";
-debug($query, "database");
-$query = $conn->prepare($query);
-$query->execute();
-if (!$query) {
- databaseError($conn->errorInfo());
- return Array();
-}
-
?>
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../js/flot/excanvas.min.js"></script><![endif]-->
@@ -19,26 +9,76 @@
<div id="placeholder" style="width:800px;height:600px"></div>
<script type="text/javascript">
$(function () {
+ var d = new Date();
+ d.setUTCMinutes(0);
+ d.setUTCHours(0);
+ var midnight = d.getTime();
var d1 = [];
<?php
-$i=0;
-foreach($query->fetchAll() as $delta) {
- echo "d1.push([$i, {$delta['timing_delta']}]); \n";
- $i++;
+//$query = "select * from myway_timingdeltas order by time";
+$query = "select * from myway_timingdeltas where abs(timing_delta) < 2*(select stddev(timing_delta) from myway_timingdeltas) order by time;";
+$query = $conn->prepare($query);
+$query->execute();
+if (!$query) {
+ databaseError($conn->errorInfo());
+ return Array();
+}
+$i = 0;
+foreach ($query->fetchAll() as $delta) {
+ echo "d1.push([ midnight+ (1000*" . midnight_seconds(strtotime($delta['time'])) . "), {$delta['timing_delta']}]); \n";
+ $i++;
};
- ?>
-
- $.plot($("#placeholder"), [
+?>
+
+ var d2 = [];
+<?php
+//$query = "select * from myway_timingdeltas order by route_full_name";
+$query = "select * from myway_timingdeltas where abs(timing_delta) < 2*(select stddev(timing_delta) from myway_timingdeltas) order by route_full_name";
+$query = $conn->prepare($query);
+$query->execute();
+if (!$query) {
+ databaseError($conn->errorInfo());
+ return Array();
+}
+$i = 0;
+foreach ($query->fetchAll() as $delta) {
+ // echo "d2.push([$i, {$delta['timing_delta']}]); \n";
+ $i++;
+};
+?>
+ var placeholder = $("#placeholder");
+
+ var plot = $.plot(placeholder, [
{
data: d1,
points: { show: true }
},
-
+ {
+ data: d2,
+ points: { show: true }
+ },
],
{
+ xaxis: {
+ mode: "time",
+ min: midnight + (1000*60*60*8),
+ max: midnight + (1000*60*60*23.5)
+ },
+ yaxis: {
+ tickFormatter: yformatter
+ },
grid: { hoverable: true, clickable: true },
- });
-});
+ });
+ var o;
+ o = plot.pointOffset({ x: midnight+ (9*60*60*1000), y: -1.2});
+ placeholder.append('<div style="position:absolute;left:' + (o.left + 4) + 'px;top:' + o.top + 'px;color:#666;font-size:smaller">9am</div>');
+ o = plot.pointOffset({ x: midnight+ (16*60*60*1000), y: -1.2});
+ placeholder.append('<div style="position:absolute;left:' + (o.left + 4) + 'px;top:' + o.top + 'px;color:#666;font-size:smaller">4pm</div>');
+
+ });
+function yformatter(v) {
+ return Math.floor(v/60) + " minutes " + (v == 0 ? "" : (v >0 ? "early":"late"))
+}
function showTooltip(x, y, contents) {
$('<div id="tooltip">' + contents + '</div>').css( {
position: 'absolute',
@@ -65,8 +105,13 @@
var x = item.datapoint[0].toFixed(2),
y = item.datapoint[1].toFixed(2);
+ var d = new Date();
+d.setTime(x);
+var time = d.getUTCHours() +':'+ (d.getUTCMinutes().toString().length == 1 ? '0'+ d.getMinutes(): d.getUTCMinutes())
+
+
showTooltip(item.pageX, item.pageY,
- item.series.label + " of " + x + " = " + y +" ( "+ y/60+" minutes )");
+ item.series.label + " of " + x + " "+ time +" = " + y +" ( "+ y/60+" minutes )");
}
}
else {
@@ -74,4 +119,5 @@
previousPoint = null;
}
});
+
</script>
--- a/routeList.php
+++ b/routeList.php
@@ -38,7 +38,7 @@
navbar();
timePlaceSettings();
trackEvent("Route Lists", "Routes By Suburb", $suburb);
- $routes = getRoutesbysuburbs($suburb);
+ $routes = getRoutesBySuburb($suburb);
}
if (isset($nearby)) {
include_header("Routes Nearby", "routeList", true, true);
--- a/stop.php
+++ b/stop.php
@@ -60,7 +60,7 @@
}
}
include_header($stop['stop_name'], "stop");
-echo '<span id="leftcolumn">';
+echo '<span class="content-secondary">';
timePlaceSettings();
echo $stopLinks;
if (sizeof($stops) > 0) {
@@ -76,7 +76,7 @@
)
)) ;
}
-echo '</span><span id="rightcolumn">';
+echo '</span><span class="content-primary">';
echo ' <ul data-role="listview" data-inset="true">';
if (sizeof($allStopsTrips) > 0) {
sktimesort($allStopsTrips,"arrival_time", true);
--- a/stopList.php
+++ b/stopList.php
@@ -47,12 +47,26 @@
include_header("Nearby Stops", "stopList", true, true);
trackEvent("Stop Lists", "Stops Nearby", $_SESSION['lat'] . "," . $_SESSION['lon']);
navbar();
- timePlaceSettings(true);
if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") {
+ timePlaceSettings(true);
include_footer();
die();
}
$stops = getNearbyStops($_SESSION['lat'], $_SESSION['lon'], 15);
+ echo '<span class="content-secondary">';
+ $stopPositions[] = Array(
+ $_SESSION['lat'],
+ $_SESSION['lon']
+ );
+ foreach ($stops as $sub_stop) {
+ $stopPositions[] = Array(
+ $sub_stop["stop_lat"],
+ $sub_stop["stop_lon"]
+ );
+ }
+ echo staticmap($stopPositions, 0, "iconb", true, true);
+ timePlaceSettings(true);
+ echo '</span><span class="content-primary">';
}
else if (isset($suburb)) {
$stops = getStopsBySuburb($suburb);
@@ -129,6 +143,7 @@
}
}
echo '</ul>';
+ if (isset($nearby)) echo '</span>';
}
include_footer();
?>
--- a/trip.php
+++ b/trip.php
@@ -1,39 +1,54 @@
<?php
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"];
+ $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 id="leftcolumn">';
+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'] . "&routeid=" . $routeid . '">' . str_replace(" ",":00",str_replace(":00"," ",$othertrip['arrival_time'])). '</a> ';
+$routeTrips = getRouteTrips($routeid);
+foreach ($routeTrips as $key => $othertrip) {
+ if ($othertrip['trip_id']!= $tripid) {
+ echo '<a href="trip.php?tripid=' . $othertrip['trip_id'] . "&routeid=" . $routeid . '">' . str_replace(" ", ":00", str_replace(":00", " ", $othertrip['arrival_time'])) . '</a> ';
+ } else {
+ // skip this trip but look forward/back
+ if ($key-1 > 0) $prevTrip = $routeTrips[$key-1]['trip_id'];
+ if ($key+1 < sizeof($routeTrips)) $nextTrip = $routeTrips[$key+1]['trip_id'];
+
+ }
}
-flush(); @ob_flush();
+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> ';
+ if ($row['route_id'] != $routeid) {
+ echo '<a href="trip.php?routeid=' . $row['route_id'] . '">' . $row['route_long_name'] . ' (' . ucwords($row['service_id']) . ')</a> ';
+ $otherDir++;
+ }
}
-echo '</span><span id="rightcolumn">';
-flush(); @ob_flush();
+if ($otherDir == 0) echo "None";
+echo '</span><span class="content-primary">';
+flush();
+@ob_flush();
+echo "<div class='ui-header' style='overflow: visible; height: 1.5em'>";
+if($nextTrip) echo '<a href="trip.php?tripid=' . $nextTrip . "&routeid=" . $routeid . '" data-icon="arrow-r" class="ui-btn-right">Next Trip</a>';
+if($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 = 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>';
-
+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>';
@@ -45,27 +60,28 @@
$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>';
+ 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();
+ flush();
+ @ob_flush();
$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 '<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 '<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();
+ flush();
+ @ob_flush();
}
}
else {
@@ -88,7 +104,6 @@
}
}
echo '</ul>';
-
echo '</span>';
include_footer();
?>
--- a/tripPlanner.php
+++ b/tripPlanner.php
@@ -1,6 +1,6 @@
<?php
include ('include/common.inc.php');
-include_header("Trip Planner", "tripPlanner", true, true, true);
+include_header("Trip Planner", "tripPlanner", true, false, true);
$from = (isset($_REQUEST['from']) ? filter_var($_REQUEST['from'], FILTER_SANITIZE_STRING) : "");
$to = (isset($_REQUEST['to']) ? filter_var($_REQUEST['to'], FILTER_SANITIZE_STRING) : "");
$date = (isset($_REQUEST['date']) ? filter_var($_REQUEST['date'], FILTER_SANITIZE_STRING) : date("m/d/Y"));
@@ -13,17 +13,17 @@
function tripPlanForm($errorMessage = "")
{
global $date, $time, $from, $to;
- echo "<font color=red>$errorMessage</font>";
+ echo "<div class='error'>$errorMessage</font>";
echo '<form action="tripPlanner.php" method="post">
<div data-role="fieldcontain">
<label for="from">I would like to go from</label>
<input type="text" name="from" id="from" value="' . $from . '" />
- <a href="#" style="display:none" name="fromHere" id="fromHere"/>Here?</a>
+ <a href="#" style="display:none" name="fromHere" id="fromHere">Here?</a>
</div>
<div data-role="fieldcontain">
<label for="to"> to </label>
<input type="text" name="to" id="to" value="' . $to . '" />
- <a href="#" style="display:none" name="toHere" id="toHere"/>Here?</a>
+ <a href="#" style="display:none" name="toHere" id="toHere">Here?</a>
</div>
<div data-role="fieldcontain">
<label for="date"> on </label>
@@ -34,13 +34,7 @@
<input type="time" name="time" id="time" value="' . $time . '" />
</div>
<input type="submit" value="Go!"></form>';
- echo "<script>
-$('#toHere').click(function(event) { $('#to').val(getCookie('geolocate')); return false;});
-$('#toHere').show();
-$('#fromHere').click(function(event) { $('#from').val(getCookie('geolocate')); return false;});
-$('#fromHere').show();
- </script>";
}
function processItinerary($itineraryNumber, $itinerary)
{
@@ -83,7 +77,7 @@
$legArray = object2array($leg);
echo '<h3>Leg #' . ($legNumber + 1) . " ( {$legArray['@mode']} from: {$leg->from->name} to {$leg->to->name}, " . floor($leg->duration / 60000) . " minutes) </h3>\n";
if ($legArray["@mode"] === "BUS") {
- echo "Take bus {$legArray['@route']} " . str_replace("To", "towards", $legArray['@headsign']) . "<br>";
+ echo "Take bus {$legArray['@route']} " . str_replace("To", "towards", $legArray['@headsign']) . " departing at ". formatTime($leg->startTime)."<br>";
}
else {
$walkStepMarkers = array();
@@ -117,7 +111,6 @@
}
else if (strpos($to, "(") !== false) {
$toParts = explode("(", $to);
- print_r($toParts);
$toPlace = str_replace( ")", "", $toParts[1]);
}
else {