From: Maxious <maxious@lambdacomplex.org>
Date: Tue, 15 Mar 2011 12:26:19 +0000
Subject: Minify js/css
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=a916b82bbb1dba33c34ca9b6d9fc2536fcc1c748
---
Minify js/css
---


--- a/common-template.inc.php
+++ b/common-template.inc.php
@@ -6,15 +6,14 @@
 <html> 
 	<head> 
 	<title>' . $pageTitle . '</title>';
+	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>';
+	echo '<script> 
 		//reset type=date inputs to text
 		$( document ).bind( "mobileinit", function(){
 			$.mobile.page.prototype.options.degradeInputs.date = true;
@@ -122,7 +121,7 @@
         or enter an address/co-ordinates in the box below.</div>';
 	}
 	echo '<div data-role="collapsible" data-collapsed="' . !$geoerror . '">
-        <h3>Change Time/Place...</h3>
+        <h3>Change Time/Place (' . (isset($_SESSION['time']) ? $_SESSION['time'] : "Current Time,") . ' '.ucwords(service_period()).')...</h3>
         <form action="" method="post">
         <div class="ui-body"> 
 		<div data-role="fieldcontain">
@@ -148,3 +147,4 @@
             </div></div>';
 }
 ?>
+

--- a/common.inc.php
+++ b/common.inc.php
@@ -9,7 +9,8 @@
 $debugOkay = Array(
 	"session",
 	"json",
-	"phperror"
+	"phperror",
+	"other"
 );
 if (isDebug("phperror")) error_reporting(E_ALL ^ E_NOTICE);
 include_once ("common-geo.inc.php");
@@ -25,13 +26,22 @@
 	$_SESSION['time'] = filter_var($_REQUEST['time'], FILTER_SANITIZE_STRING);
 }
 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);
+	 $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 {
+		$contents = geocode($geolocate, true);
+		print_r($contents);
 		if (isset($contents[0]->centroid)) {
 			$geocoded = true;
 			$_SESSION['lat'] = $contents[0]->centroid->coordinates[0];
@@ -40,6 +50,7 @@
 		else {
 			$_SESSION['lat'] = "";
 			$_SESSION['lon'] = "";
+		}
 		}
 	}
 	if ($_SESSION['lat'] != "" && isMetricsOn()) {

--- 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/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) {

--- a/mywaybalance.php
+++ b/mywaybalance.php
@@ -53,6 +53,10 @@
         <label for="secret_answer"> Secret question answer </label>
         <input type="text" name="secret_answer" id="secret_answer" value="' . $secret_answer . '"  />
     </div>
+        <div data-role="fieldcontain">
+        <label for="remember"> Remember these details? </label>
+        <input type="checkbox" name="remember" id="remember"  checked="yes"  />
+    </div>
         <input type="submit" value="Go!"></form>';
 }
 include_footer();

--- a/schedule_viewer.py
+++ b/schedule_viewer.py
@@ -349,14 +349,56 @@
         points.append((stop.stop_lat, stop.stop_lon))
     return points
 
+#
+# GeoPo Encode in Python
+# @author : Shintaro Inagaki
+# @param location (Dictionary) [lat (Float), lng (Float), scale(Int)]
+# @return geopo (String)
+#
+     
   def handle_json_GET_neareststops(self, params):
     """Return a list of the nearest 'limit' stops to 'lat', 'lon'"""
     schedule = self.server.schedule
     lat = float(params.get('lat'))
     lon = float(params.get('lon'))
