From: maxious <maxious@vanille.(none)>
Date: Mon, 29 Nov 2010 06:59:24 +0000
Subject: Fix typos in headboards/destination names
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=bus.git&a=commitdiff&h=cf6adb3c90eb2a77c3f861dce97dfa3b4b382b51
---
Fix typos in headboards/destination names
---


--- a/betweenpoint.php
+++ b/betweenpoint.php
@@ -10,7 +10,7 @@
     // 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");
  
@@ -64,6 +64,7 @@
   fromto = selValue.split(":",2)[1];
   $("#from").val(fromto.split("->",2)[0]);
   $("#to").val(fromto.split("->",2)[1]);
+ document.getElementById("between_points").innerHTML = "";
     return true;
 }
 
@@ -126,9 +127,11 @@
           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"]);
+		$timetable["time_points"] = preg_replace("/\(Platform.*/","",$timetable["time_points"]);
               for ($i = 0; $i < sizeof($timetable["time_points"]) - 1; $i++) {
-                  @$paths[trim($timetable["time_points"][$i]) . "->" . trim($timetable["time_points"][$i + 1])] .= $timetable["short_name"] . ";";
+		$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"] . ";";
               }
           }
       }
@@ -138,9 +141,12 @@
   $completedPaths = array();
   $result_betweenstops = pg_query($conn, "Select * FROM between_stops");
   while ($path = pg_fetch_assoc($result_betweenstops)) {
-      $completedPaths[trim($path['fromlocation']) . "->" . trim($path['tolocation'])] .= trim($path['routes']);
+    $key = trim($path['fromlocation']) . "->" . trim($path['tolocation']);
+    $completedPaths[$key].= trim($path['routes']);
+    
   }
-  
+
+ 
   foreach ($paths as $path => $routes) {
       if (!in_array($path, array_keys($completedPaths))) {
           echo "<option value=\"$routes:$path\">" . sizeof(explode(";", $routes)) . " $path</option>\n";
@@ -149,12 +155,14 @@
 	 $incompleteRoutes = "";
 	foreach (explode(";", $routes) as $route) {
 
-	  if (!in_array($route,$completedRoutes)) {
+	  if (!in_array($route,$completedRoutes) && strstr($incompleteRoutes,';'.$route.';') === false) {
 	  $incompleteRoutes .= $route.';';
 	  }
 	  
 	}
-	if ($incompleteRoutes != "") echo "<option value=\"$incompleteRoutes:$path\">" . sizeof(explode(";", $incompleteRoutes)) . " $path</option>\n";
+	if ($incompleteRoutes != "") {
+	  echo "<option value=\"$incompleteRoutes:$path\">" . sizeof(explode(";", $incompleteRoutes)) . " $path</option>\n";
+	}
       }
       
   }

--- a/betweenpoint.submit.php
+++ b/betweenpoint.submit.php
@@ -16,8 +16,11 @@
          echo("Error in SQL query: " . pg_last_error() ."<br>\n");
      }
      if ($reverse === "on") {
-	$points = implode(";",array_reverse(explode(";",$points)));
-$sql = "INSERT INTO between_stops ( toLocation, fromLocation, points, routes) VALUES('$from','$to','$points','$routes')";
+	$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");

--- /dev/null
+++ b/busui/about.php
@@ -1,1 +1,9 @@
+<?php
+include('common.inc.php');
+?>
+<p>
+Some icons by Joseph Wain / glyphish.com
+<?
+include_footer();
+?>
 

--- a/busui/common.inc.php
+++ b/busui/common.inc.php
@@ -8,28 +8,82 @@
     return true;
 }
 
+function debug($msg) {
+    if (isDebug()) echo "<!-- $msg -->";
+}
 function isFastDevice() {
     return true;
 }
 
-function include_header($pageTitle) {
+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.0a1/jquery.mobile-1.0a1.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.0a1/jquery.mobile-1.0a1.min.js"></script> 
-	<script type="text/javascript" src="docs/docs.js"></script> 
-</head> 
+	<link rel="stylesheet"  href="http://code.jquery.com/mobile/1.0a2/jquery.mobile-1.0a2.min.css" />
+     <style type="text/css">
+     .ui-navbar {
+     padding-bottom: 18px;
+     width: 100%;
+     }
+</style>
+	<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>
+    <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>
+
+function setCookie(c_name,value,expiredays)
+{
+var exdate=new Date();
+exdate.setDate(exdate.getDate()+expiredays);
+document.cookie=c_name+ \"=\" +escape(value)+
+((expiredays==null) ? \"\" : \";expires=\"+exdate.toUTCString());
+}
+
+function getCookie(c_name)
+{
+if (document.cookie.length>0)
+  {
+  c_start=document.cookie.indexOf(c_name + \"=\");
+  if (c_start!=-1)
+    {
+    c_start=c_start + c_name.length+1;
+    c_end=document.cookie.indexOf(\";\",c_start);
+    if (c_end==-1) c_end=document.cookie.length;
+    return unescape(document.cookie.substring(c_start,c_end));
+    }
+  }
+return \"\";
+}
+
+function success(position) {
+$('#geolocate').val(position.coords.latitude+','+position.coords.longitude);
+setCookie('geolocate',position.coords.latitude+','+position.coords.longitude,1);
+}
+
+function error(msg) {
+ console.log(msg);
+}
+
+if (navigator.geolocation) {
+  navigator.geolocation.getCurrentPosition(success, error);
+}
+
+</script> ";
+ }
+echo '</head> 
 <body> 
- 
-<div data-role="page"> 
+ ';
+if ($opendiv) echo '<div data-role="page"> 
  
 	<div data-role="header"> 
-		<h1>'.$pageTitle.'</h1> 
+		<h1>'.$pageTitle.'</h1>
 	</div><!-- /header -->
         <div data-role="content"> ';
 }
@@ -38,6 +92,8 @@
 {
     echo '</div>';
 }
+
+$service_periods = Array ('sunday','saturday','weekday');
 
 function service_period()
 {
@@ -52,6 +108,11 @@
 }	
 }
 
+function remove_spaces($string)
+{
+    return str_replace(' ','',$string);
+}
+
 function midnight_seconds()
 {
 // from http://www.perturb.org/display/Perlfunc__Seconds_Since_Midnight.html
@@ -81,5 +142,181 @@
   }
   return $f;
 }
