More network 10 updates
More network 10 updates

file:a/.gitignore -> file:b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-maxious-canberra-transit-feed/output/
+origin-src
 

file:b/betweenpoint.php (new)
--- /dev/null
+++ b/betweenpoint.php
@@ -1,1 +1,180 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <script src="openlayers/OpenLayers.js"></script>
+ <SCRIPT TYPE="text/javascript" SRC="OpenStreetMap.js"></SCRIPT> 
+<script type="text/javascript" src="jquery.1.3.2.min.js"></script>
+    <script type="text/javascript">
 
+function init()
+{
+    // 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")
+// 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");
+ 
+
+<?php
+  $conn = pg_connect("dbname=bus user=postgres password=snmc");
+  if (!$conn) {
+      echo "An error occured.\n";
+      exit;
+  }
+  $result_stops = pg_query($conn, "Select * FROM stops");
+  
+  while ($stop = pg_fetch_assoc($result_stops)) {
+      echo 'marker = new OpenLayers.Marker(new OpenLayers.LonLat(' . ($stop['lng'] / 10000000) . "," . ($stop['lat'] / 10000000) . ')
+            .transform(
+            new OpenLayers.Projection("EPSG:4326"), // transform from WGS 1984
+            new OpenLayers.Projection("EPSG:900913") // to Spherical Mercator Projection
+            ));';
+      
+      echo '
+            marker.id="' . $stop['geohash'] . '";
+            markers.addMarker(marker);
+marker.events.register("mousedown", marker, function() {
+document.getElementById("between_points").innerHTML += this.id+";";
+});
+';
+  }
+?>
+var timeicon = new OpenLayers.Icon("http://maps.google.com/mapfiles/kml/pushpin/grn-pushpin.png",new OpenLayers.Size(32,32));
+var timepoints = new OpenLayers.Layer.GeoRSS("Timing Points", "displaytimepoints.georss.php", { icon: timeicon });
+
+            map.addLayers([osmtiles, markers,timepoints]);
+            map.addControl(new OpenLayers.Control.LayerSwitcher());
+      map.zoomToExtent(markers.getDataExtent());
+ }
+    </script>
+        <script type="text/javascript">
+function submitBetween () {
+        $.post("betweenpoint.submit.php", $("#inputform").serialize(), function(html){
+        $("#response").html(html);
+        //clearForms();
+	return false;
+      });
+};
+
+function OnChange(dropdown)
+{
+    var myindex  = dropdown.selectedIndex
+    var selValue = dropdown.options[myindex].value;
+  $("#routes").val(selValue.split(":",2)[0]);
+  fromto = selValue.split(":",2)[1];
+  $("#from").val(fromto.split("->",2)[0]);
+  $("#to").val(fromto.split("->",2)[1]);
+    return true;
+}
+
+// function will clear input elements on each form
+function clearForms(){
+document.getElementById("between_points").innerHTML = "";
+  // declare element type
+  var type = null;
+  // loop through forms on HTML page
+  for (var x=0; x<document.forms.length; x++){
+    // loop through each element on form
+    for (var y=0; y<document.forms[x].elements.length; y++){
+      // define element type
+      type = document.forms[x].elements[y].type
+      // alert before erasing form element
+      //alert('form='+x+' element='+y+' type='+type);
+      // switch on element type
+      switch(type){
+        case "text":
+        case "textarea":
+        case "password":
+        //case "hidden":
+          document.forms[x].elements[y].value = "";
+          break;
+        case "radio":
+        case "checkbox":
+          document.forms[x].elements[y].checked = true;
+          break;
+        case "select-one":
+          document.forms[x].elements[y].options[0].selected = true;
+          break;
+        case "select-multiple":
+          for (z=0; z<document.forms[x].elements[y].options.length; z++){
+            document.forms[x].elements[y].options[z].selected = false;
+          }
+        break;
+      }
+    }
+  }
+}
+    </script>
+
+  </head>
+  <body onload="init()">
+   <div id="inputpane"><form id="inputform">
+<select name=selectPair onchange='OnChange(this.form.selectPair);'>
+<option>Select a from/to pair...</option>
+<?php
+  include('spyc/spyc.php');
+  //$timetable = Spyc::YAMLLoad('../spyc.yaml');
+  $path = "maxious-canberra-transit-feed/output/";
+  $dhandle = opendir("maxious-canberra-transit-feed/output/");
+  // define an array to hold the files
+  $files = array();
+  $paths = array();
+  
+  if ($dhandle) {
+      // loop through all of the files
+      while (false !== ($fname = readdir($dhandle))) {
+          if (($fname != '.') && ($fname != '..')) {
+              $timetable = Spyc::YAMLLoad("maxious-canberra-transit-feed/output/" . $fname);
+		// Strip off individual platforms because it usually doesn't matter for routes
+		$timetable["time_points"] = preg_replace("/(Platform.*/","",$timetable["time_points"]);
+              for ($i = 0; $i < sizeof($timetable["time_points"]) - 1; $i++) {
+                  @$paths[trim($timetable["time_points"][$i]) . "->" . trim($timetable["time_points"][$i + 1])] .= $timetable["short_name"] . ";";
+              }
+          }
+      }
+  }
+  ksort($paths);
+  
+  $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']);
+  }
+  
+  foreach ($paths as $path => $routes) {
+      if (!in_array($path, array_keys($completedPaths))) {
+          echo "<option value=\"$routes:$path\">" . sizeof(explode(";", $routes)) . " $path</option>\n";
+      } else {
+	$completedRoutes = explode(";", $completedPaths[$path]);
+	 $incompleteRoutes = "";
+	foreach (explode(";", $routes) as $route) {
+
+	  if (!in_array($route,$completedRoutes)) {
+	  $incompleteRoutes .= $route.';';
+	  }
+	  
+	}
+	if ($incompleteRoutes != "") echo "<option value=\"$incompleteRoutes:$path\">" . sizeof(explode(";", $incompleteRoutes)) . " $path</option>\n";
+      }
+      
+  }
+?>
+</select>
+ from <input type="text" name="from" id="from"/>
+ to <input type="text" name="to" id="to"/>
+<br>
+ on routes <input type="text" name="routes" id="routes"/>
+Reverse? <input type="checkbox" name="reverse" id="reverse" checked="true"/> 
+<input type="button" onclick="javascript:submitBetween()" value="Submit!">
+<input type="button" value="Clear" onclick="javascript:clearForms()" title="Start clearForms() JavaScript function">
+<br>
+<textarea name="between_points" id="between_points" rows="1" cols="120"></textarea>
+</form>
+<div id="response">
+    <!-- Our message will be echoed out here -->
+  </div>
+</div>
+   <div id="map" width="100%" height="100%"></div>
+  </body>
+</html>
+