-    limit = int(params.get('limit'))
-    stops = schedule.GetNearestStops(lat=lat, lon=lon, n=limit)
-    return [StopToTuple(s) for s in stops]
+    limit = int(params.get('limit',5))
+    scale = int(params.get('scale',5)) # 5 = neighbourhood ~ 1km, 4= town 5 by 7km
+    stops = []
+    
+    # 64characters (number + big and small letter + hyphen + underscore)
+    chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_"
+
+    geopo = ""
+
+    # Change a degree measure to a decimal number
+    lat = (lat + 90.0) / 180 * 8 ** 10 # 90.0 is forced FLOAT type when lat is INT
+    lon = (lon + 180.0) / 360 * 8 ** 10 # 180.0 is same
+
+       # Compute a GeoPo code from head and concatenate
+    for i in range(scale):
+            order = int(lat / (8 ** (9 - i)) % 8) + int(lon / (8 ** (9 - i)) % 8) * 8
+            geopo = geopo + chars[order]
+
+    
+    for s in schedule.GetStopList():
+      if s.stop_code.find(geopo) != -1:
+        stops.append(s)
+        
+    if scale == 5:
+      print stops
+      return [StopToTuple(s) for s in stops]
+    else:
+      dist_stop_list = []
+      for s in stops:
+      # TODO: Use util.ApproximateDistanceBetweenStops?
+        dist = (s.stop_lat - lat)**2 + (s.stop_lon - lon)**2
+        if len(dist_stop_list) < limit:
+          bisect.insort(dist_stop_list, (dist, s))
+        elif dist < dist_stop_list[-1][0]:
+          bisect.insort(dist_stop_list, (dist, s))
+          dist_stop_list.pop()  # Remove stop with greatest distance
+      print dist_stop_list
+      return [StopToTuple(s) for dist, s in dist_stop_list]
 
   def handle_json_GET_boundboxstops(self, params):
     """Return a list of up to 'limit' stops within bounding box with 'n','e'
@@ -476,7 +518,7 @@
     requested_time = int(params.get('time', 0))
     limit = int(params.get('limit', 15))
     service_period = params.get('service_period', None)
-    time_range = params.get('time_range', 24*60*60)
+    time_range = int(params.get('time_range', 24*60*60))
     
     
     filtered_time_trips = []

--- a/stop.php
+++ b/stop.php
@@ -4,45 +4,49 @@
 $stopcode = filter_var($_REQUEST['stopcode'], FILTER_SANITIZE_STRING);
 $url = $APIurl . "/json/stop?stop_id=" . $stopid;
 $stop = json_decode(getPage($url));
-if ($stopcode != ""  && $stop[5] != $stopcode) {
+if ($stopcode != "" && $stop[5] != $stopcode) {
 	$url = $APIurl . "/json/stopcodesearch?q=" . $stopcode;
 	$stopsearch = json_decode(getPage($url));
 	$stopid = $stopsearch[0][0];
 	$url = $APIurl . "/json/stop?stop_id=" . $stopid;
 	$stop = json_decode(getPage($url));
 }
-if (!startsWith($stop[5], "Wj") && strpos($stop[1],"Platform") === false) {
-    // expand out to all platforms
+if (!startsWith($stop[5], "Wj") && strpos($stop[1], "Platform") === false) {
+	// expand out to all platforms
+	
 }
 $stops = Array();
 $stopPositions = Array();
+$stopNames = Array();
 $tripStopNumbers = Array();
 $allStopsTrips = Array();
 $stopLinks = "";
 if (isset($_REQUEST['stopids'])) {
-    $stopids = explode(",",filter_var($_REQUEST['stopids'], FILTER_SANITIZE_STRING));
-    foreach ($stopids as $sub_stopid) {
-        $url = $APIurl . "/json/stop?stop_id=" . $sub_stopid;
-        $stop = json_decode(getPage($url));
-        $stops[] = $stop;
-    }
-    $stop = $stops[0];
-    $stopid = $stops[0][0];
-    $stopLinks .= "Individual stop pages: ";
-    foreach ($stops as $key => $sub_stop) {
-        $stopLinks .= '<a href="stop.php?stopid='.$sub_stop[0].'&stopcode='.$sub_stop[5].'">'.$sub_stop[1].' Stop #'.($key+1).'</a> ';
-        $stopPositions[$key] = Array($sub_stop[2],$sub_stop[3]);
-        $url = $APIurl . "/json/stoptrips?stop=" . $sub_stop[0] . "&time=" . midnight_seconds() . "&service_period=" . service_period();
-        $trips = json_decode(getPage($url));
-        foreach ($trips as $trip) {
-            if (!isset($allStopTrips[$row[1][0]])) $allStopTrips[$row[1][0]] = $trip;
-            $tripStopNumbers[$row[1][0]][] = $key;
-        }
-    }
+	$stopids = explode(",", filter_var($_REQUEST['stopids'], FILTER_SANITIZE_STRING));
+	foreach ($stopids as $sub_stopid) {
+		$url = $APIurl . "/json/stop?stop_id=" . $sub_stopid;
+		$stop = json_decode(getPage($url));
+		$stops[] = $stop;
+	}
+	$stop = $stops[0];
+	$stopid = $stops[0][0];
+	$stopLinks.= "Individual stop pages: ";
+	foreach ($stops as $key => $sub_stop) {
+		$stopNames[$key] = $sub_stop[1] . ' Stop #' . ($key + 1);
+		$stopLinks.= '<a href="stop.php?stopid=' . $sub_stop[0] . '&stopcode=' . $sub_stop[5] . '">' . $stopNames[$key] . '</a> ';
+		$stopPositions[$key] = Array(
+			$sub_stop[2],
+			$sub_stop[3]
+		);
+		$url = $APIurl . "/json/stoptrips?stop=" . $sub_stop[0] . "&time=" . midnight_seconds() . "&service_period=" . service_period();
+		$trips = json_decode(getPage($url));
+		foreach ($trips as $trip) {
+			if (!isset($allStopsTrips[$trip[1][0]])) $allStopsTrips[$trip[1][0]] = $trip;
+			$tripStopNumbers[$trip[1][0]][] = $key;
+		}
+	}
 }
-
 include_header($stop[1], "stop");
-
 if (isMetricsOn()) {
 	// Create a new Instance of the tracker
 	$owa = new owa_php();
@@ -61,25 +65,39 @@
 echo '<div data-role="content" class="ui-content" role="main">';
 echo $stopLinks;
 if (sizeof($stops) > 0) {
-    echo '<p>' . staticmap($stopPositions) . '</p>';
-} else {
-    echo '<p>' . staticmap(Array(
-	0 => Array(
-		$stop[2],
-		$stop[3]
-	)
-)) . '</p>';
+	echo '<p>' . staticmap($stopPositions) . '</p>';
+}
+else {
+	echo '<p>' . staticmap(Array(
+		0 => Array(
+			$stop[2],
+			$stop[3]
+		)
+	)) . '</p>';
 }
 echo '  <ul data-role="listview"  data-inset="true">';
-$url = $APIurl . "/json/stoptrips?stop=" . $stopid . "&time=" . midnight_seconds() . "&service_period=" . service_period();
-$trips = json_decode(getPage($url));
+if (sizeof($allStopsTrips) > 0) {
+	$trips = $allStopsTrips;
+}
+else {
+	$url = $APIurl . "/json/stoptrips?stop=" . $stopid . "&time=" . midnight_seconds() . "&service_period=" . service_period();
+	$trips = json_decode(getPage($url));
+}
 foreach ($trips as $row) {
 	echo '<li>';
 	echo '<h3><a href="trip.php?stopid=' . $stopid . '&tripid=' . $row[1][0] . '">' . $row[1][1];
 	if (isFastDevice()) {
 		$viaPoints = viaPointNames($row[1][0], $stopid);
-		if ($viaPoints != "") echo '<br><small>Via: ' . $viaPoints . '</small> </a></h3>';
+		if ($viaPoints != "") echo '<br><small>Via: ' . $viaPoints . '</small>';
 	}
+	if (sizeof($tripStopNumbers) > 0) {
+            echo '<br><small>Boarding At: ';
+            foreach ($tripStopNumbers[$row[1][0]] as $key) {
+                echo $stopNames[$key] .' ';
+            }
+            echo '</small>';
+        }
+	echo '</a></h3>';
 	echo '<p class="ui-li-aside"><strong>' . midnight_seconds_to_time($row[0]) . '</strong></p>';
 	echo '</li>';
 }

--- a/stopList.php
+++ b/stopList.php
@@ -1,5 +1,8 @@
 <?php
 include ('common.inc.php');
+function filterByFirstLetter($var) {
+   return $var[1][0] == $_REQUEST['firstLetter'];
+}
 function navbar()
 {
 	echo '
@@ -19,19 +22,28 @@
 	navbar();
 	echo '  <ul data-role="listview" data-filter="true" data-inset="true" >';
 	foreach ($suburbs as $suburb) {
-		echo '<li><a href="stopList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>';
+		if (!isset($_REQUEST['firstLetter'])) {
+			foreach (range('A', 'Z') as $letter) {
+				echo "<li><a href=\"stopList.php?firstLetter=$letter&suburbs=yes\">$letter...</a></li>\n";
+			}
+		}
+		else if (startsWith($suburb, $_REQUEST['firstLetter'])) {
+			echo '<li><a href="stopList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>';
+		}
 	}
 	echo '</ul>';
 }
 else {
 	// Timing Points / All stops
 	if ($_REQUEST['allstops']) {
+		$listType = 'allstops=yes';
 		$url = $APIurl . "/json/stops";
 		include_header("All Stops", "stopList");
 		navbar();
 		timePlaceSettings();
 	}
 	else if ($_REQUEST['nearby']) {
+		$listType = 'nearby=yes';
 		$url = $APIurl . "/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15";
 		include_header("Nearby Stops", "stopList");
 		navbar();
@@ -39,6 +51,7 @@
 	}
 	else if ($_REQUEST['suburb']) {
 		$suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);
+		$listType = "suburb=$suburb";
 		$url = $APIurl . "/json/stopzonesearch?q=" . $suburb;
 		include_header("Stops in " . ucwords($suburb) , "stopList");
 		if (isMetricsOn()) {
@@ -63,73 +76,76 @@
 		navbar();
 		timePlaceSettings();
 	}
-	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" >';
-	$stops = json_decode(getPage($url));
-	foreach ($stops as $key => $row) {
-		$stopName[$key] = $row[1];
-	}
-	// Sort the stops by name
-	array_multisort($stopName, SORT_ASC, $stops);
-	$firstletter = "";
-	$stopsGrouped = Array();
-	foreach ($stops as $key => $row) {
-		if (substr($row[1], 0, 1) != $firstletter) {
-			echo "<a name=$firstletter></a>";
-			$firstletter = substr($row[1], 0, 1);
-		}
-		if (($stops[$key][1] != $stops[$key + 1][1]) || $key + 1 >= sizeof($stops)) {
-			if (sizeof($stopsGrouped) > 0) {
-				// print and empty grouped stops
-				// subsequent duplicates
-				$stopsGrouped["stop_ids"][] = $row[0];
-				echo '<li><a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">';
-				if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
-					echo '<span class="ui-li-count">' . floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])) . 'm away</span>';
-				}
-				echo bracketsMeanNewLine($row[1].'('.sizeof($stopsGrouped["stop_ids"]).' stops)');
-				echo "</a></li>\n";
-				$stopsGrouped = Array();
-			}
-			else {
-				// just a normal stop
-					echo '<li>';
-			if (!startsWith($row[5], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">';
-		
-				if (!startsWith($row[5], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">';
-				echo '<a href="stop.php?stopid=' . $row[0] . (startsWith($row[5], "Wj") ? '&stopcode=' . $row[5] : "") . '">';
-				if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
-					echo '<span class="ui-li-count">' . floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])) . 'm away</span>';
-				}
-				echo bracketsMeanNewLine($row[1]);
-				echo "</a></li>\n";
-			}
-		}
-		else {
-			// this is a duplicated line item
-			if ($key - 1 <= 0 || ($stops[$key][1] != $stops[$key - 1][1])) {
-				// first duplicate
-				$stopsGrouped = Array(
-					"name" => $row[1],
-					"stop_ids" => Array(
-						$row[0]
-					)
-				);
-			}
-			else {
-				// subsequent duplicates
-				$stopsGrouped["stop_ids"][] = $row[0];
-			}
+	if (!isset($_REQUEST['firstLetter']) && !$_REQUEST['suburb']) {
+		foreach (range('A', 'Z') as $letter) {
+			echo "<li><a href=\"stopList.php?firstLetter=$letter&$listType\">$letter...</a></li>\n";
 		}
 	}
+	else {
+		$stops = json_decode(getPage($url));
+		foreach ($stops as $key => $row) {
+			$stopName[$key] = $row[1];
+		}
+		// Sort the stops by name
+		array_multisort($stopName, SORT_ASC, $stops);
+		if (!isset($_REQUEST['suburb'])){
+		  $stops = array_filter($stops, "filterByFirstLetter");
+		}
+		$stopsGrouped = Array();
+		foreach ($stops as $key => $row) {
+				if ((trim(preg_replace("/\(Platform.*/","",$stops[$key][1])) != trim(preg_replace("/\(Platform.*/","",$stops[$key + 1][1]))) || $key + 1 >= sizeof($stops)) {
+					if (sizeof($stopsGrouped) > 0) {
+						// print and empty grouped stops
+						// subsequent duplicates
+						$stopsGrouped["stop_ids"][] = $row[0];
+						echo '<li>';
+						
+						if (!startsWith($stopsGrouped['stop_codes'][0], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">';
+						echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">';
+						if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
+							echo '<span class="ui-li-count">' . floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])) . 'm away</span>';
+						}
+						echo bracketsMeanNewLine(trim(preg_replace("/\(Platform.*/","",$row[1])) . '(' . sizeof($stopsGrouped["stop_ids"]) . ' stops)');
+						echo "</a></li>\n";
+						$stopsGrouped = Array();
+					}
+					else {
+						// just a normal stop
+						echo '<li>';
+						if (!startsWith($row[5], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">';
+						echo '<a href="stop.php?stopid=' . $row[0] . (startsWith($row[5], "Wj") ? '&stopcode=' . $row[5] : "") . '">';
+						if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
+							echo '<span class="ui-li-count">' . floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])) . 'm away</span>';
+						}
+						echo bracketsMeanNewLine($row[1]);
+						echo "</a></li>\n";
+					}
+				
+			} else {
+				// this is a duplicated line item
+				if ($key - 1 <= 0 || (trim(preg_replace("/\(Platform.*/","",$stops[$key][1])) != trim(preg_replace("/\(Platform.*/","",$stops[$key - 1][1])))) {
+					// first duplicate
+					$stopsGrouped = Array(
+						"name" => trim(preg_replace("/\(Platform.*/","",$row[1])),
+						"stop_ids" => Array(
+							$row[0]
+						),
+						"stop_codes" => Array(
+							$row[5]
+						)
+					);
+				}
+				else {
+					// subsequent duplicates
+					$stopsGrouped["stop_ids"][] = $row[0];
+				}
+			}
+		
+	       }
+	}
 	echo '</ul>';
+	var_dump ($stopsGrouped);
 }
 include_footer();
 ?>

--- a/view.sh
+++ b/view.sh
@@ -1,3 +1,6 @@
-python schedule_viewer.py --feed=/var/www/cbrfeed.zip \
+ #!/bin/sh
+ f=`dirname $0`
+ cd $f
+ python schedule_viewer.py --feed=/var/www/cbrfeed.zip \
 --key=ABQIAAAA95XYXN0cki3Yj_Sb71CFvBTPaLd08ONybQDjcH_VdYtHHLgZvRTw2INzI_m17_IoOUqH3RNNmlTk1Q
 