+
+function staticmap($mapPoints, $zoom = 0, $markerImage = "iconb")
+{
+$width = 300;
+$height = 300;
+$metersperpixel[9]=305.492*$width;
+$metersperpixel[10]=152.746*$width;
+$metersperpixel[11]=76.373*$width;
+$metersperpixel[12]=38.187*$width;
+$metersperpixel[13]=19.093*$width;
+$metersperpixel[14]=9.547*$width;
+$metersperpixel[15]=4.773*$width;
+$metersperpixel[16]=2.387*$width;
+// $metersperpixel[17]=1.193*$width;
+$center = "";
+$markers = "";
+$minlat = 999;
+$minlon = 999;
+$maxlat = 0;
+$maxlon = 0;
+
+    if (sizeof($mapPoints) < 1) return "map error";
+    if (sizeof($mapPoints) === 1) {
+         if ($zoom == 0) $zoom = 14;
+            $markers .= "{$mapPoints[0][0]},{$mapPoints[0][1]},$markerimage";
+            $center = "{$mapPoints[0][0]},{$mapPoints[0][1]}";        
+    } else {
+        foreach ($mapPoints as $index => $mapPoint) {
+            $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];
+            $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;
+            }
+        }
+       $center = $totalLat/sizeof($mapPoints).",".$totalLon/sizeof($mapPoints);
+    }
+    
+    return '<img src="staticmaplite/staticmap.php?center='.$center.'&zoom='.$zoom.'&size='.$width.'x'.$height.'&maptype=mapnik&markers='.$markers.'" width='.$width.' height='.$height.'>';
+}
+
+function distance($lat1, $lng1, $lat2, $lng2)
+{
+	$pi80 = M_PI / 180;
+	$lat1 *= $pi80;
+	$lng1 *= $pi80;
+	$lat2 *= $pi80;
+	$lng2 *= $pi80;
+
+	$r = 6372.797; // mean radius of Earth in km
+	$dlat = $lat2 - $lat1;
+	$dlng = $lng2 - $lng1;
+	$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;
+}
+
+function decodePolylineToArray($encoded)
+{
+// source: http://latlongeeks.com/forum/viewtopic.php?f=4&t=5
+  $length = strlen($encoded);
+  $index = 0;
+  $points = array();
+  $lat = 0;
+  $lng = 0;
+
+  while ($index < $length)
+  {
+    // Temporary variable to hold each ASCII byte.
+    $b = 0;
+
+    // The encoded polyline consists of a latitude value followed by a
+    // longitude value.  They should always come in pairs.  Read the
+    // latitude value first.
+    $shift = 0;
+    $result = 0;
+    do
+    {
+      // The `ord(substr($encoded, $index++))` statement returns the ASCII
+      //  code for the character at $index.  Subtract 63 to get the original
+      // value. (63 was added to ensure proper ASCII characters are displayed
+      // in the encoded polyline string, which is `human` readable)
+      $b = ord(substr($encoded, $index++)) - 63;
+
+      // AND the bits of the byte with 0x1f to get the original 5-bit `chunk.
+      // Then left shift the bits by the required amount, which increases
+      // by 5 bits each time.
+      // OR the value into $results, which sums up the individual 5-bit chunks
+      // into the original value.  Since the 5-bit chunks were reversed in
+      // order during encoding, reading them in this way ensures proper
+      // summation.
+      $result |= ($b & 0x1f) << $shift;
+      $shift += 5;
+    }
+    // Continue while the read byte is >= 0x20 since the last `chunk`
+    // was not OR'd with 0x20 during the conversion process. (Signals the end)
+    while ($b >= 0x20);
+
+    // Check if negative, and convert. (All negative values have the last bit
+    // set)
+    $dlat = (($result & 1) ? ~($result >> 1) : ($result >> 1));
+
+    // Compute actual latitude since value is offset from previous value.
+    $lat += $dlat;
+
+    // The next values will correspond to the longitude for this point.
+    $shift = 0;
+    $result = 0;
+    do
+    {
+      $b = ord(substr($encoded, $index++)) - 63;
+      $result |= ($b & 0x1f) << $shift;
+      $shift += 5;
+    }
+    while ($b >= 0x20);
+
+    $dlng = (($result & 1) ? ~($result >> 1) : ($result >> 1));
+    $lng += $dlng;
+
+    // The actual latitude and longitude values were multiplied by
+    // 1e5 before encoding so that they could be converted to a 32-bit
+    // integer representation. (With a decimal accuracy of 5 places)
+    // Convert back to original values.
+    $points[] = array($lat * 1e-5, $lng * 1e-5);
+  }
+
+  return $points;
+}
+
+function object2array($object) {
+    if (is_object($object)) {
+        foreach ($object as $key => $value) {
+            $array[$key] = $value;
+        }
+    }
+    else {
+        $array = $object;
+    }
+    return $array;
+}
+
+function geocode($query, $giveOptions) {
+       $url = "http://geocoding.cloudmade.com/daa03470bb8740298d4b10e3f03d63e6/geocoding/v2/find.js?query=".$query."&bbox=-35.5,149.00,-35.15,149.1930&return_location=true&bbox_only=true";
+      $contents = json_decode(getPage($url));
+      if ($giveOptions) return $contents->features;
+      elseif (isset($contents->features[0]->centroid)) return $contents->features[0]->centroid->coordinates[0].",".$contents->features[0]->centroid->coordinates[1];
+      else return "";
+}
+
+function reverseGeocode($lat,$lng) {
+      $url = "http://geocoding.cloudmade.com/daa03470bb8740298d4b10e3f03d63e6/geocoding/v2/find.js?around=".$lat.",".$lng."&distance=closest&object_type=road";
+      $contents = json_decode(getPage($url));
+      return $contents->features[0]->properties->name;
+}
+
+function startsWith($haystack,$needle,$case=true) {
+    if($case){return (strcmp(substr($haystack, 0, strlen($needle)),$needle)===0);}
+    return (strcasecmp(substr($haystack, 0, strlen($needle)),$needle)===0);
+}
+
+function endsWith($haystack,$needle,$case=true) {
+    if($case){return (strcmp(substr($haystack, strlen($haystack) - strlen($needle)),$needle)===0);}
+    return (strcasecmp(substr($haystack, strlen($haystack) - strlen($needle)),$needle)===0);
+}
 ?>
   
+

--- a/busui/index.php
+++ b/busui/index.php
@@ -1,64 +1,53 @@
 <?php 
-include('common.inc.php'); 
+include('common.inc.php');
+include_header("bus.lambdacomplex.org",false, true)
 ?>
-<!doctype html>
-<html>
-    <head>
-        <meta charset="UTF-8" />
-        <title>bus.lambdacomplex.org</title>
-	<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a1/jquery.mobile-1.0a1.min.css" />
-	<script src="http://code.jquery.com/jquery-1.4.3.min.js"></script>
-	<script src="http://code.jquery.com/mobile/1.0a1/jquery.mobile-1.0a1.min.js"></script>
-        <!-- <script src="jqtouch/extensions/jqt.location.js" type="application/x-javascript" charset="utf-8"></script>  -->
- 
-<!--        <script type="text/javascript" charset="utf-8">
-            $(function(){
-                function setDisplay(text) {
-                    $('.latlng').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&hellip;');
-                }
-            });
-        </script> -->
-    </head>
-    <body>
-<div data-role="page" data-theme="b" id="jqm-home"> 
-	<div id="jqm-homeheader"> 
-		<p>bus.lambdacomplex.org</p> 
+<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="logo" width="64" height="64" /><br>
+		bus.lambdacomplex.org</h1></center>
 	</div> 
-	<div data-role="content"> 
+	<div data-role="content">
+	    <a href="tripPlanner.php" data-role="button">Launch Trip Planner...</a>
             <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="">Nearby List</a></li>
-                <li><a href="stopList.php">Favourites List</a></li>
+                <li data-role="list-divider">Timetables - Stops</li>
+                <li><a href="stopList.php">Major (Timing Point) Stops</a></li>
+		<li><a href="stopList.php">All Stops</a></li>
+		<li><a href="stopList.php?nearbyfavs=yes">Nearby/Favourite Stops</a></li>
             </ul>
 	    <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="">Nearby List</a></li>
-                <li><a href="routeList.php">Favourites List</a></li>
+                <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?nearbyfavs=yes">Nearby/Favourites Routes</a></li>
             </ul>
-            <div class="info">
-		<p class="latlng"></p>
-		Time: <?php echo date("H:m"); ?> <br>
-		Service Period: <?php echo ucwords(service_period()); ?> 
+            <div class="ui-body ui-body-c">
+		<h3>Time/Place Settings</h3>
+		<div data-role="fieldcontain">
+	            <label for="geolocate"> Current Location: </label>
+			<input type="text" id="geolocate" name="geolocate"/> <a href="#" style="display:none" name="here" id="here"/>Here?</a>
+	        </div>
+    		<div data-role="fieldcontain">
+		        <label for="time"> Time: </label>
+		    	<input type="time" value="<?php echo date("H:m"); ?>"/> <a href="#" style="display:none" name="currentTime" id="currentTime"/>Current Time?</a>
+	        </div>
+		<div data-role="fieldcontain">
+		    <label for="service_period"> Service Period:  </label>
+			<select name="service_period">	
+			   <?php
+			   foreach ($service_periods as $service_period) {
+			    echo "<option value=\"$service_period\"".(service_period() === $service_period ? "SELECTED" : "").'>'.ucwords($service_period).'</option>';
+			   }?>
+			</select>
+			<a href="#" style="display:none" name="currentPeriod" id="currentPeriod"/>Current Period?</a>
+		</div>
+		
+		<input type="submit" value="Update"/>
             </div>
+	<script>
+$('#here').click(function(event) { $('#geolocate').val(getCookie('geolocate')); return false;});
+$('#here').show();
+        </script>
         </div>
    </div>
  </body>

--- a/busui/readme.txt
+++ b/busui/readme.txt
@@ -21,3 +21,10 @@
 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,34 +1,90 @@
 <?php
 include('common.inc.php');
 include_header("Routes");
-/* data-filter="true">';
-echo "<script> $('#routeList').listnav({prefixes: ['to'] }); </script>";*/
+echo'
+		<div data-role="navbar"> 
+			<ul> 
+				<li><a href="routeList.php">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>
+                </div>
+	';
 echo '  <ul data-role="listview">';
 $url = $APIurl."/json/routes";
+$contents = json_decode(getPage($url));
+debug(print_r($contents,true));
 
