Title formatting fixes on route view
--- a/common-geo.inc.php
+++ b/common-geo.inc.php
@@ -51,7 +51,7 @@
if ($collapsible) $output.= '</div>';
return $output;
}
-function distance($lat1, $lng1, $lat2, $lng2)
+function distance($lat1, $lng1, $lat2, $lng2, $roundLargeValues = false)
{
$pi80 = M_PI / 180;
$lat1*= $pi80;
@@ -64,7 +64,10 @@
$a = sin($dlat / 2) * sin($dlat / 2) + cos($lat1) * cos($lat2) * sin($dlng / 2) * sin($dlng / 2);
$c = 2 * atan2(sqrt($a) , sqrt(1 - $a));
$km = $r * $c;
- return $km * 1000;
+ if ($roundLargeValues) {
+ if ($km < 1) return floor($km * 1000);
+ else return round($km,2)."k";
+ } else return floor($km * 1000);
}
function decodePolylineToArray($encoded)
{
--- a/common-template.inc.php
+++ b/common-template.inc.php
@@ -1,28 +1,27 @@
<?php
-function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false)
+function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false)
{
echo '
<!DOCTYPE html>
-<html>
- <head>
+<html lang="en">
+ <head>
+ <meta charset="UTF-8">
<title>' . $pageTitle . '</title>';
+ if ($datepicker) echo '<link rel="stylesheet" href="css/jquery.ui.datepicker.mobile.css" />';
if (isDebugServer()) echo '<link rel="stylesheet" href="css/jquery-mobile-1.0a3.css" />
<script type="text/javascript" src="js/jquery-1.5.js"></script>
<script type="text/javascript" src="js/jquery-mobile-1.0a3.js"></script>';
- else echo '<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.css" />
- <script type="text/javascript" src="http://code.jquery.com/jquery-1.5.js"></script>
- <script type="text/javascript" src="http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.js"></script>';
- echo '
-<link rel="stylesheet" href="css/jquery.ui.datepicker.mobile.css" />
- <script>
+ else echo '<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.min.css" />
+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.5.1.min.js"></script>
+ <script type="text/javascript" src="http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.min.js"></script>';
+ if ($datepicker) echo '<script>
//reset type=date inputs to text
$( document ).bind( "mobileinit", function(){
$.mobile.page.prototype.options.degradeInputs.date = true;
});
</script>
- <script src="js/jQuery.ui.datepicker.js"></script>
- <script src="js/jquery.ui.datepicker.mobile.js"></script>
- <style type="text/css">
+ <script src="js/jQuery.ui.datepicker.js"></script>';
+ echo '<style type="text/css">
.ui-navbar {
width: 100%;
}
@@ -46,11 +45,34 @@
body {
background-color: #F0F0F0;
}
-</style>
-<meta name="apple-mobile-web-app-capable" content="yes" />
+ #jqm-homeheader {
+ text-align: center;
+ }
+
+ // source http://webaim.org/techniques/skipnav/
+ #skip a, #skip a:hover, #skip a:visited
+{
+position:absolute;
+left:0px;
+top:-500px;
+width:1px;
+height:1px;
+overflow:hidden;
+}
+
+#skip a:active, #skip a:focus
+{
+position:static;
+width:auto;
+height:auto;
+}
+</style>';
+ if (strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPod')) {
+ echo '<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<link rel="apple-touch-startup-image" href="startup.png" />
<link rel="apple-touch-icon" href="apple-touch-icon.png" />';
+ }
if ($geolocate) {
echo "<script>
@@ -65,25 +87,22 @@
}
if (navigator.geolocation) {
- navigator.geolocation.getCurrentPosition(success, error);
+var options = {
+ enableHighAccuracy: false,
+ timeout: 60000,
+ maximumAge: 10000
+}
+ navigator.geolocation.getCurrentPosition(success, error, options);
}
</script> ";
}
echo '</head>
<body>
+ <div id="skip">
+ <a href="#maincontent">Skip to content</a>
+ </div>
';
- if (isMetricsOn()) {
- require_once ('owa/owa_env.php');
- require_once (OWA_DIR . 'owa_php.php');
- $owa = new owa_php();
- global $owaSiteID;
- $owa->setSiteId($owaSiteID);
- $owa->setPageTitle($pageTitle);
- $owa->setPageType($pageType);
- $owa->trackPageView();
- $owa->placeHelperPageTags();
- }
if ($opendiv) {
echo '<div data-role="page">
<script>
@@ -95,6 +114,7 @@
<div data-role="header">
<h1>' . $pageTitle . '</h1>
</div><!-- /header -->
+ <a name="maincontent" id="maincontent"></a>
<div data-role="content"> ';
}
}
@@ -122,22 +142,22 @@
or enter an address/co-ordinates in the box below.</div>';
}
echo '<div data-role="collapsible" data-collapsed="' . !$geoerror . '">
- <h3>Change Time/Place...</h3>
- <form action="" method="post">
+ <h3>Change Time/Place (' . (isset($_SESSION['time']) ? $_SESSION['time'] : "Current Time,") . ' ' . ucwords(service_period()) . ')...</h3>
+ <form action="'.basename($_SERVER['PHP_SELF']).'" method="post">
<div class="ui-body">
<div data-role="fieldcontain">
<label for="geolocate"> Current Location: </label>
- <input type="text" id="geolocate" name="geolocate" value="' . (isset($_SESSION['lat']) && isset($_SESSION['lon']) ? $_SESSION['lat'] . "," . $_SESSION['lon'] : "Enter co-ordinates or address here") . '"/> <a href="#" style="display:none" name="here" id="here"/>Here?</a>
+ <input type="text" id="geolocate" name="geolocate" value="' . (isset($_SESSION['lat']) && isset($_SESSION['lon']) ? $_SESSION['lat'] . "," . $_SESSION['lon'] : "Enter co-ordinates or address here") . '"/> <a href="#" style="display:none" name="here" id="here">Here?</a>
</div>
<div data-role="fieldcontain">
<label for="time"> Time: </label>
- <input type="time" name="time" id="time" value="' . (isset($_SESSION['time']) ? $_SESSION['time'] : date("H:i")) . '"/> <a href="#" name="currentTime" id="currentTime"/>Current Time?</a>
+ <input type="time" name="time" id="time" value="' . (isset($_SESSION['time']) ? $_SESSION['time'] : date("H:i")) . '"/> <a href="#" name="currentTime" id="currentTime">Current Time?</a>
</div>
<div data-role="fieldcontain">
<label for="service_period"> Service Period: </label>
- <select name="service_period">';
+ <select name="service_period" id="service_period">';
foreach ($service_periods as $service_period) {
- echo "<option value=\"$service_period\"" . (service_period() === $service_period ? "SELECTED" : "") . '>' . ucwords($service_period) . '</option>';
+ echo "<option value=\"$service_period\"" . (service_period() === $service_period ? " SELECTED" : "") . '>' . ucwords($service_period) . '</option>';
}
echo '</select>
<a href="#" style="display:none" name="currentPeriod" id="currentPeriod"/>Current Period?</a>
@@ -148,3 +168,4 @@
</div></div>';
}
?>
+
--- a/common.inc.php
+++ b/common.inc.php
@@ -4,12 +4,12 @@
$cloudmadeAPIkey = "daa03470bb8740298d4b10e3f03d63e6";
$googleMapsAPIkey = "ABQIAAAA95XYXN0cki3Yj_Sb71CFvBTPaLd08ONybQDjcH_VdYtHHLgZvRTw2INzI_m17_IoOUqH3RNNmlTk1Q";
$otpAPIurl = 'http://localhost:8080/opentripplanner-api-webapp/';
-$owaSiteID = 'fe5b819fa8c424a99ff0764d955d23f3';
//$debugOkay = Array("session","json","phperror","other");
$debugOkay = Array(
"session",
"json",
- "phperror"
+ "phperror",
+ "other"
);
if (isDebug("phperror")) error_reporting(E_ALL ^ E_NOTICE);
include_once ("common-geo.inc.php");
@@ -27,36 +27,30 @@
if (isset($_REQUEST['geolocate'])) {
$geocoded = false;
if (isset($_REQUEST['lat']) && isset($_REQUEST['lon'])) {
- $_SESSION['lat'] = filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
- $_SESSION['lon'] = filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+ $_SESSION['lat'] = trim(filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
+ $_SESSION['lon'] = trim(filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
}
else {
- $contents = geocode(filter_var($_REQUEST['geolocate'], FILTER_SANITIZE_URL) , true);
- if (isset($contents[0]->centroid)) {
- $geocoded = true;
- $_SESSION['lat'] = $contents[0]->centroid->coordinates[0];
- $_SESSION['lon'] = $contents[0]->centroid->coordinates[1];
+ $geolocate = filter_var($_REQUEST['geolocate'], FILTER_SANITIZE_URL);
+ echo $_REQUEST['geolocate'];
+ if (startsWith($geolocate, "-")) {
+ $locateparts = explode(",", $geolocate);
+ $_SESSION['lat'] = $locateparts[0];
+ $_SESSION['lon'] = $locateparts[1];
}
else {
- $_SESSION['lat'] = "";
- $_SESSION['lon'] = "";
+ $contents = geocode($geolocate, true);
+ print_r($contents);
+ if (isset($contents[0]->centroid)) {
+ $geocoded = true;
+ $_SESSION['lat'] = $contents[0]->centroid->coordinates[0];
+ $_SESSION['lon'] = $contents[0]->centroid->coordinates[1];
+ }
+ else {
+ $_SESSION['lat'] = "";
+ $_SESSION['lon'] = "";
+ }
}
- }
- if ($_SESSION['lat'] != "" && isMetricsOn()) {
- // Create a new Instance of the tracker
- $owa = new owa_php($config);
- // 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('geolocate');
- // Set a property
- $event->set('lat', $_SESSION['lat']);
- $event->set('lon', $_SESSION['lon']);
- $event->set('geocoded', $geocoded);
- // Track the event
- $owa->trackEvent($event);
}
}
debug(print_r($_SESSION, true) , "session");
@@ -69,13 +63,34 @@
global $debugOkay;
return in_array($debugReason, $debugOkay, false) && isDebugServer();
}
-function isMetricsOn()
-{
- return !isDebugServer();
-}
function debug($msg, $debugReason = "other")
{
if (isDebug($debugReason)) echo "\n<!-- " . date(DATE_RFC822) . "\n $msg -->\n";
+}
+function isJQueryMobileDevice()
+{
+ // http://forum.jquery.com/topic/what-is-the-best-way-to-detect-all-useragents-which-can-handle-jquery-mobile#14737000002087897
+ $user_agent = $_SERVER['HTTP_USER_AGENT'];
+ return preg_match('/iphone/i', $user_agent)
+ || preg_match('/android/i', $user_agent)
+ || preg_match('/webos/i', $user_agent)
+ || preg_match('/ios/i', $user_agent)
+ || preg_match('/bada/i', $user_agent)
+ || preg_match('/maemo/i', $user_agent)
+ || preg_match('/meego/i', $user_agent)
+ || preg_match('/fennec/i', $user_agent)
+ || (preg_match('/symbian/i', $user_agent)
+ && preg_match('/s60/i', $user_agent)
+ && $browser['majorver'] >= 5)
+ || (preg_match('/symbian/i', $user_agent)
+ && preg_match('/platform/i', $user_agent)
+ && $browser['majorver'] >= 3)
+ || (preg_match('/blackberry/i', $user_agent)
+ && $browser['majorver'] >= 5)
+ || (preg_match('/opera mobile/i', $user_agent)
+ && $browser['majorver'] >= 10)
+ || (preg_match('/opera mini/i', $user_agent)
+ && $browser['majorver'] >= 5);
}
function isFastDevice()
{
@@ -139,5 +154,27 @@
{
return str_replace(")", "</small>", str_replace("(", "<br><small>", $input));
}
+function sksort(&$array, $subkey = "id", $sort_ascending = false)
+{
+ if (count($array)) $temp_array[key($array) ] = array_shift($array);
+ foreach ($array as $key => $val) {
+ $offset = 0;
+ $found = false;
+ foreach ($temp_array as $tmp_key => $tmp_val) {
+ if (!$found and strtolower($val[$subkey]) > strtolower($tmp_val[$subkey])) {
+ $temp_array = array_merge((array)array_slice($temp_array, 0, $offset) , array(
+ $key => $val
+ ) , array_slice($temp_array, $offset));
+ $found = true;
+ }
+ $offset++;
+ }
+ if (!$found) $temp_array = array_merge($temp_array, array(
+ $key => $val
+ ));
+ }
+ if ($sort_ascending) $array = array_reverse($temp_array);
+ else $array = $temp_array;
+}
?>
Binary files a/css/images/113-navigation.png and b/css/images/113-navigation.png differ
--- a/css/jquery.ui.datepicker.mobile.css
+++ b/css/jquery.ui.datepicker.mobile.css
@@ -1,30 +1,18 @@
-/*
- * jQuery UI Datepicker @VERSION
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Datepicker#theming
- */
-div.hasDatepicker{ display: block; padding: 0; overflow: visible; margin: 8px 0; }
-.ui-datepicker { overflow: visible; margin: 0; max-width: 500px; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.4em 0; border-bottom: 0; font-weight: bold; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { padding: 1px 0 1px 2px; position:absolute; top: .5em; margin-top: 0; text-indent: -9999px; }
+div.hasDatepicker{display:block;padding:0;overflow:visible;margin:8px 0;}
+.ui-datepicker{overflow:visible;margin:0;max-width:500px;}
+.ui-datepicker .ui-datepicker-header{position:relative;padding:.4em 0;border-bottom:0;font-weight:bold;}
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next{padding:1px 0 1px 2px;position:absolute;top:.5em;margin-top:0;text-indent:-9999px;}
+.ui-datepicker .ui-datepicker-prev{left:6px;}
+.ui-datepicker .ui-datepicker-next{right:6px;}
+.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center;}
+.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0;}
+.ui-datepicker select.ui-datepicker-month-year{width:100%;}
+.ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year{width:49%;}
+.ui-datepicker table{width:100%;border-collapse:collapse;margin:0;}
+.ui-datepicker td{border-width:1px;padding:0;text-align:center;}
+.ui-datepicker td span, .ui-datepicker td a{display:block;padding:.2em 0;font-weight:bold;margin:0;border-width:0;text-align:center;text-decoration:none;}
+.ui-datepicker-calendar th{padding-top:.3em;padding-bottom:.3em;}
+.ui-datepicker-calendar th span, .ui-datepicker-calendar span.ui-state-default{opacity:.3;}
+.ui-datepicker-calendar td a{padding-top:.5em;padding-bottom:.5em;}
+.min-width-480px div.hasDatepicker{width:63%;display:inline-block;margin:0;}
-.ui-datepicker .ui-datepicker-prev { left:6px; }
-.ui-datepicker .ui-datepicker-next { right:6px; }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month,
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker table {width: 100%; border-collapse: collapse; margin:0; }
-.ui-datepicker td { border-width: 1px; padding: 0; text-align: center; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em 0; font-weight: bold; margin: 0; border-width: 0; text-align: center; text-decoration: none; }
-
-.ui-datepicker-calendar th { padding-top: .3em; padding-bottom: .3em; }
-.ui-datepicker-calendar th span, .ui-datepicker-calendar span.ui-state-default { opacity: .3; }
-.ui-datepicker-calendar td a { padding-top: .5em; padding-bottom: .5em; }
-
-.min-width-480px div.hasDatepicker { width: 63%; display: inline-block; margin: 0; }
--- a/index.php
+++ b/index.php
@@ -5,9 +5,10 @@
<div data-role="page">
<div data-role="content">
<div id="jqm-homeheader">
- <center><h3>busness time</h3><br><small>Canberra Bus Timetables and Trip Planner</small></center>
+ <h1>busness time</h1><br><small>Canberra Bus Timetables and Trip Planner</small>
</div>
- <a href="tripPlanner.php" data-role="button" data-icon="navigation">Launch Trip Planner...</a>
+ <a name="maincontent" id="maincontent"></a>
+ <a href="tripPlanner.php" data-role="button" data-icon="navigation">Launch Trip Planner...</a>
<ul data-role="listview" data-inset="true" data-theme="c" data-dividertheme="b">
<li data-role="list-divider">Timetables - Stops</li>
<li><a href="stopList.php">Major (Timing Point) Stops</a></li>
@@ -19,6 +20,7 @@
<li data-role="list-divider">Timetables - Routes</li>
<li><a href="routeList.php">Routes By Final Destination</a></li>
<li><a href="routeList.php?bynumber=yes">Routes By Number</a></li>
+ <li><a href="routeList.php?bysuburb=yes">Routes By Suburb</a></li>
<li><a class="nearby" href="routeList.php?nearby=yes">Nearby Routes</a></li>
</ul>
<?php
--- a/js/jQuery.ui.datepicker.js
+++ b/js/jQuery.ui.datepicker.js
@@ -95,4 +95,62 @@
"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker=
function(a){if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));
return this.each(function(){typeof a=="string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new L;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.5";window["DP_jQuery_"+y]=d})(jQuery);
-;
+;/*
+* jQuery Mobile Framework : temporary extension to port jQuery UI's datepicker for mobile
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT or GPL Version 2 licenses.
+* http://jquery.org/license
+*/
+(function($, undefined ) {
+
+ //cache previous datepicker ui method
+ var prevDp = $.fn.datepicker;
+
+ //rewrite datepicker
+ $.fn.datepicker = function( options ){
+
+ var dp = this;
+
+ //call cached datepicker plugin
+ prevDp.call( this, options );
+
+ //extend with some dom manipulation to update the markup for jQM
+ //call immediately
+ function updateDatepicker(){
+ $( ".ui-datepicker-header", dp ).addClass("ui-body-c ui-corner-top").removeClass("ui-corner-all");
+ $( ".ui-datepicker-prev, .ui-datepicker-next", dp ).attr("href", "#");
+ $( ".ui-datepicker-prev", dp ).buttonMarkup({iconpos: "notext", icon: "arrow-l", shadow: true, corners: true});
+ $( ".ui-datepicker-next", dp ).buttonMarkup({iconpos: "notext", icon: "arrow-r", shadow: true, corners: true});
+ $( ".ui-datepicker-calendar th", dp ).addClass("ui-bar-c");
+ $( ".ui-datepicker-calendar td", dp ).addClass("ui-body-c");
+ $( ".ui-datepicker-calendar a", dp ).buttonMarkup({corners: false, shadow: false});
+ $( ".ui-datepicker-calendar a.ui-state-active", dp ).addClass("ui-btn-active"); // selected date
+ $( ".ui-datepicker-calendar a.ui-state-highlight", dp ).addClass("ui-btn-up-e"); // today"s date
+ $( ".ui-datepicker-calendar .ui-btn", dp ).each(function(){
+ var el = $(this);
+ // remove extra button markup - necessary for date value to be interpreted correctly
+ el.html( el.find( ".ui-btn-text" ).text() );
+ });
+ };
+
+ //update now
+ updateDatepicker();
+
+ // and on click
+ $( dp ).click( updateDatepicker );
+
+ //return jqm obj
+ return this;
+ };
+
+ //bind to pagecreate to automatically enhance date inputs
+ $( ".ui-page" ).live( "pagecreate", function(){
+ $( "#date, input[type='date'], input[data-type='date']" ).each(function(){
+ if ($(this).hasClass("hasDatepicker") == false) {
+ $(this).after( $( "<div />" ).datepicker({ altField: "#" + $(this).attr( "id" ), showOtherMonths: true }) );
+ $(this).addClass("hasDatepicker");
+ }
+ });
+ });
+})( jQuery );
+
--- a/js/jquery.ui.datepicker.mobile.js
+++ /dev/null
@@ -1,59 +1,1 @@
-/*
-* jQuery Mobile Framework : temporary extension to port jQuery UI's datepicker for mobile
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
-*/
-(function($, undefined ) {
- //cache previous datepicker ui method
- var prevDp = $.fn.datepicker;
-
- //rewrite datepicker
- $.fn.datepicker = function( options ){
-
- var dp = this;
-
- //call cached datepicker plugin
- prevDp.call( this, options );
-
- //extend with some dom manipulation to update the markup for jQM
- //call immediately
- function updateDatepicker(){
- $( ".ui-datepicker-header", dp ).addClass("ui-body-c ui-corner-top").removeClass("ui-corner-all");
- $( ".ui-datepicker-prev, .ui-datepicker-next", dp ).attr("href", "#");
- $( ".ui-datepicker-prev", dp ).buttonMarkup({iconpos: "notext", icon: "arrow-l", shadow: true, corners: true});
- $( ".ui-datepicker-next", dp ).buttonMarkup({iconpos: "notext", icon: "arrow-r", shadow: true, corners: true});
- $( ".ui-datepicker-calendar th", dp ).addClass("ui-bar-c");
- $( ".ui-datepicker-calendar td", dp ).addClass("ui-body-c");
- $( ".ui-datepicker-calendar a", dp ).buttonMarkup({corners: false, shadow: false});
- $( ".ui-datepicker-calendar a.ui-state-active", dp ).addClass("ui-btn-active"); // selected date
- $( ".ui-datepicker-calendar a.ui-state-highlight", dp ).addClass("ui-btn-up-e"); // today"s date
- $( ".ui-datepicker-calendar .ui-btn", dp ).each(function(){
- var el = $(this);
- // remove extra button markup - necessary for date value to be interpreted correctly
- el.html( el.find( ".ui-btn-text" ).text() );
- });
- };
-
- //update now
- updateDatepicker();
-
- // and on click
- $( dp ).click( updateDatepicker );
-
- //return jqm obj
- return this;
- };
-
- //bind to pagecreate to automatically enhance date inputs
- $( ".ui-page" ).live( "pagecreate", function(){
- $( "#date, input[type='date'], input[data-type='date']" ).each(function(){
- if ($(this).hasClass("hasDatepicker") == false) {
- $(this).after( $( "<div />" ).datepicker({ altField: "#" + $(this).attr( "id" ), showOtherMonths: true }) );
- $(this).addClass("hasDatepicker");
- }
- });
- });
-})( jQuery );
-
--- a/layar_api.php
+++ b/layar_api.php
@@ -9,7 +9,6 @@
$page_end = $max_page + filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT);
$lat = filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
$lon = filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
-if (isset($_REQUEST['radius'])) $radius = filter_var($_REQUEST['radius'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
$url = $APIurl . "/json/neareststops?lat=$lat&lon=$lon&limit=50";
$contents = json_decode(getPage($url));
debug(print_r($contents, true));
@@ -24,24 +23,22 @@
$hotspot['lat'] = floor($row[2] * 1000000);
$hotspot['lon'] = floor($row[3] * 1000000);
$hotspot['distance'] = distance($row[2], $row[3], $_REQUEST['lat'], $_REQUEST['lon']);
- if (!isset($_REQUEST['radius']) || $hotspot['distance'] < $radius) {
- $hotspot['actions'] = Array(
- Array(
- "label" => 'View more trips/information',
- 'uri' => 'http://bus.lambdacomplex.org/' . 'stop.php?stopid=' . $row[0]
- )
- );
- $url = $APIurl . "/json/stoptrips?stop=" . $row[0] . "&time=" . midnight_seconds() . "&service_period=" . service_period() . "&limit=4&time_range=" . str(90 * 60);
- $trips = json_decode(getPage($url));
- debug(print_r($trips, true));
- foreach ($trips as $key => $row) {
- if ($key < 3) {
- $hotspot['line' . strval($key + 2) ] = $row[1][1] . ' @ ' . midnight_seconds_to_time($row[0]);
- }
+ $hotspot['actions'] = Array(
+ Array(
+ "label" => 'View more trips/information',
+ 'uri' => 'http://bus.lambdacomplex.org/' . 'stop.php?stopid=' . $row[0]
+ )
+ );
+ $url = $APIurl . "/json/stoptrips?stop=" . $row[0] . "&time=" . midnight_seconds() . "&service_period=" . service_period() . "&limit=4&time_range=" . strval(90 * 60);
+ $trips = json_decode(getPage($url));
+ debug(print_r($trips, true));
+ foreach ($trips as $key => $row) {
+ if ($key < 3) {
+ $hotspot['line' . strval($key + 2) ] = $row[1][1] . ' @ ' . midnight_seconds_to_time($row[0]);
}
- if (sizeof($trips) == 0) $hotspot['line2'] = 'No trips in the near future.';
- $output['hotspots'][] = $hotspot;
}
+ if (sizeof($trips) == 0) $hotspot['line2'] = 'No trips in the near future.';
+ $output['hotspots'][] = $hotspot;
}
}
if (sizeof($hotspot) > 0) {
--- /dev/null
+++ b/myway_api.json.php
@@ -1,1 +1,125 @@
+<?php
+function cleanString($subject)
+{
+ $subject = str_replace(" ", " ", $subject);
+ $subject = str_replace("&", "&", $subject);
+ $subject = preg_replace('/[^\r\n\t\x20-\x7E\xA0-\xFF]/', '', $subject);
+ $subject = str_replace(" ", " ", $subject);
+ return trim($subject);
+}
+$return = Array();
+/*if (file_exists("mywayresponse.txt")) {
+ @$fh = fopen("mywayresponse.txt", 'r');
+ if ($fh) {
+ $pageHTML = fread($fh, filesize("mywayresponse.txt"));
+ fclose($fh);
+ }
+}*/
+//set POST variables
+$url = 'https://www.action.act.gov.au/ARTS/use_Funcs.asp';
+$field_mapping = Array(
+ "card_number" => "SRNO",
+ "DOBmonth" => "month",
+ "DOBday" => "day",
+ "DOByear" => "year",
+ "secret_answer" => "pwrd",
+ "button" => "button"
+);
+foreach (Array(
+ "card_number",
+ "DOBday",
+ "DOBmonth",
+ "DOByear"
+) as $field_name) {
+ if (isset($_REQUEST[$field_name])) {
+ $fields[$field_name] = filter_var($_REQUEST[$field_name], FILTER_SANITIZE_NUMBER_INT);
+ }
+ else {
+ $return["error"][] = $field_name. " parameter invalid or unspecified";
+ }
+}
+if (isset($_REQUEST['secret_answer'])) {
+ $fields['secret_answer'] = filter_var($_REQUEST['secret_answer'], FILTER_SANITIZE_STRING, Array(
+ FILTER_FLAG_NO_ENCODE_QUOTES,
+ FILTER_FLAG_STRIP_HIGH,
+ FILTER_FLAG_STRIP_LOW
+ ));
+}
+else {
+ $return["error"][] = "secret_answer parameter invalid or unspecified";
+}
+$fields['button'] = 'Submit';
+$fields_string = "";
+//url-ify the data for the POST
+foreach ($fields as $key => $value) {
+ if (sizeof($value) === 0) $return['error'][] = $key . " parameter invalid or unspecified";
+ $fields_string.= $field_mapping[$key] . '=' . $value . '&';
+}
+$fields_string = rtrim($fields_string, '&');
+if (!isset($return['error'])) {
+ //open connection
+ $ch = curl_init();
+ //set the url, number of POST vars, POST data
+ curl_setopt($ch, CURLOPT_URL, $url);
+ curl_setopt($ch, CURLOPT_POST, count($fields));
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_HEADER, 0);
+ curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+ //execute post
+ $pageHTML = curl_exec($ch);
+ if (curl_errno($ch)) $return["error"][] = "Network error " . curl_errno($ch) . " " . curl_error($ch) . " " . $url . $fields_string;
+ //close connection
+ curl_close($ch);
+}
+if (!isset($return['error'])) {
+ include_once ('simple_html_dom.php');
+ $page = str_get_html($pageHTML);
+ $pageAlerts = $page->find(".smartCardAlert");
+ if (sizeof($pageAlerts) > 0) {
+ $return['error'][] = $pageAlerts[0]->plaintext;
+ }
+ if (!isset($return['error'])) {
+ $tableNum = 0;
+ $tableName = Array(
+ 1 => "myway_carddetails",
+ 2 => "myway_transactions"
+ );
+ foreach ($page->find("table") as $table) {
+ $tableNum++;
+ $tableColumns = Array();
+ $tableColumnNum = 0;
+ foreach ($table->find("th") as $th) {
+ $tableColumns[$tableColumnNum] = cleanString($th->plaintext);
+ $tableColumnNum++;
+ }
+ $tableRowNum = 0;
+ foreach ($table->find("tr") as $tr) {
+ $tableColumnNum = 0;
+ foreach ($tr->find("td") as $td) {
+ if ($tableNum == 1) $return[$tableName[$tableNum]][$tableColumns[$tableColumnNum]] = cleanString($td->plaintext);
+ else $return[$tableName[$tableNum]][$tableRowNum][$tableColumns[$tableColumnNum]] = cleanString($td->plaintext);
+ $tableColumnNum++;
+ }
+ $tableRowNum++;
+ }
+ }
+ }
+}
+if (sizeof($return) == 0) {
+$return['error'][] = "No data extracted from MyWay website - API may be out of date";
+}
+
+header('Content-Type: text/javascript; charset=utf8');
+// header('Access-Control-Allow-Origin: http://bus.lambdacomplex.org/');
+header('Access-Control-Max-Age: 3628800');
+header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE');
+if (isset($_GET['callback'])) {
+ $json = '(' . json_encode($return) . ');'; //must wrap in parens and end with semicolon
+ print_r($_GET['callback'] . $json); //callback is prepended for json-p
+
+}
+else echo json_encode($return);
+?>