--- /dev/null
+++ b/betweenpoint.submit.php
@@ -1,1 +1,29 @@
+<?php

+$conn = pg_connect("dbname=bus user=postgres password=snmc");

+if (!$conn) {

+  echo "An error occured.\n";

+  exit;

+}

+print_r($_REQUEST);

+$reverse=$_REQUEST["reverse"];

+$from=$_REQUEST["from"];

+$to=$_REQUEST["to"];

+$routes=$_REQUEST["routes"] ;

+$points=$_REQUEST["between_points"];

+   $sql = "INSERT INTO between_stops (fromLocation, toLocation, points, routes) VALUES('$from','$to','$points','$routes')";

+     $result = pg_query($conn, $sql);

+     if (!$result) {

+         echo("Error in SQL query: " . pg_last_error() ."<br>\n");

+     }

+     if ($reverse === "on") {

+	$points = implode(";",array_reverse(explode(";",$points)));

+$sql = "INSERT INTO between_stops ( toLocation, fromLocation, points, routes) VALUES('$from','$to','$points','$routes')";

+$result = pg_query($conn, $sql);

+     if (!$result) {

+         echo("Error in SQL query: " . pg_last_error() ."<br>\n");

+     }

+     }

+flush();

+    

+?>

 

--- /dev/null
+++ b/busui/common.inc.php
@@ -1,1 +1,85 @@
+<?php
+date_default_timezone_set('Australia/ACT');
+$APIurl = "http://localhost:8765";
+error_reporting(E_ALL ^ E_NOTICE);
 