-$contents = json_decode(getPage($url));
-foreach ($contents as $key => $row) {
-    $routeDestinations[$row[2]][]  = $row;
+function printRoutes($routes){
+	foreach($routes as $row) {
+				echo  '<li>'.$row[1].' <a href="trip.php?routeid='.$row[0].'">'.$row[2]." (".ucwords($row[3]).")</a></li>\n";
+			}
 }
-foreach ($routeDestinations as $destination => $routes)
-{
-	echo '<li>'.$destination."... <ul>\n";
-		foreach($routes as $row) {
-      			echo  '<li>'.$row[1].' <a href="route.php?routeid='.$row[0].'">'.$row[2]."</a></li>\n";
+
+if ($_REQUEST['bynumber']) {
+	$routeSeries = Array();
+	$seriesRange = Array();
+	foreach ($contents as $key => $row) {
+		foreach (explode(" ",$row[1]) as $routeNumber ) {
+			$seriesNum = substr($routeNumber, 0, -1)."0";
+			if ($seriesNum == "0") $seriesNum = $routeNumber;
+			$finalDigit = substr($routeNumber, sizeof($routeNumber)-1, 1);
+			if (isset($seriesRange[$seriesNum])) {
+				if ($finalDigit < $seriesRange[$seriesNum]['max'])
+					$seriesRange[$seriesNum]['max'] = $routeNumber;
+				if ($finalDigit > $seriesRange[$seriesNum]['min'])
+					$seriesRange[$seriesNum]['min'] = $routeNumber;
+			} else {
+				$seriesRange[$seriesNum]['max'] = $routeNumber;
+				$seriesRange[$seriesNum]['min'] = $routeNumber;
+			}
+			$routeSeries[$seriesNum][$seriesNum."-".$row[1]."-".$row[0]]  = $row;
 		}
-	echo "</ul></li>\n";
+	}
+	ksort($routeSeries);
+	ksort($seriesRange);
+		echo '<div class="noscriptnav"> Go to route numbers: ';
+		foreach ($seriesRange as $series => $range) 
+		{
+		  if ($range['min'] == $range['max']) echo "<a href=\"#$series\">$series</a>&nbsp;"; 
+		  else  echo "<a href=\"#$series\">{$range['min']}-{$range['max']}</a>&nbsp;"; 
+		}
+		echo "</div>
+			<script>
+		$('.noscriptnav').hide();
+			</script>";
+	foreach ($routeSeries as $series => $routes)
+	{
+		echo '<a name="'.$series.'"></a>';
+		if ($series <= 9) echo '<li>'.$series."<ul>\n";
+		else echo "<li>{$seriesRange[$series]['min']}-{$seriesRange[$series]['max']}<ul>\n";
+			printRoutes($routes);
+		echo "</ul></li>\n";
+	}
+} else {
+	foreach ($contents as $key => $row) {
+	    $routeDestinations[$row[2]][]  = $row;
+	}
+	echo '<div class="noscriptnav"> Go to Destination: ';
+		foreach(ksort($routeDestinations) as $destination => $routes) 
+		{ 
+		   echo "<a href=\"#$destination\">$destination</a>&nbsp;"; 
+		}
+		echo "</div>
+			<script>
+		$('.noscriptnav').hide();
+			</script>";
+	foreach ($routeDestinations as $destination => $routes)
+	{
+		echo '<a name="'.$destination.'"></a>';
+		echo '<li>'.$destination."... <ul>\n";
+		printRoutes($routes);
+		echo "</ul></li>\n";
+	}
 }
 echo "</ul>\n";
-/*
- <div data-role="footer" data-id="foo1" data-position="fixed"> 
-		<div data-role="navbar"> 
-			<ul> 
-				<li><a href="footer-persist-a.html" class="ui-btn-active">Friends</a></li> 
-				<li><a href="footer-persist-b.html">Albums</a></li> 
-				<li><a href="footer-persist-c.html">Emails</a></li> 
-			</ul> 
-		</div><!-- /navbar -->
-*/
+
+
 include_footer();
 ?>
 

--- a/busui/schedule_viewer.py
+++ b/busui/schedule_viewer.py
@@ -256,7 +256,12 @@
     schedule = self.server.schedule
     result = []
     for r in schedule.GetRouteList():
-      result.append( (r.route_id, r.route_short_name, r.route_long_name) )
+      servicep = None
+      for t in schedule.GetTripList():
+        if t.route_id == r.route_id:
+          servicep = t.service_period
+          break
+      result.append( (r.route_id, r.route_short_name, r.route_long_name, servicep.service_id) )
     result.sort(key = lambda x: x[1:3])
     return result
 
@@ -264,7 +269,17 @@
     schedule = self.server.schedule
     route = schedule.GetRoute(params.get('route', None))
     return [transitfeed.Route._FIELD_NAMES, route.GetFieldValuesTuple()]
-
+    
+  def handle_json_GET_routetrips(self, params):
+    """ Get a trip for a route_id (preferablly the next one) """
+    schedule = self.server.schedule
+    query = params.get('route_id', None).lower()
+    result = []
+    for t in schedule.GetTripList():
+      if t.route_id == query:
+        result.append ( (t.GetStartTime(), t.trip_id) )
+    return sorted(result, key=lambda trip: trip[0])
+  
   def handle_json_GET_triprows(self, params):
     """Return a list of rows from the feed file that are related to this
     trip."""
@@ -369,6 +384,7 @@
     schedule = self.server.schedule
     stop = schedule.GetStop(params.get('stop', None))
     time = int(params.get('time', 0))
+    service_period = params.get('service_period', None)
     time_trips = stop.GetStopTimeTrips(schedule)
     time_trips.sort()  # OPT: use bisect.insort to make this O(N*ln(N)) -> O(N)
     # Keep the first 15 after param 'time'.
@@ -397,8 +413,8 @@
         trip_name += route.route_long_name
       if headsign:
         trip_name += " (Direction: %s)" % headsign
-
-      result.append((time, (trip.trip_id, trip_name, trip.service_id), tp))
+      if service_period == None or trip.service_id == service_period:
+        result.append((time, (trip.trip_id, trip_name, trip.service_id), tp))
     return result
 
   def handle_GET_ttablegraph(self,params):

--- /dev/null
+++ b/busui/staticmaplite/.gitignore
@@ -1,1 +1,3 @@
+cache/tiles
+cache/map
 

--- /dev/null
+++ b/busui/staticmaplite/images/markers/GPlotter - Make Google Maps Easily.URL
@@ -1,1 +1,3 @@
+[InternetShortcut]
+URL=http://gplotter.offwhite.net/
 

--- /dev/null
+++ b/busui/staticmaplite/images/markers/Google Maps Icons, Free!.URL
@@ -1,1 +1,3 @@
+[InternetShortcut]
+URL=http://brennan.offwhite.net/blog/2005/07/23/new-google-maps-icons-free/
 

--- /dev/null
+++ b/busui/staticmaplite/index.html
@@ -1,1 +1,122 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de-de" lang="de-de">
+<head>
+	<!-- 
+		CSS based on template of Dandelion wiki engine by Radomir Dopieralski who released this
+		template under the terms of GNU GPL. http://dandelion.sheep.art.pl/
+	-->
+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<title>staticMapLite</title>
+	<style type="text/css">
+html{font:96% sans-serif;color:#000;background:#f7f7f7;line-height:1.4;}
+body{color:#333;}
+#wrapper{margin:auto;width:60em;position:relative;}
+#header{padding:0px 0px 7px 0px; height: 1em;}
+#header h1 { float:left; width: 40%; }
+#content{background:white;padding:1em;border:1px solid #e0d78a;outline:0.5em solid #fef4a4;  margin:0.5em 0;padding:20px;min-height:20em;}
+h1{margin-top:0px;}
+h1,h2,h3,h4,h5,h6{letter-spacing:0.05em;color:#1474CA;font-weight:normal;}
+h1 a:hover,h2 a:hover,h3 a:hover,h4 a:hover,h5 a:hover,h6 a:hover{text-decoration:none;}
+a{color:#1474CA;text-decoration:none;}
+a:visited{color:#1474CA;}
+a.pending{color:#c174a0;}
+a:hover{text-decoration:underline;}
+a img{border:none;}
+input,textarea{font-size:94%;border:1px solid #999;background:#fff;color:#666;outline:0.2em solid #eee;padding:0px;line-height:1.2;margin:0.5em;vertical-align:middle;}
+textarea{display:block;margin:0.5em auto;width:100%;}
+pre{outline:0.4em solid #eee;padding:0.5em;margin:0.5em;border:1px solid #e0d78a;background:#fef4a4;color:#644e22;}
+img{border:1px solid #ccc;outline:0.25em solid #eee;padding:0.25em;margin:0.25em 0 0.25em 0.5em;background:#fff;}
+hr{height:0;border:none;color:#fff;background:transparent;border-bottom:1px solid #ccc; margin:0.5em 0;}
+#diff {outline:none;border:none;}
+#diff ins{color:green;text-decoration:none;font-weight:bold;}
+#diff del{color:red;text-decoration:line-through;}
+#diff{background:#fff;line-height:1.25;padding:1em;white-space:pre-wrap;word-wrap:break-word;    white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;width:97%;}
+hr{margin:10px 0 10px 0;height:0px;overflow:hidden;border:0px;border-top:2px solid #ccc;}
+.error{color:#F25A5A;font-weight:bold;}
+form{display:inline;}
+#contentTextarea{height:44em;}
+#toc{margin:5px 0 5px 10px;padding:6px 5px 7px 0px;float:right;list-style:none;outline:0.4em solid #eee;background:#fef4a4;border:1px solid #e0d78a;}
+#toc ul{list-style:none;padding:3px 0 3px 10px;}
+#toc li{font-size:11px;padding-left:10px;}
+#toc ul li{font-size:10px;}
+#toc ul ul li{font-size:9px;}
+#toc ul ul ul li{font-size:8px;}
+#toc ul ul ul ul li{font-size:7px;}
+.pageVersionsList{letter-spacing:0px;font-variant:normal;font-size:12px;}
+#renameForm{float:left;}
+.clear{clear:both;}
+.tagList{padding:0.2em 0.4em 0.2em 0.4em;margin-top:0.5em;border:1px dashed #e0d78a;background:#fef4a4;color:#644e22;}
+.tagCloud{float:right;width:200px;padding:0.5em;margin:1em;border:1px dashed #e0d78a;background:#fef4a4;color:#644e22;}
+#fileTable{border-collapse:collapse;}
+#fileTable td{border:1px solid #FEF4A4;padding:2px 6px 2px 6px;}
+h2 span.par-edit, h3 span.par-edit, h4 span.par-edit, h5 span.par-edit, h6 span.par-edit {display:none;}
+h2:hover span.par-edit, h3:hover span.par-edit, h4:hover span.par-edit, h5:hover span.par-edit, h6:hover span.par-edit {display:inline;font-size:x-small;}
+.comment-item { border:1px solid #999;color:#666;outline:0.2em solid #eee; }
+.resizeTextareaDiv { margin-top: 5px;}
+a.toolbarTextareaItem { padding-right: 10px; }
+a.external:after { content: "\2197";}
+	</style>
+  </head>
 
+<body>
+	<div id="wrapper">
+	<div id="header">
+	</div>
+	<div id="content">
+
+		<div class="par-div">
+			<h2>
+				staticMapLite - simple map for your website
+			</h2>
+			<p>
+				<img src="staticmap.php?center=40.714728,-73.998672&zoom=14&size=865x512&maptype=mapnik" width="865" height="512" /></p>
+			<p>
+				This image was created using the following simple &lt;img> tag:
+<pre>&lt;img src="staticmap.php?center=40.714728,-73.998672&amp;zoom=14&amp;size=865x512&amp;maptype=mapnik" /&gt;</pre>
+			</p>
+		</div>
+		<hr />
+		<div class="par-div">
+			<h3>
+				Place Markers
+			</h3>
+
+			<p>
+				<img src="staticmap.php?center=40.714728,-73.998672&zoom=14&size=865x512&maptype=mapnik&markers=40.702147,-74.015794,lightblue1|40.711614,-74.012318,lightblue2|40.718217,-73.998284,lightblue3" width="865" height="512" />
+</p><p>				Add markers by appending them to the image URL:
+<pre>markers=40.702147,-74.015794,lightblue1|40.711614,-74.012318,lightblue2|40.718217,-73.998284,lightblue3</pre>
+			</p>
+		</div>
+		<hr />
+		<div class="par-div">
+			<h3>
+				Use Different Map Styles (Tile Sources)
+			</h3>
+
+			<p>
+				<div style="float:left; margin-right: 10px">
+					<img src="staticmap.php?center=40.714728,-73.998672&zoom=14&size=256x256&maptype=mapnik" width="256" height="256" />
+					<pre>maptype=mapnik</pre>
+				</div>
+				<div style="float:left; margin-right: 10px">
+					<img src="staticmap.php?center=40.714728,-73.998672&zoom=14&size=256x256&maptype=osmarenderer" width="256" height="256" />
+					<pre>maptype=osmarenderer</pre>
+				</div>
+				<div style="float:left; margin-right: 10px">
+					<img src="staticmap.php?center=40.714728,-73.998672&zoom=14&size=256x256&maptype=cycle" width="256" height="256" />
+					<pre>maptype=cycle</pre>
+				</div>
+				<br style="clear:both" />
+			</p>
+		</div>
+
+	</div>
+	<div id="footer">
+		<div style="text-align:center;padding:7px;color:#ccc">
+			sponsored by <a href="http://dfacts.de">dFacts Network</a>
+		</div>
+	</div>
+</div>
+</body>
+</html>

--- /dev/null
+++ b/busui/staticmaplite/selinux-fix.sh
@@ -1,1 +1,3 @@
+chcon -R -t httpd_sys_content_rw_t cache
 
+

--- /dev/null
+++ b/busui/staticmaplite/staticmap.php
@@ -1,1 +1,273 @@
-
+<?php
+
+/**
+ * staticMapLite 0.02
+ *
+ * Copyright 2009 Gerhard Koch
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @author Gerhard Koch <gerhard.koch AT ymail.com>
+ *
+ * USAGE: 
+ *
+ *  staticmap.php?center=40.714728,-73.998672&zoom=14&size=512x512&maptype=mapnik&markers=40.702147,-74.015794,blues|40.711614,-74.012318,greeng|40.718217,-73.998284,redc
+ *
+ */ 
+
+error_reporting(0);
+ini_set('display_errors','off');
+
+Class staticMapLite {
+
+	protected $tileSize = 256;
+	protected $tileSrcUrl = array(	'mapnik' => 'http://tile.openstreetmap.org/{Z}/{X}/{Y}.png',
+									'osmarenderer' => 'http://c.tah.openstreetmap.org/Tiles/tile/{Z}/{X}/{Y}.png',
+									'cycle' => 'http://c.andy.sandbox.cloudmade.com/tiles/cycle/{Z}/{X}/{Y}.png'
+	);
+	
+	protected $tileDefaultSrc = 'mapnik';
+	protected $markerBaseDir = 'images/markers';
+	protected $osmLogo = 'images/osm_logo.png';
+
+	protected $useTileCache = true;
+	protected $tileCacheBaseDir = './cache/tiles';
+
+	protected $useMapCache = true;
+	protected $mapCacheBaseDir = './cache/maps';
+	protected $mapCacheID = '';
+	protected $mapCacheFile = '';
+	protected $mapCacheExtension = 'png';
+	
+	protected $zoom, $lat, $lon, $width, $height, $markers, $image, $maptype;
+	protected $centerX, $centerY, $offsetX, $offsetY;
+
+	public function __construct(){
+		$this->zoom = 0;
+		$this->lat = 0;
+		$this->lon = 0;
+		$this->width = 500;
+		$this->height = 350;
+		$this->markers = array();
+		$this->maptype = $this->tileDefaultSrc;
+	}
+	
+	public function parseParams(){
+		global $_GET;
+		
+		// get zoom from GET paramter
+		$this->zoom = $_GET['zoom']?intval($_GET['zoom']):0;
+		if($this->zoom>18)$this->zoom = 18;
+		
+		// get lat and lon from GET paramter
+		list($this->lat,$this->lon) = split(',',$_GET['center']);
+		$this->lat = floatval($this->lat);
+		$this->lon = floatval($this->lon);
+		
+		// get zoom from GET paramter
+		if($_GET['size']){
+			list($this->width, $this->height) = split('x',$_GET['size']);
+			$this->width = intval($this->width);
+			$this->height = intval($this->height);
+		}
+		if($_GET['markers']){
+			$markers = split('%7C|\|',$_GET['markers']);
+			foreach($markers as $marker){
+					list($markerLat, $markerLon, $markerImage) = split(',',$marker);
+					$markerLat = floatval($markerLat);
+					$markerLon = floatval($markerLon);
+					$markerImage = basename($markerImage);
+					$this->markers[] = array('lat'=>$markerLat, 'lon'=>$markerLon, 'image'=>$markerImage);
+			}
+			
+		}
+		if($_GET['maptype']){
+			if(array_key_exists($_GET['maptype'],$this->tileSrcUrl)) $this->maptype = $_GET['maptype'];
+		}
+	}
+
+	public function lonToTile($long, $zoom){
+		return (($long + 180) / 360) * pow(2, $zoom);
+	}
+
+	public function latToTile($lat, $zoom){
+		return (1 - log(tan($lat * pi()/180) + 1 / cos($lat* pi()/180)) / pi()) /2 * pow(2, $zoom);
+	}
+
+	public function initCoords(){
+		$this->centerX = $this->lonToTile($this->lon, $this->zoom);
+		$this->centerY = $this->latToTile($this->lat, $this->zoom);
+		$this->offsetX = floor((floor($this->centerX)-$this->centerX)*$this->tileSize);
+		$this->offsetY = floor((floor($this->centerY)-$this->centerY)*$this->tileSize);
+	}
+
+	public function createBaseMap(){
+		$this->image = imagecreatetruecolor($this->width, $this->height);
+		$startX = floor($this->centerX-($this->width/$this->tileSize)/2);
+		$startY = floor($this->centerY-($this->height/$this->tileSize)/2);
+		$endX = ceil($this->centerX+($this->width/$this->tileSize)/2);
+		$endY = ceil($this->centerY+($this->height/$this->tileSize)/2);
+		$this->offsetX = -floor(($this->centerX-floor($this->centerX))*$this->tileSize);
+		$this->offsetY = -floor(($this->centerY-floor($this->centerY))*$this->tileSize);
+		$this->offsetX += floor($this->width/2);
+		$this->offsetY += floor($this->height/2);
+		$this->offsetX += floor($startX-floor($this->centerX))*$this->tileSize;
+		$this->offsetY += floor($startY-floor($this->centerY))*$this->tileSize;
+
+		for($x=$startX; $x<=$endX; $x++){
+			for($y=$startY; $y<=$endY; $y++){
+				$url = str_replace(array('{Z}','{X}','{Y}'),array($this->zoom, $x, $y), $this->tileSrcUrl[$this->maptype]);
+				$tileImage = imagecreatefromstring($this->fetchTile($url));
+				$destX = ($x-$startX)*$this->tileSize+$this->offsetX;
+				$destY = ($y-$startY)*$this->tileSize+$this->offsetY;
+				imagecopy($this->image, $tileImage, $destX, $destY, 0, 0, $this->tileSize, $this->tileSize);
+			}
+		}
+	}
+
+
+	public function placeMarkers(){
+		foreach($this->markers as $marker){
+			$markerLat = $marker['lat'];
+			$markerLon = $marker['lon'];
+			$markerImage = $marker['image'];
+			$markerIndex++;
+			$markerFilename = $markerImage?(file_exists($this->markerBaseDir.'/'.$markerImage.".png")?$markerImage:'lightblue'.$markerIndex):'lightblue'.$markerIndex;
+			if(file_exists($this->markerBaseDir.'/'.$markerFilename.".png")){
+				$markerImg = imagecreatefrompng($this->markerBaseDir.'/'.$markerFilename.".png");
+			} else {
+				$markerImg = imagecreatefrompng($this->markerBaseDir.'/lightblue1.png');				
+			}
+			$destX = floor(($this->width/2)-$this->tileSize*($this->centerX-$this->lonToTile($markerLon, $this->zoom)));
+			$destY = floor(($this->height/2)-$this->tileSize*($this->centerY-$this->latToTile($markerLat, $this->zoom)));
+			$destY = $destY - imagesy($markerImg);
+
+			imagecopy($this->image, $markerImg, $destX, $destY, 0, 0, imagesx($markerImg), imagesy($markerImg));
+		
+	};
+}
+
+
+
+	public function tileUrlToFilename($url){
+		return $this->tileCacheBaseDir."/".str_replace(array('http://'),'',$url);
+	}
+
+	public function checkTileCache($url){
+		$filename = $this->tileUrlToFilename($url);
+		if(file_exists($filename)){
+			return file_get_contents($filename);
+		}
+	}
+	
+	public function checkMapCache(){
+		$this->mapCacheID = md5($this->serializeParams());
+		$filename = $this->mapCacheIDToFilename();
+		if(file_exists($filename)) return true;
+	}
+
+	public function serializeParams(){		
+		return join("&",array($this->zoom,$this->lat,$this->lon,$this->width,$this->height, serialize($this->markers),$this->maptype));
+	}
+	
+	public function mapCacheIDToFilename(){
+		if(!$this->mapCacheFile){
+			$this->mapCacheFile = $this->mapCacheBaseDir."/".substr($this->mapCacheID,0,2)."/".substr($this->mapCacheID,2,2)."/".substr($this->mapCacheID,4);
+		}
+		return $this->mapCacheFile.".".$this->mapCacheExtension;
+	}
+
+
+	
+	public function mkdir_recursive($pathname, $mode){
+		return mkdir($pathname, $mode, true);
+	}
+	public function writeTileToCache($url, $data){
+		$filename = $this->tileUrlToFilename($url);
+		$this->mkdir_recursive(dirname($filename),0777);
+		file_put_contents($filename, $data);
+	}
+	
+	public function fetchTile($url){
+		if($this->useTileCache && ($cached = $this->checkTileCache($url))) return $cached;
+		$ch = curl_init(); 
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); 
+		curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/4.0");
+		curl_setopt($ch, CURLOPT_URL, $url); 
+		$tile = curl_exec($ch); 
+		curl_close($ch); 
+		if($this->useTileCache){
+			$this->writeTileToCache($url,$tile);
+		}
+		return $tile;
+
+	}
+
+	public function copyrightNotice(){
+			$logoImg = imagecreatefrompng($this->osmLogo);
+			imagecopy($this->image, $logoImg, imagesx($this->image)-imagesx($logoImg), imagesy($this->image)-imagesy($logoImg), 0, 0, imagesx($logoImg), imagesy($logoImg));
+		
+	}
+	
+	public function sendHeader(){
+		header('Content-Type: image/png');
+		$expires = 60*60*24*14;
+		header("Pragma: public");
+		header("Cache-Control: maxage=".$expires);
+		header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT');
+	}
+
+	public function makeMap(){
+		$this->initCoords();		
+		$this->createBaseMap();
+		if(count($this->markers))$this->placeMarkers();
+		if($this->osmLogo) $this->copyrightNotice();
+	}
+
+	public function showMap(){
+		$this->parseParams();
+		if($this->useMapCache){
+			// use map cache, so check cache for map
+			if(!$this->checkMapCache()){
+				// map is not in cache, needs to be build
+				$this->makeMap();
+				$this->mkdir_recursive(dirname($this->mapCacheIDToFilename()),0777);
+				imagepng($this->image,$this->mapCacheIDToFilename(),9);
+				$this->sendHeader();	
+				if(file_exists($this->mapCacheIDToFilename())){
+					return file_get_contents($this->mapCacheIDToFilename());
+				} else {
+					return imagepng($this->image);		
+				}
+			} else {
+				// map is in cache
+				$this->sendHeader();	
+				return file_get_contents($this->mapCacheIDToFilename());
+			}
+
+		} else {
+			// no cache, make map, send headers and deliver png
+			$this->makeMap();
+			$this->sendHeader();	
+			return imagepng($this->image);		
+			
+		}
+	}
+
+}
+
+$map = new staticMapLite();
+print $map->showMap();
+
+?>
+

--- a/busui/stop.php
+++ b/busui/stop.php
@@ -4,14 +4,20 @@
 $stop = json_decode(getPage($url));
 
 include_header("Trips passing ".$stop[1]);
+echo '<div data-role="content" class="ui-content" role="main"><p>'.staticmap(Array(0 => Array($stop[2],$stop[3]))).'</p>';
 echo '  <ul data-role="listview" >';
-$url = $APIurl."/json/stoptrips?stop=".$_REQUEST['stopid']."&time=".midnight_seconds();
-$page = getPage($url);
-foreach (json_decode($page) as $row)
+$url = $APIurl."/json/stoptrips?stop=".$_REQUEST['stopid']."&time=".midnight_seconds()."&service_period=".service_period();
+$trips = json_decode(getPage($url));
+debug(print_r($trips,true));
+foreach ($trips as $row)
 {
-if ($row[1][2] === service_period()) echo  '<li>'.midnight_seconds_to_time($row[0]).' <a href="trip.php?stopid='.$_REQUEST['stopid'].'&tripid='.$row[1][0].'">'.$row[1][1].'</a></li>';        
+echo  '<li>';
+echo '<h3><a href="trip.php?stopid='.$_REQUEST['stopid'].'&tripid='.$row[1][0].'">'.$row[1][1].'</a></h3>';      
+echo '<p class="ui-li-aside"><strong>'.midnight_seconds_to_time($row[0]).'</strong></p>';
+echo '</li>';  
 }
-echo '</ul>';
+if (sizeof($trips) == 0) echo "<li> <center>No trips in the near future.</center> </li>";
+echo '</ul></div>';
 include_footer();
 ?>
 

--- a/busui/stopList.php
+++ b/busui/stopList.php
@@ -1,34 +1,48 @@
 <?php
 include('common.inc.php');
 include_header("Stops");
-echo '  <ul data-role="listview" data-filter="true">';
-$url = $APIurl."/json/stops";
+echo'
+		<div data-role="navbar"> 
+			<ul> 
+				<li><a href="stopList.php">Timing Points</a></li> 
+				<li><a href="stopList.php?allstops=yes">All Stops</a></li> 
+			</ul>
+                </div>
+	';
+        
+        echo '<div class="noscriptnav"> Go to letter: ';
+foreach(range('A','Z') as $letter) 
+{ 
+   echo "<a href=\"#$letter\">$letter</a>&nbsp;"; 
+}
+echo "</div>
+	<script>
+$('.noscriptnav').hide();
+        </script>";
+echo '  <ul data-role="listview" data-filter="true" data-inset="true" >';
+$url = $APIurl."/json/timingpoints";
+if ($_REQUEST['allstops']) $url = $APIurl."/json/stops";
 if ($_REQUEST['lat'] && $_REQUEST['lon']) $url = $APIurl."/json/neareststops?lat={$_REQUEST['lat']}&lon={$_REQUEST['lon']}&limit=15";
 $contents = json_decode(getPage($url));
+debug(print_r($contents,true));
 foreach ($contents as $key => $row) {
     $stopName[$key]  = $row[1];
 }
 
-// Sort the data with volume descending, edition ascending
-// Add $data as the last parameter, to sort by the common key
+// Sort the stops by name
 array_multisort($stopName, SORT_ASC, $contents);
 
+$firstletter = "";
 foreach ($contents as $row)
 {
-
+    if (substr($row[1],0,1) != $firstletter){
+        echo "<a name=$firstletter></a>";
+        $firstletter = substr($row[1],0,1);
+    }
       echo  '<li><a href="stop.php?stopid='.$row[0].'">'.$row[1].'</a></li>';
         }
 echo '</ul>';
-/*
- <div data-role="footer" data-id="foo1" data-position="fixed"> 
-		<div data-role="navbar"> 
-			<ul> 
-				<li><a href="footer-persist-a.html" class="ui-btn-active">Friends</a></li> 
-				<li><a href="footer-persist-b.html">Albums</a></li> 
-				<li><a href="footer-persist-c.html">Emails</a></li> 
-			</ul> 
-		</div><!-- /navbar -->
-*/
+
 include_footer();
 ?>
 

--- a/busui/trip.php
+++ b/busui/trip.php
@@ -1,23 +1,38 @@
 <?php
 include('common.inc.php');
-$url = $APIurl."/json/triprows?trip=".$_REQUEST['tripid'];
+$tripid = $_REQUEST['tripid'];
+if ($_REQUEST['routeid']) {
+    $url = $APIurl."/json/routetrips?route_id=".$_REQUEST['routeid'];
+    $trips = json_decode(getPage($url));
+debug(print_r($trips,true));
+foreach ($trips as $trip)
+         {
+            if ($trip[0] < midnight_seconds()) {
+                $tripid = $trip[1];
+                break;
+            }
+         }
+         if (!($tripid > 0)) $tripid = $trips[0][1];
+}
+$url = $APIurl."/json/triprows?trip=".$tripid;
 $trips = array_flatten(json_decode(getPage($url)));
-print_r($trips);
-
+debug(print_r($trips,true));
 include_header("Stops on ". $trips[1]->route_short_name . ' '. $trips[1]->route_long_name);
 echo '  <ul data-role="listview" >';
 
 
-
-
-$url = $APIurl."/json/tripstoptimes?trip=".$_REQUEST['tripid'];
+$url = $APIurl."/json/tripstoptimes?trip=".$tripid;
 
 $json = json_decode(getPage($url));
+debug(print_r($json,true));
 $stops = $json[0];
 $times = $json[1];
 foreach ($stops as $key => $row)
 {
-echo  '<li>'.midnight_seconds_to_time($times[$key]).' <a href="stop.php?stopid='.$row[0].'">'.$row[1].'</a></li>';        
+    echo  '<li>';
+echo '<h3><a href="stop.php?stopid='.$row[0].'">'.$row[1].'</a></h3>';      
+echo '<p class="ui-li-aside">'.midnight_seconds_to_time($times[$key]).'</p>';
+echo '</li>';       
 }
 echo '</ul>';
 include_footer();

--- /dev/null
+++ b/busui/tripPlanner.php
@@ -1,1 +1,125 @@
+<?php
+  include('common.inc.php');
+  include_header("Trip Planner", true, true);
+  function tripPlanForm($errorMessage = "")
+  {
+      $from = (isset($_REQUEST['from']) ? $_REQUEST['from'] : "Brigalow");
+      $to = (isset($_REQUEST['to']) ? $_REQUEST['to'] : "Barry");
+      $date = (isset($_REQUEST['date']) ? $_REQUEST['date'] : date("m/d/Y"));
+      $time = (isset($_REQUEST['time']) ? $_REQUEST['time'] : date("h:ia"));
+      echo "<font color=red>$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>
+    </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>
+    </div>
+    <div data-role="fieldcontain">
+        <label for="date"> on </label>
+        <input type="date" name="date" id="date" value="' . $date . '"  />
+    </div>
+        <div data-role="fieldcontain">
+        <label for="time"> at </label>
+        <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)
+  {
+      echo '<div data-role="collapsible" ' . ($itineraryNumber > 0 ? 'data-collapsed="true"' : "") . '> <h3> Option #' . ($itineraryNumber + 1) . ": " . floor($itinerary->duration / 60000) . " minutes ({$itinerary->startTime} to {$itinerary->endTime})</h3><p>";
+      echo "Walking time: " . floor($itinerary->walkTime / 60000) . " minutes (" . floor($itinerary->walkDistance) . " meters)<br>\n";
+      echo "Transit time: " . floor($itinerary->transitTime / 60000) . " minutes<br>\n";
+      echo "Waiting time: " . floor($itinerary->waitingTime / 60000) . " minutes<br>\n";
+
+     
+      
+      if (is_array($itinerary->legs->leg)) {
+              $legMarkers = array();
+      foreach ($itinerary->legs->leg as $legNumber => $leg) {
+          $legMarkers[] = array($leg->from->lat, $leg->from->lon);
+      }
+      echo '' . staticmap($legMarkers) . "<br>\n";
+          echo '<ul>';
+          foreach ($itinerary->legs->leg as $legNumber => $leg) {
+              echo '<li>';
+              processLeg($legNumber, $leg);
+              echo "</li>";
+          }
+          echo "</ul>";
+      } else {
+              echo '' . staticmap(array(array($itinerary->legs->leg->from->lat, $itinerary->legs->leg->from->lon))) . "<br>\n";
+          processLeg(0, $itinerary->legs->leg);
+      }
+     
+      echo "</p></div>";
+  }
+  
+  function processLeg($legNumber, $leg) {
+      $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>";
+          } else {
+              $walkStepMarkers = array();
+              foreach ($leg->steps->walkSteps as $stepNumber => $step) {
+                  $walkStepMarkers[] = array($step->lat, $step->lon);
+              }
+              echo "" . staticmap($walkStepMarkers, "icong") . "<br>\n";
+              foreach ($leg->steps->walkSteps as $stepNumber => $step) {
+                  echo "Walking step " . ($stepNumber + 1) . " $step->absoluteDirection / $step->relativeDirection on $step->streetName for " . floor($step->distance) . " meters<br>\n";
+              }
+          }
+  }
+  
+  if ($_REQUEST['time']) {
+      $toPlace = (startsWith($_REQUEST['to'], "-") ? $_REQUEST['to'] : geocode(urlencode($_REQUEST['to']), false));
+      $fromPlace = (startsWith($_REQUEST['from'], "-") ? $_REQUEST['from'] : geocode(urlencode($_REQUEST['from']), false));
+      if ($toPlace == "" || $fromPlace == "") {
+          $errorMessage = "";
+          if ($toPlace === "")
+              $errorMessage .= urlencode($_REQUEST['to']) . " not found.<br>\n";
+          if ($fromPlace === "")
+              $errorMessage .= urlencode($_REQUEST['from']) . " not found.<br>\n";
+          tripPlanForm($errorMessage);
+      } else {
+          $url = "http://localhost:8080/opentripplanner-api-webapp/ws/plan?_dc=1290254798856&arriveBy=false&date=" . urlencode($_REQUEST['date']) . "&time=" . urlencode($_REQUEST['time']) . "&mode=TRANSIT%2CWALK&optimize=QUICK&maxWalkDistance=840&wheelchair=false&toPlace=$toPlace&fromPlace=$fromPlace&intermediatePlaces=";
+          $ch = curl_init($url);
+          curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+          curl_setopt($ch, CURLOPT_HEADER, 0);
+          curl_setopt($ch, CURLOPT_HTTPHEADER, array("Accept: application/json"));
+          $page = curl_exec($ch);
+          curl_close($ch);
+          $tripplan = json_decode($page);
+          debug(print_r($triplan,true));
+          echo "<h1> From: {$tripplan->plan->from->name} To: {$tripplan->plan->to->name} </h1>";
+          echo "<h1> At: {$tripplan->plan->date} </h1>";
+         
+          if (is_array($tripplan->plan->itineraries->itinerary)) {
+             echo '<div data-role="collapsible-set">';
+              foreach ($tripplan->plan->itineraries->itinerary as $itineraryNumber => $itinerary) {
+                  processItinerary($itineraryNumber, $itinerary);
+              }
+              echo "</div>";
+          } else {
+              processItinerary(0, $tripplan->plan->itineraries->itinerary);
+          }
+          
+      }
+  } else {
+      tripPlanForm();
+  }
+  include_footer();
+?>

--- a/maxious-canberra-transit-feed/01-extracttimes.rb
+++ b/maxious-canberra-transit-feed/01-extracttimes.rb
@@ -14,31 +14,36 @@
 	timetable = {"between_stops" => [], "short_name" => short_name}
 	time_points = table.xpath('tr[1]//th').map do |tp|
 		if tp.content != "\302\240" && tp.content != "" && tp.content != "<br/>"
-			timing_point = tp.content.squeeze(" ").gsub("Bus Station"," Bus Station ").gsub(" Platform"," (Platform").gsub("  - "," - ").gsub("\n"," ").gsub("\r"," ").gsub("\t"," ").gsub("\\"," / ").gsub("/"," / ").gsub(",",", ").gsub("\302\240","").squeeze(" ").strip
+			timing_point = tp.content.squeeze(" ").gsub("Shops"," ").gsub("Bus Station"," Bus Station ").gsub("Interchange"," Bus Station ").gsub(" Platform"," (Platform")
+			timing_point = timing_point.gsub("Machonochie","Maconochie").gsub("Hume"," ").gsub("Market Place","Marketplace").gsub("Terminus Fyshwick","Terminus")
+			timing_point = timing_point.gsub("  - "," - ").gsub("\n"," ").gsub("\r"," ").gsub("\t"," ").gsub("\\"," / ").gsub("/"," / ").gsub(","," ").gsub("\302\240","").squeeze(" ").strip
 			if (tp.content.match('Platform'))
 			  timing_point.concat(")")
 			end;
+			if tp.to_s.match(/[0-9][0-9][0-9]/) or tp.to_s.include? "Wheelchair"
+			  timing_point = nil
+			end
 			timing_point
 		end
 	end
 	time_points.delete(nil)
-	time_points.delete("WheelchairAccessible")
-	time_points.delete("Wheelchair Accessible")
 	timetable["time_points"] = time_points.to_a
 	timetable["long_name"] = "To " + time_points.last
 	periodtimes = []
 	table.css('tr').each do |row|
 		times = row.css('td').map do |cell|
 			time = cell.content.squeeze(" ").strip
-			time = time.gsub(/ *A\S?M/,"a").gsub(/ ?P\S?M/,"p").gsub("12:08 AM","1208x").gsub(":","").gsub("1.","1").gsub("2.","2")
-			time = time.gsub("3.","3").gsub("4.","4")
+			time = time.gsub(/ *A\S?M/,"a").gsub(/ ?P\S?M/,"p").gsub(/ *a\S?m/,"a").gsub(/ ?p\S?m/,"p")
+			time = time.gsub("12:08 AM","1208x").gsub(":","").gsub("1.","1").gsub("2.","2").gsub("3.","3").gsub("4.","4")
 			time = time.gsub("5.","5").gsub("6.","6").gsub("7.","7").gsub("8.","8").gsub("9.","9").gsub("10.","10")
 			time = time.gsub("11.","11").gsub("12.","12").gsub(/\.+/,"-").gsub("\302\240","")
-			if time == "" then time = nil end 
+			if time == "" or time.include? "chool" or time.include? "On Race Days" or time.include? "Bus"
+				time = nil # This hacky way is faster than using position()>1 xpath on <TD>s!
+			end 
 			time
 		end
 		times.delete(nil)
-		if not times.empty?
+		if not times.empty? 
 			if not (route = times.shift)
 				raise("TODO: account for shifting route numbers eg. intertown/redex 62/162")
 			end
@@ -59,14 +64,14 @@
 	timetable
 end
 
-Dir.glob("source-html/Route*.htm*") { |file|
+Dir.glob("source-html/*oute*.htm*") { |file|
 	puts "Opened " + file
 	doc = Nokogiri::HTML(open(file))
 	# Search for nodes by css
 	timetables = []
 	short_name = "";
 	doc.xpath('//title').each do |title|
-		short_name = title.content.gsub("Route_","").gsub("Route ","").gsub(", ","/").gsub("ACTION Buses Timetable for ","").squeeze(" ").strip
+		short_name = title.content.gsub("Route_","").gsub("Route ","").gsub("route ","").gsub(", ","/").gsub("ACTION Buses Timetable for ","").squeeze(" ").strip
 	end
 	if short_name == ""
 		raise "Route number(s) not found in <title> tag"
@@ -76,7 +81,9 @@
 		timetables << makeTimetable(table, "stop_times", short_name)
 	end
 	doc.xpath('//table[preceding::text()="This timetable is effective from Monday 15th November 2010."]').each do |table|
-		timetables << makeTimetable(table, "stop_times", short_name)
+		if short_name[0].chr != "9" or short_name.size == 1
+		  timetables << makeTimetable(table, "stop_times", short_name)
+		end
 	end
 	#all tables are weekdays on some really malformatted timetables
 	if short_name == "170"

--- a/maxious-canberra-transit-feed/02-tidytimepoints.rb
+++ b/maxious-canberra-transit-feed/02-tidytimepoints.rb
@@ -19,49 +19,102 @@
 		end
 	}
 end
-
-getTimePoints()
-#pp $time_points.sort!
-#pp $time_points_sources.sort
-
+def correctTimePoints()
 time_point_corrections = {"North Lynehamham" => "North Lyneham",
-  "Woden Bus Station Platform 10)" => "Woden Bus Station (Platform 10)",
-  "Saint AndrewsVillage Hughes"=>"Saint Andrews Village Hughes",
+ "Woden Bus Station Platform 10)" => "Woden Bus Station (Platform 10)",
+ "Saint AndrewsVillage Hughes"=>"Saint Andrews Village Hughes",
  "Flemmington Road / Sandford St"=>"Flemington Road / Sandford St",
  "City Interchange"=>"City Bus Station",
  "City Interchange (Platform 9)"=>"City Bus Station (Platform 9)",
+ "City Bus Station Platfrom 9"=>"City Bus Station (Platform 9)",
+ "Belconnen Community Bus StationPlatform 2)"=>"Belconnen Community Bus Station (Platform 2)",
  "Bridbabella Gardens Nursing Home"=>"Brindabella Gardens Nursing Home",
  "Bridbabella GardensNursing Home"=> "Brindabella Gardens Nursing Home",
  "BrindabellaBusiness Park"=> "Brindabella Business Park",
  "NarrabundahTerminus"=>"Narrabundah Terminus",
  "Railway StationKingston"=>"Railway Station Kingston",
  "Saint AndrewsVillage Hughes"=>"Saint Andrews Village Hughes",
- "Dickson ShopsAntill Street"=>"Dickson Shops",
- "Cohen St Bus Station (Platform 3)"=>"Cohen Street Bus Station (Platform 3)",
- "Cohen St Bus Station (Platform 6)"=>"Cohen Street Bus Station (Platform 6)",
- "Newcastle Streetafter Isa Street"=>"Newcastle Street after Isa Street",
+ "DicksonAntill Street"=>"Dickson",
+ "Cohen St Bus Station (Platform 3)" => "Cohen Street Bus Station (Platform 3)",
+ "Cohen St Bus Station (Platform 6)" => "Cohen Street Bus Station (Platform 6)",
+ "Newcastle Streetafter Isa Street" => "Newcastle Street after Isa Street",
+ "Newcastle St after Isa St" => "Newcastle Street after Isa Street",
+ "Newcastle Street after Isa St" => "Newcastle Street after Isa Street",
+ "Northbourne Ave / Antill St" => "Northbourne Avenue / Antill St",
+ "Macarthur / Northbourne" => "Macarthur / Northbourne Ave",
+ "Macarthur Ave / Northbourne" => "Macarthur / Northbourne Ave",
+ "Kings Ave / National Cct"=> "Kings Ave / National Circuit",
+ "Kosciuszco Ave / Everard Street"=>"Kosciuszko / Everard",
+ "Lithgow St Terminus" => "Lithgow St Terminus Fyshwick",
+ "Hospice Menindee Dr" => "Hospice / Menindee Dr",
+ "Gungahlin Market Place"=> "Gungahlin Marketplace",
+ "Gwyder Square Kaleen"=> "Gwydir Square Kaleen",
+ "Flemington Road / Nullabor Ave"=>"Flemington Rd / Nullabor Ave",
+ "Flemington Road / Sandford St"=>"Flemington Rd / Sandford St",
+ "Heagney Cres Clift Cres Richardson"=>  "Heagney / Clift Richardson",
+ "Charnwood (Tillyard Drive)"=> "Charnwood",
+ "charnwood"=> "Charnwood",
+ "Black Moutain- Telstra Tower"=>"Black Mountain Telstra Tower",
+ "Bonython Primary"=> "Bonython Primary School",
+ "Athllon Drive / Sulwood Dr Kambah"=>"Athllon / Sulwood Kambah",
+ "Alexander Machonochie Centre Hume"=>"Alexander Maconochie Centre",
+ "Alexander Maconochie Centre Hume"=>"Alexander Maconochie Centre",
+ "Anthony Rolfe Ave / Moonight Ave" =>"Anthony Rolfe Av / Moonlight Av",
+ "Australian National Botanic Gardens"=>"Botanic Gardens",
+ "Calwell shops"=> "Calwell", 
+ "Chuculba / William Slim Drive"=>"Chuculba / William Slim Dr",
+ "Fyshwick direct Factory Outlet"=>"Fyshwick Direct Factory Outlet",
+ "Kaleen Village / Maibrynong"=>"Kaleen Village / Marybrynong",
+ "Kaleen Village / Marybrynong Ave"=>"Kaleen Village / Marybrynong",
+ "National Aquarium"=>"National Zoo and Aquarium",
+ "chisholm"=>"Chisholm",
+ "O'connor"=>"O'Connor",
+ "Mckellar"=>"McKellar",
  "William Web / Ginninderra Drive"=>"William Webb / Ginninderra Drive",
  "Procor / Mead"=>"Proctor / Mead",
-"Fyshwick DirectFactory Outlet"=>"Fyshwick Direct Factory Outlet",
-"Dickson ShopsAntill Street"=>"Dickson Shops/Antill St",
-"Yarrulumla Shops"=>"Yarralumla Shops",
-"Tharwa Dr / Pocket Ave"=>"Tharwa Dr / Pockett Ave",
-"Paul Coe / Mirrebei Dr"=>"Paul Coe / Mirrabei Dr",
-"Mirrebei Drive / Dam Wall"=>"Mirrabei Drive / Dam Wall"
+ "Fyshwick DirectFactory Outlet"=>"Fyshwick Direct Factory Outlet",
+ "Yarrulumla"=>"Yarralumla",
+ "Tharwa Dr / Pocket Ave"=>"Tharwa Dr / Pockett Ave",
+ "Paul Coe / Mirrebei Dr"=>"Paul Coe / Mirrabei Dr",
+ "Mirrebei Drive / Dam Wall"=>"Mirrabei Drive / Dam Wall",
+ "Tharwa / Knoke" => "Tharwa Drive / Knoke Ave",
+ "Tharwa / Pocket" => "Tharwa Drive / Pockett Ave",
+ 'Tharwa Dr / Pockett Ave' => "Tharwa Drive / Pockett Ave",
+ "Outrim / Duggan" => "Outtrim / Duggan",
+ "ANU Burton and Garran Hall Daley Rd" => "Burton and Garran Hall Daley Road",
+ "Farrer Primary"=>"Farrer Primary School",
+ "St Thomas More Campbell"=>"St Thomas More's Campbell",
+ "Lyneham Wattle Street"=>"Lyneham / Wattle St",
+ "Dickson" => "Dickson / Antill St",
+ 'Dickson Antill Street' => 'Dickson / Antill St',
+ "Livingston / Kambah" => "Kambah / Livingston St",
+ 'Melba shops' => 'Melba',
+ 'St Clare of Assisi' => 'St Clare of Assisi Primary',
+ 'War Memorial Limestone Ave' => 'War Memorial / Limestone Ave'
+
+ 
 }
-
-time_point_corrections.each do |wrong, right|
-	$time_points_sources[wrong].each do |wrongfile|
-		badtimetable = YAML::load_file(wrongfile)
-		badentrynumber = badtimetable["time_points"].index wrong
-		badtimetable["time_points"][badentrynumber] = right
-		puts "Corrected '" + wrong + "' to '" + right + "' in " + wrongfile
-		File.open(wrongfile, "w") do |f|
-	 		f.write badtimetable.to_yaml
+	time_point_corrections.each do |wrong, right|
+		$time_points_sources[wrong].each do |wrongfile|
+			badtimetable = YAML::load_file(wrongfile)
+			badentrynumber = badtimetable["time_points"].index wrong
+			badtimetable["time_points"][badentrynumber] = right
+			puts "Corrected '" + wrong + "' to '" + right + "' in " + wrongfile
+			File.open(wrongfile, "w") do |f|
+	 			f.write badtimetable.to_yaml
+			end
 		end
 	end
 end
 
 getTimePoints()
+#pp $time_points.sort!
+#pp $time_points_sources.sort
+
+
+correctTimePoints()
+getTimePoints()
+correctTimePoints()
+getTimePoints()
 pp $time_points.sort!
 

--- a/maxious-canberra-transit-feed/03-locatetimepoints.rb
+++ b/maxious-canberra-transit-feed/03-locatetimepoints.rb
@@ -38,6 +38,7 @@
         $time_points = []
         $time_points_sources = Hash.new([])
         Dir.glob("*.yml") { |file|
+	       pp file
                 timetable = YAML::load_file(file)
                 $time_points = $time_points | timetable["time_points"]
                 timetable["time_points"].each do |timepoint|

--- a/maxious-canberra-transit-feed/cbrtable.yml
+++ b/maxious-canberra-transit-feed/cbrtable.yml
@@ -1,7 +1,7 @@
 options:
-  start_date: 20090525
-  end_date: 20101001
-  remove_date: 20101001
+  start_date: 20101115
+  end_date: 20111231
+  remove_date: 20111231
   agency_name: ACT Internal Omnibus Network (ACTION)
   agency_url: http://www.action.act.gov.au/ 
   agency_timezone: Australia/Sydney
@@ -11,13 +11,11 @@
   - { name: ACTEW AGL House,stop_code: ACTEW AGL House, lat: -35.282374, lng: 149.132047}
   - { name: ADFA,stop_code: ADFA, lat: -35.2937972, lng: 149.1643403}
   - { name: Ainslie,stop_code: Ainslie, lat: -35.2620105, lng: 149.1443302}
-  - { name: Ainslie Shops,stop_code: Ainslie Shops, lat: -35.26198, lng: 149.14535}
   - { name: Alexander Maconochie Centre,stop_code: Alexander Maconochie Centre, lat: -35.3720651, lng: 149.1696618}
   - { name: Alpen & Clifford St,stop_code: Alpen & Clifford St, lat: -35.20562, lng: 149.06259}
   - { name: Anthony Rolfe Av / Moonlight Av,stop_code: Anthony Rolfe Av / Moonlight Av, lat: -35.1856021, lng: 149.1543639}
   - { name: Aranda,stop_code: Aranda, lat: -35.257534, lng: 149.0762963}
-  - { name: Aranda Shops,stop_code: Aranda Shops, lat: -35.25753, lng: 149.0763}
-  - { name: Athllon / Sulwood, Kambah,stop_code: Athllon / Sulwood, Kambah, lat: -35.38442, lng: 149.09328}
+  - { name: Athllon / Sulwood Kambah,stop_code: Athllon / Sulwood Kambah, lat: -35.38442, lng: 149.09328}
   - { name: Australian Institute of Sport,stop_code: Australian Institute of Sport, lat: -35.246351, lng: 149.101478}
   - { name: Belconnen Community Bus Station,stop_code: Belconnen Community Bus Station, lat: -35.23987, lng: 149.0619}
   - { name: Belconnen Community Bus Station (Platform 1),stop_code: Belconnen Community Bus Station (Platform 1), lat: -35.23982, lng: 149.06978}
@@ -35,9 +33,9 @@
   - { name: Brindabella Business Park,stop_code: Brindabella Business Park, lat: -35.314496, lng: 149.189145}
   - { name: Brindabella Gardens Nursing Home,stop_code: Brindabella Gardens Nursing Home, lat: -35.3294459, lng: 149.0806116}
   - { name: Bugden Sternberg,stop_code: Bugden Sternberg, lat: -35.4017223, lng: 149.0992172}
-  - { name: Burton and Garran Hall, Daley Road,stop_code: Burton and Garran Hall, Daley Road, lat: -35.2753671, lng: 149.1172822}
+  - { name: Burton and Garran Hall Daley Road,stop_code: Burton and Garran Hall Daley Road, lat: -35.2753671, lng: 149.1172822}
   - { name: Calvary Hospital,stop_code: Calvary Hospital, lat: -35.25212, lng: 149.09088}
-  - { name: Calwell Shops,stop_code: Calwell Shops, lat: -35.43524, lng: 149.113942}
+  - { name: Calwell,stop_code: Calwell, lat: -35.43524, lng: 149.113942}
   - { name: Cameron Ave Bus Station,stop_code: Cameron Ave Bus Station, lat: -35.2410195, lng: 149.0722506}
   - { name: Cameron Ave Bus Station (Platform 1),stop_code: Cameron Ave Bus Station (Platform 1), lat: -35.2410195, lng: 149.0722506}
   - { name: Came