From: maxious
Date: Fri, 15 Jul 2011 00:25:26 +0000
Subject: Disable broken trip planner geolocation
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=dd1522f917bad2600d1d35e76b0c6ff1f4223acd
---
Disable broken trip planner geolocation
---
--- 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%;
+ }
+}
+
';
if (strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPod') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPad')) {
echo '
@@ -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/labs/myway_timeliness.php
+++ b/labs/myway_timeliness.php
@@ -1,16 +1,6 @@
prepare($query);
-$query->execute();
-if (!$query) {
- databaseError($conn->errorInfo());
- return Array();
-}
-
?>
@@ -19,26 +9,76 @@
--- 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 '';
+echo '';
timePlaceSettings();
echo $stopLinks;
if (sizeof($stops) > 0) {
@@ -76,7 +76,7 @@
)
)) ;
}
-echo '';
+echo '';
echo ' ';
if (sizeof($allStopsTrips) > 0) {
sktimesort($allStopsTrips,"arrival_time", true);
--- a/trip.php
+++ b/trip.php
@@ -1,39 +1,42 @@
';
+trackEvent("Route/Trip View", "View Route", $trip['route_short_name'] . ' ' . $trip['route_long_name'], $routeid);
+echo '';
+echo 'View Original Timetable/Map';
echo 'Via:
' . viaPointNames($tripid) . '';
echo 'Other Trips:
';
foreach (getRouteTrips($routeid) as $othertrip) {
- echo '' . str_replace(" ",":00",str_replace(":00"," ",$othertrip['arrival_time'])). ' ';
+ echo '' . str_replace(" ", ":00", str_replace(":00", " ", $othertrip['arrival_time'])) . ' ';
}
-flush(); @ob_flush();
+flush();
+@ob_flush();
echo 'Other directions/timing periods:
';
+$otherDir = 0;
foreach (getRoutesByNumber($trip['route_short_name']) as $row) {
- if ($row['route_id'] != $routeid) echo '' . $row['route_long_name'] . ' (' . ucwords($row['service_id']) . ') ';
+ if ($row['route_id'] != $routeid) {
+ echo '' . $row['route_long_name'] . ' (' . ucwords($row['service_id']) . ') ';
+ $otherDir++;
+ }
}
-echo '';
-flush(); @ob_flush();
+if ($otherDir == 0) echo "None";
+echo '';
+flush();
+@ob_flush();
echo ' ';
$stopsGrouped = Array();
$tripStopTimes = getTimeInterpolatedTrip($tripid);
-echo '- ' . $tripStopTimes[0]['arrival_time'] . ' to ' . $tripStopTimes[sizeof($tripStopTimes) - 1]['arrival_time'] . ' ' . $trip['route_long_name'] . ' (' . ucwords($tripStopTimes[0]['service_id']).')
';
-
+echo '- ' . $tripStopTimes[0]['arrival_time'] . ' to ' . $tripStopTimes[sizeof($tripStopTimes) - 1]['arrival_time'] . ' ' . $trip['route_long_name'] . ' (' . ucwords($tripStopTimes[0]['service_id']) . ')
';
foreach ($tripStopTimes as $key => $tripStopTime) {
if (($tripStopTimes[$key]["stop_name"] != $tripStopTimes[$key + 1]["stop_name"]) || $key + 1 >= sizeof($tripStopTimes)) {
echo '- ';
@@ -45,27 +48,28 @@
$stopsGrouped["endTime"] = $tripStopTime['arrival_time'];
echo '';
echo '
' . $stopsGrouped['startTime'] . ' to ' . $stopsGrouped['endTime'];
-
- if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
- echo '
' . distance($tripStopTime['stop_lat'],$tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
- }
- echo '
';
+ if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
+ echo '
' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
+ }
+ echo '
';
echo bracketsMeanNewLine($tripStopTime["stop_name"]);
echo '';
- flush(); @ob_flush();
+ flush();
+ @ob_flush();
$stopsGrouped = Array();
}
else {
// just a normal stop
echo '';
- echo '' . $tripStopTime['arrival_time'];
+ echo '
' . $tripStopTime['arrival_time'];
if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
- echo '
' . distance($tripStopTime['stop_lat'],$tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
- }
- echo '
';
- echo bracketsMeanNewLine($tripStopTime['stop_name']);
+ echo '
' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
+ }
+ echo '';
+ echo bracketsMeanNewLine($tripStopTime['stop_name']);
echo '';
- flush(); @ob_flush();
+ flush();
+ @ob_flush();
}
}
else {
@@ -88,7 +92,6 @@
}
}
echo '';
-
echo '';
include_footer();
?>
--- a/tripPlanner.php
+++ b/tripPlanner.php
@@ -1,6 +1,6 @@
$errorMessage";
+ echo "$errorMessage";
echo '
';
- echo "";
}
function processItinerary($itineraryNumber, $itinerary)
{
@@ -117,7 +111,6 @@
}
else if (strpos($to, "(") !== false) {
$toParts = explode("(", $to);
- print_r($toParts);
$toPlace = str_replace( ")", "", $toParts[1]);
}
else {