+function isDebug()
+{
+    return true;
+}
+
+function isFastDevice() {
+    return true;
+}
+
+function include_header($pageTitle) {
+    // 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> 
+<body> 
+ 
+<div data-role="page"> 
+ 
+	<div data-role="header"> 
+		<h1>'.$pageTitle.'</h1> 
+	</div><!-- /header -->
+        <div data-role="content"> ';
+}
+
+function include_footer()
+{
+    echo '</div>';
+}
+
+function service_period()
+{
+switch (date('w')){
+
+case 0:
+	return 'sunday';
+case 6:
+	return 'saturday';
+default:
+	return 'weekday';
+}	
+}
+
+function midnight_seconds()
+{
+// from http://www.perturb.org/display/Perlfunc__Seconds_Since_Midnight.html
+  $secs = (date("G") * 3600) + (date("i") * 60) + date("s");
+   return $secs;
+}
+
+function midnight_seconds_to_time($seconds)
+{
+	$midnight = mktime (0, 0, 0, date("n"), date("j"), date("Y"));
+	return date("h:ia",$midnight+$seconds);
+}
+function getPage($url)
+{
+    $ch = curl_init($url);
+curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
+curl_setopt( $ch, CURLOPT_HEADER, 0 );
+$page = curl_exec($ch);
+curl_close($ch);
+return $page;
+}
+function array_flatten($a,$f=array()){
+  if(!$a||!is_array($a))return '';
+  foreach($a as $k=>$v){
+    if(is_array($v))$f=array_flatten($v,$f);
+    else $f[$k]=$v;
+  }
+  return $f;
+}
+?>
+  

file:b/busui/index.php (new)
--- /dev/null
+++ b/busui/index.php
@@ -1,1 +1,66 @@
+<?php 
+include('common.inc.php'); 
+?>
+<!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> 
+	<div data-role="content"> 
+            <ul data-role="listview" data-inset="true" data-theme="c" data-dividertheme="b">
+                <li data-role="list-divider">Stops</li>
+                <li><a href="stopList.php">All stops List</a></li>
+		<li class="nearby"><a href="">Nearby List</a></li>
+                <li><a href="stopList.php">Favourites List</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>
+            </ul>
+            <div class="info">
+		<p class="latlng"></p>
+		Time: <?php echo date("H:m"); ?> <br>
+		Service Period: <?php echo ucwords(service_period()); ?> 
+            </div>
+        </div>
+   </div>
+ </body>
+</html>
 

file:b/busui/readme.txt (new)
--- /dev/null
+++ b/busui/readme.txt
@@ -1,1 +1,23 @@
+# input location (via GPS or favourites or search) and destination (via searchable list, optional)
+# http://10.0.1.153:8765/json/boundboxstops?n=-35.27568499917103&e=149.1346514225006&s=-35.279495003493516
+&w=149.12622928619385&limit=50
+# http://10.0.1.153:8765/json/stoptrips?stop=43&time=64440 # recursively call to show all services nearby, sort by distance, need to filter by service period
+# Hey, can pick destination again from a list filtered to places these stops go if you're curious!
+# http://10.0.1.153:8765/json/tripstoptimes?trip=2139 # Can recursively call and parse based on intended destination to show ETA
+# http://10.0.1.153:8765/json/triprows?trip=2139 # For pretty maps
 
+have to do
+/usr/sbin/setsebool -P httpd_can_network_connect=1
+on fedora
+
+might need http://forum.jquery.com/topic/google-maps-inside-jquery-mobile
+
+some extras
+/json/routes = all routes
+/json/neareststops?lat/lng/number
+TODO
+Destinations
+Favourites
+OOP stops/routes
+Stop sorting/search-filter
+

file:b/busui/route.php (new)
--- /dev/null
+++ b/busui/route.php

--- /dev/null
+++ b/busui/routeList.php
@@ -1,1 +1,34 @@
+<?php
+include('common.inc.php');
+include_header("Routes");
+/* data-filter="true">';
+echo "<script> $('#routeList').listnav({prefixes: ['to'] }); </script>";*/
+echo '  <ul data-role="listview">';
+$url = $APIurl."/json/routes";
 
