More work on mobile UI, changed to network 10 start date
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-maxious-canberra-transit-feed/output/
+origin-src
--- a/betweenpoint.php
+++ b/betweenpoint.php
@@ -7,71 +7,66 @@
function init()
{
- // create the ol map object
- var map = new OpenLayers.Map('map');
+ // create the ol map object
+ var map = new OpenLayers.Map('map');
- var osmtiles = new OpenLayers.Layer.OSM("local", "http://127.0.0.1/Maps/OSM/${z}/${x}/${y}.png")
+ var osmtiles = new OpenLayers.Layer.OSM("local", "http://127.0.0.1/tiles/${z}/${x}/${y}.png")
// use http://open.atlas.free.fr/GMapsTransparenciesImgOver.php and http://code.google.com/p/googletilecutter/ to make tiles
- markers = new OpenLayers.Layer.Markers("Between Stop Markers");
+ markers = new OpenLayers.Layer.Markers("Between Stop Markers");
<?php
-$conn = pg_connect("dbname=bus user=postgres password=snmc");
-if (!$conn) {
- echo "An error occured.\n";
- exit;
-}
-$result_stops = pg_query($conn, "Select * FROM stops");
-
-while ($stop = pg_fetch_assoc($result_stops)) {
-echo 'marker = new OpenLayers.Marker(new OpenLayers.LonLat('.($stop['lng']/10000000).",".($stop['lat']/10000000).')
+ $conn = pg_connect("dbname=bus user=postgres password=snmc");
+ if (!$conn) {
+ echo "An error occured.\n";
+ exit;
+ }
+ $result_stops = pg_query($conn, "Select * FROM stops");
+
+ while ($stop = pg_fetch_assoc($result_stops)) {
+ echo 'marker = new OpenLayers.Marker(new OpenLayers.LonLat(' . ($stop['lng'] / 10000000) . "," . ($stop['lat'] / 10000000) . ')
.transform(
new OpenLayers.Projection("EPSG:4326"), // transform from WGS 1984
new OpenLayers.Projection("EPSG:900913") // to Spherical Mercator Projection
));';
-
-echo '
- marker.id="'.$stop['geohash'].'";
+
+ echo '
+ marker.id="' . $stop['geohash'] . '";
markers.addMarker(marker);
marker.events.register("mousedown", marker, function() {
document.getElementById("between_points").innerHTML += this.id+";";
});
';
-}
+ }
?>
var timeicon = new OpenLayers.Icon("http://maps.google.com/mapfiles/kml/pushpin/grn-pushpin.png",new OpenLayers.Size(32,32));
var timepoints = new OpenLayers.Layer.GeoRSS("Timing Points", "displaytimepoints.georss.php", { icon: timeicon });
map.addLayers([osmtiles, markers,timepoints]);
map.addControl(new OpenLayers.Control.LayerSwitcher());
- map.zoomToExtent(markers.getDataExtent());
+ map.zoomToExtent(markers.getDataExtent());
}
+ </script>
+ <script type="text/javascript">
+function submitBetween () {
+ $.post("betweenpoint.submit.php", $("#inputform").serialize(), function(html){
+ $("#response").html(html);
+ //clearForms();
+ return false;
+ });
+};
- function submit(){
- $.ajax({
- type: "POST",
- url: "betweenpoint.submit.php",
- data: "reverse=" + document.getElementById("reverse").value +
- "&from=" + document.getElementById("from").value +
- "&to=" + document.getElementById("to").value +
- "&routes=" + document.getElementById("routes").value +
- "&between_points=" + document.getElementById("between_points").value,
- success: function(html){
- $("#response").html(html);
- clearForms();
- }
- });
-
- }
-<!--
function OnChange(dropdown)
{
var myindex = dropdown.selectedIndex
- var selValue = dropdown.options[myindex].value
-alert(selValue);
+ var selValue = dropdown.options[myindex].value;
+ $("#routes").val(selValue.split(":",2)[0]);
+ fromto = selValue.split(":",2)[1];
+ $("#from").val(fromto.split("->",2)[0]);
+ $("#to").val(fromto.split("->",2)[1]);
+ document.getElementById("between_points").innerHTML = "";
return true;
}
-//-->
// function will clear input elements on each form
function clearForms(){
@@ -96,7 +91,7 @@
break;
case "radio":
case "checkbox":
- document.forms[x].elements[y].checked = "";
+ document.forms[x].elements[y].checked = true;
break;
case "select-one":
document.forms[x].elements[y].options[0].selected = true;
@@ -118,72 +113,76 @@
<select name=selectPair onchange='OnChange(this.form.selectPair);'>
<option>Select a from/to pair...</option>
<?php
-include('spyc/spyc.php');
-//$timetable = Spyc::YAMLLoad('../spyc.yaml');
-$path = "maxious-canberra-transit-feed/output/";
-$dhandle = opendir("maxious-canberra-transit-feed/output/");
-// define an array to hold the files
-$files = array();
-$paths = array();
+ include('spyc/spyc.php');
+ //$timetable = Spyc::YAMLLoad('../spyc.yaml');
+ $path = "maxious-canberra-transit-feed/output/";
+ $dhandle = opendir("maxious-canberra-transit-feed/output/");
+ // define an array to hold the files
+ $files = array();
+ $paths = array();
+
+ if ($dhandle) {
+ // loop through all of the files
+ while (false !== ($fname = readdir($dhandle))) {
+ if (($fname != '.') && ($fname != '..')) {
+ $timetable = Spyc::YAMLLoad("maxious-canberra-transit-feed/output/" . $fname);
+ // Strip off individual platforms because it usually doesn't matter for routes
+ $timetable["time_points"] = preg_replace("/\(Platform.*/","",$timetable["time_points"]);
+ for ($i = 0; $i < sizeof($timetable["time_points"]) - 1; $i++) {
+ $key = trim($timetable["time_points"][$i]) . "->" . trim($timetable["time_points"][$i + 1]);
+ if (strstr($paths[$key],";" . $timetable["short_name"] . ";") === false)
+ @$paths[$key] .= $timetable["short_name"] . ";";
+ }
+ }
+ }
+ }
+ ksort($paths);
+
+ $completedPaths = array();
+ $result_betweenstops = pg_query($conn, "Select * FROM between_stops");
+ while ($path = pg_fetch_assoc($result_betweenstops)) {
+ $key = trim($path['fromlocation']) . "->" . trim($path['tolocation']);
+ $completedPaths[$key].= trim($path['routes']);
+
+ }
-if ($dhandle) {
- // loop through all of the files
- while (false !== ($fname = readdir($dhandle))) {
- if (($fname != '.') && ($fname != '..')) {
- $timetable = Spyc::YAMLLoad("maxious-canberra-transit-feed/output/".$fname);
- for ($i = 0; $i < sizeof($timetable["time_points"]) -1 ; $i++)
- {
- @$paths[$timetable["time_points"][$i]."->".$timetable["time_points"][$i+1]] .= $timetable["short_name"].";";
- }
+
+ foreach ($paths as $path => $routes) {
+ if (!in_array($path, array_keys($completedPaths))) {
+ echo "<option value=\"$routes:$path\">" . sizeof(explode(";", $routes)) . " $path</option>\n";
+ } else {
+ $completedRoutes = explode(";", $completedPaths[$path]);
+ $incompleteRoutes = "";
+ foreach (explode(";", $routes) as $route) {
+
+ if (!in_array($route,$completedRoutes) && strstr($incompleteRoutes,';'.$route.';') === false) {
+ $incompleteRoutes .= $route.';';
+ }
+
}
- }
-}
-$completedPaths = Array("Cameron Ave Bus Station->Lathlain St Bus Station",
-"Lathlain St Bus Station->Cohen St Bus Station",
-"Cohen St Bus Station->Lathlain St Bus Station",
-"Lathlain St Bus Station->Cameron Ave Bus Station",
-"Lathlain St Bus Station - Platform 1->Cameron Ave Bus Station - Platform 1",
-"Lathlain St Bus Station - Platform 2->Cameron Ave Bus Station - Platform 1",
-"Lathlain St Bus Station - Platform 2->Cameron Ave Bus Station - Platform 2",
-"Lathlain St Bus Station - Platform 3->Cameron Ave Bus Station - Platform 2",
-"Lathlain St Bus Station - Platform 3->Cameron Ave Bus Station - Platform 3",
-"Lathlain St Bus Station - Platform 4->Cohen St Bus Station - Platform 4",
-"Lathlain St Bus Station - Platform 4->Cohen St Bus Station - Platform 6",
-"Lathlain St Bus Station - Platform 5->Cohen St Bus Station - Platform 5",
-"Lathlain St Bus Station - Platform 6->Cohen St Bus Station - Platform 5",
-"Cohen St Bus Station - Platform 1->Lathlain St Bus Station - Platform 2",
-"Cohen St Bus Station - Platform 1->Lathlain St Bus Station - Platform 3",
-"Cohen St Bus Station - Platform 2->Lathlain St Bus Station - Platform 1",
-"Cohen St Bus Station - Platform 2->Lathlain St Bus Station - Platform 2",
-"Cohen St Bus Station - Platform 2->Lathlain St Bus Station - Platform 3",
-"Cohen St Bus Station - Platform 3->Lathlain St Bus Station - Platform 1",
-"Cameron Ave Bus Station - Platform 4->Lathlain St Bus Station - Platform 4",
-"Cameron Ave Bus Station - Platform 5->Lathlain St Bus Station - Platform 5",
-"Cameron Ave Bus Station - Platform 5->Lathlain St Bus Station - Platform 6"
-);
-ksort($paths);
-foreach ($paths as $path => $routes)
-{
- if (!in_array($path,$completedPaths)) echo "<option value=\"$routes:$path\">".sizeof(explode(";",$routes))." $path</option>\n";
-}
+ if ($incompleteRoutes != "") {
+ echo "<option value=\"$incompleteRoutes:$path\">" . sizeof(explode(";", $incompleteRoutes)) . " $path</option>\n";
+ }
+ }
+
+ }
?>
</select>
- from <input type="text" id="from"/>
- to <input type="text" id="to"/>
+ from <input type="text" name="from" id="from"/>
+ to <input type="text" name="to" id="to"/>
<br>
- on routes <input type="text" id="routes"/>
-Reverse? <input type="checkbox" name="reverse" id="reverse" value="true"/>
-<input type="button" onclick="javascript:submit()" name="mysubmit" value="Submit!">
+ on routes <input type="text" name="routes" id="routes"/>
+Reverse? <input type="checkbox" name="reverse" id="reverse" checked="true"/>
+<input type="button" onclick="javascript:submitBetween()" value="Submit!">
<input type="button" value="Clear" onclick="javascript:clearForms()" title="Start clearForms() JavaScript function">
<br>
-<textarea id="between_points" rows="1" cols="120"></textarea>
+<textarea name="between_points" id="between_points" rows="1" cols="120"></textarea>
</form>
-<br><div id="response">
- <!-- Our message will be echoed out here -->
- </div>
+<div id="response">
+ <!-- Our message will be echoed out here -->
+ </div>
</div>
<div id="map" width="100%" height="100%"></div>
</body>
</html>
-
--- a/betweenpoint.submit.php
+++ b/betweenpoint.submit.php
@@ -1,76 +1,32 @@
<?php
-/*
- * GeoPo Encode in PHP
- * @author : Shintaro Inagaki
- * @param $location (Array)
- * @return $geopo (String)
- */
-function geopoEncode($lat, $lng) {
- // 64characters (number + big and small letter + hyphen + underscore)
- $chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
-
- $geopo = "";
- $scale = 7;
-
- // Change a degree measure to a decimal number
- $lat = ($lat + 90) / 180 * pow(8, 10);
- $lng = ($lng + 180) / 360 * pow(8, 10);
- // Compute a GeoPo code from head and concatenate
- for($i = 0; $i < $scale; $i++) {
- $geopo .= substr($chars, floor($lat / pow(8, 9 - $i) % 8) + floor($lng / pow(8, 9 - $i) % 8) * 8, 1);
- }
- return $geopo;
-}
-
-/*
- * GeoPo Decode in PHP
- * @author : Shintaro Inagaki
- * @param $geopo (String)
- * @return $location (Array)
- */
-function geopoDecode($geopo) {
- // 64characters (number + big and small letter + hyphen + underscore)
- $chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
- // Array for geolocation
- $location = array ();
-
- for ($i = 0; $i < strlen($geopo); $i++) {
- // What number of character that equal to a GeoPo code (0-63)
- $order = strpos($chars, substr($geopo, $i, 1));
- // Lat/Lng plus geolocation value of scale
- $location['lat'] = $location['lat'] + floor($order % 8) * pow(8, 9 - $i);
- $location['lng'] = $location['lng'] + floor($order / 8) * pow(8, 9 - $i);
- }
-
- // Change a decimal number to a degree measure, and plus revised value that shift center of area
- $location['lat'] = $location['lat'] * 180 / pow(8, 10) + 180 / pow(8, strlen($geopo)) / 2 - 90;
- $location['lng'] = $location['lng'] * 360 / pow(8, 10) + 360 / pow(8, strlen($geopo)) / 2 - 180;
- $location['scale'] = strlen($geopo);
-
- return $location;
-}
-
$conn = pg_connect("dbname=bus user=postgres password=snmc");
if (!$conn) {
echo "An error occured.\n";
exit;
}
-$xml = simplexml_load_file("04-locatebetweenpoints.osm");
-
-/* Access the <rating> nodes of the first movie.
- * Output the rating scale, too. */
-foreach ($xml->node as $node) {
- $geoPo = geopoEncode((float)$node['lat'],(float)$node['lon']);
- $node['lat'] = (int) ((float)$node['lat']*10000000);
- $node['lon'] = (int) ((float)$node['lon']*10000000);
- echo($node['lat'].",".$node['lon']."=$geoPo<br>");
- $sql = "INSERT INTO stops (geohash, lat, lng) VALUES('$geoPo','{$node['lat']}','{$node['lon']}')";
+print_r($_REQUEST);
+$reverse=$_REQUEST["reverse"];
+$from=$_REQUEST["from"];
+$to=$_REQUEST["to"];
+$routes=$_REQUEST["routes"] ;
+$points=$_REQUEST["between_points"];
+ $sql = "INSERT INTO between_stops (fromLocation, toLocation, points, routes) VALUES('$from','$to','$points','$routes')";
$result = pg_query($conn, $sql);
if (!$result) {
echo("Error in SQL query: " . pg_last_error() ."<br>\n");
}
+ if ($reverse === "on") {
+ $ep = explode(";",$points);
+ $epr = array_reverse($ep);
+ $p = implode(";",$epr).";";
+ $pointsString = substr($p,1);
+$sql = "INSERT INTO between_stops ( toLocation, fromLocation, points, routes) VALUES('$from','$to','$pointsString','$routes')";
+$result = pg_query($conn, $sql);
+ if (!$result) {
+ echo("Error in SQL query: " . pg_last_error() ."<br>\n");
+ }
+ }
flush();
-}
?>
--- a/busui/common.inc.php
+++ b/busui/common.inc.php
@@ -1,5 +1,48 @@
<?php
date_default_timezone_set('Australia/ACT');
+$APIurl = "http://localhost:8765";
+error_reporting(E_ALL ^ E_NOTICE);
+
+function isDebug()
+{
+ return true;
+}
+
+function isFastDevice() {
+ return true;
+}
+
+function include_header($pageTitle, $opendiv = true, $geolocate = false) {
+ // if (isDebug()) // set php error level high
+ echo '
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>bus.lambdacomplex.org - '.$pageTitle.'</title>
+ <link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a2/jquery.mobile-1.0a2.min.css" />
+ <script src="http://code.jquery.com/jquery-1.4.3.min.js"></script><script type="text/javascript"
+src="http://code.jquery.com/mobile/1.0a2/jquery.mobile-1.0a2.min.js"></script>
+ <script type="text/javascript" src="docs/docs.js"></script>
+ <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" />
+</head>
+<body>
+ ';
+if ($opendiv) echo '<div data-role="page">
+
+ <div data-role="header">
+ <h1>'.$pageTitle.'</h1>
+ <a href="index.php" data-icon="back" class="ui-btn-right">Home</a>
+ </div><!-- /header -->
+ <div data-role="content"> ';
+}
+
+function include_footer()
+{
+ echo '</div>';
+}
function service_period()
{
@@ -13,5 +56,54 @@
return 'weekday';
}
}
+
+function midnight_seconds()
+{
+// from http://www.perturb.org/display/Perlfunc__Seconds_Since_Midnight.html
+ $secs = (date("G") * 3600) + (date("i") * 60) + date("s");
+ return $secs;
+}
+
+function midnight_seconds_to_time($seconds)
+{
+ $midnight = mktime (0, 0, 0, date("n"), date("j"), date("Y"));
+ return date("h:ia",$midnight+$seconds);
+}
+function getPage($url)
+{
+ $ch = curl_init($url);
+curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
+curl_setopt( $ch, CURLOPT_HEADER, 0 );
+$page = curl_exec($ch);
+curl_close($ch);
+return $page;
+}
+function array_flatten($a,$f=array()){
+ if(!$a||!is_array($a))return '';
+ foreach($a as $k=>$v){
+ if(is_array($v))$f=array_flatten($v,$f);
+ else $f[$k]=$v;
+ }
+ return $f;
+}
+
+function staticmap($mapPoints)
+{
+$width = 300;
+$height = 300;
+ if (sizeof($mapPoints) < 1) return "";
+ if (sizeof($mapPoints) === 1) $center = "{$mapPoints[0][0]},{$mapPoints[0][1]}";
+ if (sizeof($mapPoints) > 1) $center = "{$mapPoints[0][0]},{$mapPoints[0][1]}"; //TODO average points
+ $markers = "";
+ foreach ($mapPoints as $index => $mapPoint) {
+ if (sizeof($mapPoints) === 1) {
+ $markers .= $mapPoint[0].",".$mapPoint[1].",ol-marker";
+ } else {
+ $markers .= $mapPoint[0].",".$mapPoint[1].",lightblue".($index+1);
+ }
+ }
+ return '<img src="staticmaplite/staticmap.php?center='.$center.'&zoom=14&size='.$width.'x'.$height.'&maptype=mapnik&markers='.$markers.'" width=$width height=$height>';
+}
?>
+
--- a/busui/index.php
+++ b/busui/index.php
@@ -1,101 +1,32 @@
-<!doctype html>
-<html>
- <head>
- <meta charset="UTF-8" />
- <title>jQTouch β</title>
- <style type="text/css" media="screen">@import "jqtouch/jqtouch.min.css";</style>
- <style type="text/css" media="screen">@import "themes/jqt/theme.min.css";</style>
- <script src="jqtouch/jquery.1.3.2.min.js" type="text/javascript" charset="utf-8"></script>
- <script src="jqtouch/jqtouch.min.js" type="application/x-javascript" charset="utf-8"></script>
- <script src="extensions/jqt.location.js" type="application/x-javascript" charset="utf-8"></script>
-
- <script type="text/javascript" charset="utf-8">
- var jQT = new $.jQTouch({
- icon: 'jqtouch.png',
- addGlossToIcon: false,
- startupScreen: 'jqt_startup.png',
- statusBar: 'black',
- preloadImages: [
- 'themes/jqt/img/back_button.png',
- 'themes/jqt/img/back_button_clicked.png',
- 'themes/jqt/img/button_clicked.png',
- 'themes/jqt/img/grayButton.png',
- 'themes/jqt/img/whiteButton.png',
- 'themes/jqt/img/loading.gif'
- ]
- });
- $(function(){
- function setDisplay(text) {
- $('.info').empty().append(text)
- }
-
- // We pass "updateLocation" a callback function,
- // to run once we have the coordinates.
- // We also set it to a variable, so we can know
- // right away if it's working or not
- var lookup = jQT.updateLocation(function(coords){
- if (coords) {
- setDisplay('Latitude: ' + coords.latitude + '<br />Longitude: ' + coords.longitude);
- $('.nearby').empty().append('<a href="list.php?lat=' + coords.latitude + '&lng=' + coords.longitude + '">Nearby List</a>');
- } else {
- setDisplay('Device not capable of geo-location.');
- }
- });
-
- if (lookup) {
- setDisplay('Looking up location…');
- }
- });
- // Some sample Javascript functions:
- $(function(){
- $('a[target="_blank"]').click(function() {
- if (confirm('This link opens in a new window.')) {
- return true;
- } else {
- $(this).removeClass('active');
- return false;
- }
- });
- // Page animation callback events
- $('#pageevents').
- bind('pageAnimationStart', function(e, info){
- $(this).find('.info').append('Started animating ' + info.direction + '… ');
- }).
- bind('pageAnimationEnd', function(e, info){
- $(this).find('.info').append(' finished animating ' + info.direction + '.<br /><br />');
- });
- // Page animations end with AJAX callback event, example 1 (load remote HTML only first time)
- $('#callback').bind('pageAnimationEnd', function(e, info){
- if (!$(this).data('loaded')) { // Make sure the data hasn't already been loaded (we'll set 'loaded' to true a couple lines further down)
- $(this).append($('<div>Loading</div>'). // Append a placeholder in case the remote HTML takes its sweet time making it back
- load('ajax.html .info', function() { // Overwrite the "Loading" placeholder text with the remote HTML
- $(this).parent().data('loaded', true); // Set the 'loaded' var to true so we know not to re-load the HTML next time the #callback div animation ends
- }));
- }
- });
- // Orientation callback event
- $('body').bind('turn', function(e, data){
- $('#orient').html('Orientation: ' + data.orientation);
- });
- });
- </script>
- </head>
- <body>
- <div id="home" class="current">
- <div class="toolbar">
- <h1>jQTouch</h1>
- <a class="button slideup" id="infoButton" href="#about">About</a>
- </div>
- <ul class="rounded">
- <li class="arrow"><a href="#ui">User Interface</a> <small class="counter">4</small></li>
- <li class="arrow"><a href="list.php">All stops List</a></li>
- <li class="arrow nearby">Nearby List</li>
- <li class="arrow"><a href="list.php">Favourites List</a></li>
+<?php
+include('common.inc.php');
+include_header("bus.lambdacomplex.org",false)
+?>
+<div data-role="page" data-theme="b" id="jqm-home" class="ui-page ui-body-b ui-page-active">
+ <div id="jqm-homeheader">
+ <center><h1 id="jqm-logo"><img src="apple-touch-icon.png" alt="jQuery Mobile Framework" width="64" height="64" />
+ bus.lambdacomplex.org</h1></center>
+ </div>
+ <div data-role="content">
+ <ul data-role="listview" data-inset="true" data-theme="c" data-dividertheme="b">
+ <li data-role="list-divider">Stops</li>
+ <li><a href="stopList.php">All stops List</a></li>
+ <li class="nearby"><a href="stopList.php?nearby=yes">Nearby List</a></li>
+ <li><a href="stopList.php?favourites=yes">Favourites List</a></li>
</ul>
- <div class="info">
- <p>Add this page to your home screen to view the custom icon, startup screen, and full screen mode.</p>
+ <ul data-role="listview" data-inset="true" data-theme="c" data-dividertheme="b">
+ <li data-role="list-divider">Routes</li>
+ <li><a href="routeList.php">All Routes List</a></li>
+ <li class="nearby"><a href="routeList.php?nearby=yes">Nearby List</a></li>
+ <li><a href="routeList.php?favourites=yes">Favourites List</a></li>
+ </ul>
+ <div class="ui-body ui-body-c info">
+ <p class="latlng"></p>
+ Time: <?php echo date("H:m"); ?> <br>
+ Service Period: <?php echo ucwords(service_period()); ?>
</div>
</div>
- </body>
+ </div>
+ </body>
</html>
--- a/busui/list.php
+++ /dev/null
@@ -1,22 +1,1 @@
-<div id="get">
- <div class="toolbar">
- <h1>GET Example</h1>
- <a class="back" href="#">AJAX</a>
- </div>
- <div class="info">
- This page was loaded via AJAX.
- </div>
- <ul class="rounded">
- <li><a href="#livetest">Test live events</a></li>
- </ul>
-</div>
-<div id="livetest">
- <div class="toolbar">
- <h1>Events test</h1>
- <a class="back" href="#">AJAX</a>
- <a class="button goback" href="#home">Home</a>
- </div>
- <div class="info">
- This is a test of live events.
- </div>
-</div>
+
--- a/busui/readme.txt
+++ b/busui/readme.txt
@@ -1,2 +1,30 @@
+# input location (via GPS or favourites or search) and destination (via searchable list, optional)
+# http://10.0.1.153:8765/json/boundboxstops?n=-35.27568499917103&e=149.1346514225006&s=-35.279495003493516
+&w=149.12622928619385&limit=50
+# http://10.0.1.153:8765/json/stoptrips?stop=43&time=64440 # recursively call to show all services nearby, sort by distance, need to filter by service period
+# Hey, can pick destination again from a list filtered to places these stops go if you're curious!
+# http://10.0.1.153:8765/json/tripstoptimes?trip=2139 # Can recursively call and parse based on intended destination to show ETA
+# http://10.0.1.153:8765/json/triprows?trip=2139 # For pretty maps
+
+have to do
+/usr/sbin/setsebool -P httpd_can_network_connect=1
+on fedora
+
+might need http://forum.jquery.com/topic/google-maps-inside-jquery-mobile
+
+some extras
+/json/routes = all routes
+/json/neareststops?lat/lng/number
TODO
+Destinations
+Favourites
+OOP stops/routes
+Stop sorting/search-filter
+static maps
+https://code.google.com/apis/maps/documentation/staticmaps/
+http://www.multimap.com/openapidocs/1.2/web_service/staticmaps.htm
+http://dev.openstreetmap.de/staticmap/ (os @ http://sourceforge.net/projects/staticmaplite/)
+(php and open source @ http://trac.openstreetmap.org/browser/sites/other/StaticMap?rev=16348)
+http://pafciu17.dev.openstreetmap.org/
+
--- a/busui/route.php
+++ /dev/null
--- a/busui/routeList.php
+++ b/busui/routeList.php
@@ -1,1 +1,55 @@
+<?php
+include('common.inc.php');
+include_header("Routes");
+/* data-filter="true">';
+echo "<script> $('#routeList').listnav({prefixes: ['to'] }); </script>";*/
+echo ' <ul data-role="listview">';
+$url = $APIurl."/json/routes";
+$contents = json_decode(getPage($url));
+if ($_REQUEST['bynumber']) {
+ $routeSeries = Array();
+ foreach ($contents as $key => $row) {
+ foreach (explode(" ",$row[1]) as $routeNumber ) {
+ $seriesNum = substr($routeNumber, 0, -1)."0";
+ if ($seriesNum == "0") $seriesNum = $routeNumber;
+ $routeSeries[$seriesNum][$seriesNum."-".$row[1]."-".$row[0]] = $row;
+
+
+ }
+ }
+ ksort($routeSeries);
+ foreach ($routeSeries as $series => $routes)
+ {
+ echo '<li>'.$series."... <ul>\n";
+ foreach($routes as $row) {
+ echo '<li>'.$row[1].' <a href="route.php?routeid='.$row[0].'">'.$row[2]."</a></li>\n";
+ }
+ echo "</ul></li>\n";
+ }
+} else {
+ foreach ($contents as $key => $row) {
+ $routeDestinations[$row[2]][] = $row;
+ }
+ foreach ($routeDestinations as $destination => $routes)
+ {
+ echo '<li>'.$destination."... <ul>\n";
+ foreach($routes as $row) {
+ echo '<li>'.$row[1].' <a href="trip.php?routeid='.$row[0].'">'.$row[2]."</a></li>\n";
+ }
+ echo "</ul></li>\n";
+ }
+}
+echo "</ul>\n";
+echo'
+ <div data-role="footer" data-id="foo1" data-position="fixed">
+ <div data-role="navbar">
+ <ul>
+ <li><a href="routeList.php" class="ui-btn-active">By Final Destination...</a></li>
+ <li><a href="routeList.php?bynumber=yes">By Number... </a></li>
+ <li><a href="routeList.php?bysuburb=yes">By Suburb... </a></li>
+ </ul>
+ ';
+include_footer();
+?>
+
--- /dev/null
+++ b/busui/schedule_viewer.py
@@ -1,1 +1,557 @@
-
+#!/usr/bin/python2.5
+
+# Copyright (C) 2007 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in