+$contents = json_decode(getPage($url));
+foreach ($contents as $key => $row) {
+    $routeDestinations[$row[2]][]  = $row;
+}
+foreach ($routeDestinations as $destination => $routes)
+{
+	echo '<li>'.$destination."... <ul>\n";
+		foreach($routes as $row) {
+      			echo  '<li>'.$row[1].' <a href="route.php?routeid='.$row[0].'">'.$row[2]."</a></li>\n";
+		}
+	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();
+?>
+

--- /dev/null
+++ b/busui/schedule_viewer.py
@@ -1,1 +1,544 @@
-
+#!/usr/bin/python2.5
+
+# Copyright (C) 2007 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in 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.
+
+"""
+An example application that uses the transitfeed module.
+
+You must provide a Google Maps API key.
+"""
+
+
+import BaseHTTPServer, sys, urlparse
+import bisect
+from gtfsscheduleviewer.marey_graph import MareyGraph
+import gtfsscheduleviewer
+import mimetypes
+import os.path
+import re
+import signal
+import simplejson
+import socket
+import time
+import transitfeed
+from transitfeed import util
+import urllib
+
+
+# By default Windows kills Python with Ctrl+Break. Instead make Ctrl+Break
+# raise a KeyboardInterrupt.
+if hasattr(signal, 'SIGBREAK'):
+  signal.signal(signal.SIGBREAK, signal.default_int_handler)
+
+
+mimetypes.add_type('text/plain', '.vbs')
+
+
+class ResultEncoder(simplejson.JSONEncoder):
+  def default(self, obj):
+    try:
+      iterable = iter(obj)
+    except TypeError:
+      pass
+    else:
+      return list(iterable)
+    return simplejson.JSONEncoder.default(self, obj)
+
+# Code taken from
+# http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/425210/index_txt
+# An alternate approach is shown at
+# http://mail.python.org/pipermail/python-list/2003-July/212751.html
+# but it requires multiple threads. A sqlite object can only be used from one
+# thread.
+class StoppableHTTPServer(BaseHTTPServer.HTTPServer):
+  def server_bind(self):
+    BaseHTTPServer.HTTPServer.server_bind(self)
+    self.socket.settimeout(1)
+    self._run = True
+
+  def get_request(self):
+    while self._run:
+      try:
+        sock, addr = self.socket.accept()
+        sock.settimeout(None)
+        return (sock, addr)
+      except socket.timeout:
+        pass
+
+  def stop(self):
+    self._run = False
+
+  def serve(self):
+    while self._run:
+      self.handle_request()
+
+
+def StopToTuple(stop):
+  """Return tuple as expected by javascript function addStopMarkerFromList"""
+  return (stop.stop_id, stop.stop_name, float(stop.stop_lat),
+          float(stop.stop_lon), stop.location_type)
+
+
+class ScheduleRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+  def do_GET(self):
+    scheme, host, path, x, params, fragment = urlparse.urlparse(self.path)
+    parsed_params = {}
+    for k in params.split('&'):
+      k = urllib.unquote(k)
+      if '=' in k:
+        k, v = k.split('=', 1)
+        parsed_params[k] = unicode(v, 'utf8')
+      else:
+        parsed_params[k] = ''
+
+    if path == '/':
+      return self.handle_GET_home()
+
+    m = re.match(r'/json/([a-z]{1,64})', path)
+    if m:
+      handler_name = 'handle_json_GET_%s' % m.group(1)
+      handler = getattr(self, handler_name, None)
+      if callable(handler):
+        return self.handle_json_wrapper_GET(handler, parsed_params)
+
+    # Restrict allowable file names to prevent relative path attacks etc
+    m = re.match(r'/file/([a-z0-9_-]{1,64}\.?[a-z0-9_-]{1,64})$', path)
+    if m and m.group(1):
+      try:
+        f, mime_type = self.OpenFile(m.group(1))
+        return self.handle_static_file_GET(f, mime_type)
+      except IOError, e:
+        print "Error: unable to open %s" % m.group(1)
+        # Ignore and treat as 404
+
+    m = re.match(r'/([a-z]{1,64})', path)
+    if m:
+      handler_name = 'handle_GET_%s' % m.group(1)
+      handler = getattr(self, handler_name, None)
+      if callable(handler):
+        return handler(parsed_params)
+
+    return self.handle_GET_default(parsed_params, path)
+
+  def OpenFile(self, filename):
+    """Try to open filename in the static files directory of this server.
+    Return a tuple (file object, string mime_type) or raise an exception."""
+    (mime_type, encoding) = mimetypes.guess_type(filename)
+    assert mime_type
+    # A crude guess of when we should use binary mode. Without it non-unix
+    # platforms may corrupt binary files.
+    if mime_type.startswith('text/'):
+      mode = 'r'
+    else:
+      mode = 'rb'
+    return open(os.path.join(self.server.file_dir, filename), mode), mime_type
+
+  def handle_GET_default(self, parsed_params, path):
+    self.send_error(404)
+
+  def handle_static_file_GET(self, fh, mime_type):
+    content = fh.read()
+    self.send_response(200)
+    self.send_header('Content-Type', mime_type)
+    self.send_header('Content-Length', str(len(content)))
+    self.end_headers()
+    self.wfile.write(content)
+
+  def AllowEditMode(self):
+    return False
+
+  def handle_GET_home(self):
+    schedule = self.server.schedule
+    (min_lat, min_lon, max_lat, max_lon) = schedule.GetStopBoundingBox()
+    forbid_editing = ('true', 'false')[self.AllowEditMode()]
+
+    agency = ', '.join(a.agency_name for a in schedule.GetAgencyList()).encode('utf-8')
+
+    key = self.server.key
+    host = self.server.host
+
+    # A very simple template system. For a fixed set of values replace [xxx]
+    # with the value of local variable xxx
+    f, _ = self.OpenFile('index.html')
+    content = f.read()
+    for v in ('agency', 'min_lat', 'min_lon', 'max_lat', 'max_lon', 'key',
+              'host', 'forbid_editing'):
+      content = content.replace('[%s]' % v, str(locals()[v]))
+
+    self.send_response(200)
+    self.send_header('Content-Type', 'text/html')
+    self.send_header('Content-Length', str(len(content)))
+    self.end_headers()
+    self.wfile.write(content)
+
+  def handle_json_GET_routepatterns(self, params):
+    """Given a route_id generate a list of patterns of the route. For each
+    pattern include some basic information and a few sample trips."""
+    schedule = self.server.schedule
+    route = schedule.GetRoute(params.get('route', None))
+    if not route:
+      self.send_error(404)
+      return
+    time = int(params.get('time', 0))
+    sample_size = 10  # For each pattern return the start time for this many trips
+
+    pattern_id_trip_dict = route.GetPatternIdTripDict()
+    patterns = []
+
+    for pattern_id, trips in pattern_id_trip_dict.items():
+      time_stops = trips[0].GetTimeStops()
+      if not time_stops:
+        continue
+      has_non_zero_trip_type = False;
+      for trip in trips:
+        if trip['trip_type'] and trip['trip_type'] != '0':
+          has_non_zero_trip_type = True
+      name = u'%s to %s, %d stops' % (time_stops[0][2].stop_name, time_stops[-1][2].stop_name, len(time_stops))
+      transitfeed.SortListOfTripByTime(trips)
+
+      num_trips = len(trips)
+      if num_trips <= sample_size:
+        start_sample_index = 0
+        num_after_sample = 0
+      else:
+        # Will return sample_size trips that start after the 'time' param.
+
+        # Linear search because I couldn't find a built-in way to do a binary
+        # search with a custom key.
+        start_sample_index = len(trips)
+        for i, trip in enumerate(trips):
+          if trip.GetStartTime() >= time:
+            start_sample_index = i
+            break
+
+        num_after_sample = num_trips - (start_sample_index + sample_size)
+        if num_after_sample < 0:
+          # Less than sample_size trips start after 'time' so return all the
+          # last sample_size trips.
+          num_after_sample = 0
+          start_sample_index = num_trips - sample_size
+
+      sample = []
+      for t in trips[start_sample_index:start_sample_index + sample_size]:
+        sample.append( (t.GetStartTime(), t.trip_id) )
+
+      patterns.append((name, pattern_id, start_sample_index, sample,
+                       num_after_sample, (0,1)[has_non_zero_trip_type]))
+
+    patterns.sort()
+    return patterns
+
+  def handle_json_wrapper_GET(self, handler, parsed_params):
+    """Call handler and output the return value in JSON."""
+    schedule = self.server.schedule
+    result = handler(parsed_params)
+    content = ResultEncoder().encode(result)
+    self.send_response(200)
+    self.send_header('Content-Type', 'text/plain')
+    self.send_header('Content-Length', str(len(content)))
+    self.end_headers()
+    self.wfile.write(content)
+
+  def handle_json_GET_routes(self, params):
+    """Return a list of all routes."""
+    schedule = self.server.schedule
+    result = []
+    for r in schedule.GetRouteList():
+      result.append( (r.route_id, r.route_short_name, r.route_long_name) )
+    result.sort(key = lambda x: x[1:3])
+    return result
+
+  def handle_json_GET_routerow(self, params):
+    schedule = self.server.schedule
+    route = schedule.GetRoute(params.get('route', None))
+    return [transitfeed.Route._FIELD_NAMES, route.GetFieldValuesTuple()]
+
+  def handle_json_GET_triprows(self, params):
+    """Return a list of rows from the feed file that are related to this
+    trip."""
+    schedule = self.server.schedule
+    try:
+      trip = schedule.GetTrip(params.get('trip', None))
+    except KeyError:
+      # if a non-existent trip is searched for, the return nothing
+      return
+    route = schedule.GetRoute(trip.route_id)
+    trip_row = dict(trip.iteritems())
+    route_row = dict(route.iteritems())
+    return [['trips.txt', trip_row], ['routes.txt', route_row]]
+
+  def handle_json_GET_tripstoptimes(self, params):
+    schedule = self.server.schedule
+    try:
+      trip = schedule.GetTrip(params.get('trip'))
+    except KeyError:
+       # if a non-existent trip is searched for, the return nothing
+      return
+    time_stops = trip.GetTimeStops()
+    stops = []
+    times = []
+    for arr,dep,stop in time_stops:
+      stops.append(StopToTuple(stop))
+      times.append(arr)
+    return [stops, times]
+
+  def handle_json_GET_tripshape(self, params):
+    schedule = self.server.schedule
+    try:
+      trip = schedule.GetTrip(params.get('trip'))
+    except KeyError:
+       # if a non-existent trip is searched for, the return nothing
+      return
+    points = []
+    if trip.shape_id:
+      shape = schedule.GetShape(trip.shape_id)
+      for (lat, lon, dist) in shape.points:
+        points.append((lat, lon))
+    else:
+      time_stops = trip.GetTimeStops()
+      for arr,dep,stop in time_stops:
+        points.append((stop.stop_lat, stop.stop_lon))
+    return points
+
+  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]
+
+  def handle_json_GET_boundboxstops(self, params):
+    """Return a list of up to 'limit' stops within bounding box with 'n','e'
+    and 's','w' in the NE and SW corners. Does not handle boxes crossing
+    longitude line 180."""
+    schedule = self.server.schedule
+    n = float(params.get('n'))
+    e = float(params.get('e'))
+    s = float(params.get('s'))
+    w = float(params.get('w'))
+    limit = int(params.get('limit'))
+    stops = schedule.GetStopsInBoundingBox(north=n, east=e, south=s, west=w, n=limit)
+    return [StopToTuple(s) for s in stops]
+
+  def handle_json_GET_stops(self, params):
+    schedule = self.server.schedule
+    return [StopToTuple(s) for s in schedule.GetStopList()]
+    
+  def handle_json_GET_timingpoints(self, params):
+    schedule = self.server.schedule
+    matches = []
+    for s in schedule.GetStopList():
+      if s.stop_code.find("Wj") == -1:
+        matches.append(StopToTuple(s))
+    return matches
+
+  def handle_json_GET_stopsearch(self, params):
+    schedule = self.server.schedule
+    query = params.get('q', None).lower()
+    matches = []
+    for s in schedule.GetStopList():
+      if s.stop_id.lower().find(query) != -1 or s.stop_name.lower().find(query) != -1:
+        matches.append(StopToTuple(s))
+    return matches
+
+  def handle_json_GET_stop(self, params):