From: maxious <maxious@vanille.(none)>
Date: Sat, 30 Oct 2010 02:53:52 +0000
Subject: Add between stops to feed YAML
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=bus.git&a=commitdiff&h=cc68a6b77df2a123cb328a842e0bdf5704ff0966
---
Add between stops to feed YAML
---


--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-maxious-canberra-transit-feed/output/
+maxious-canberra-transit-feed/source-html
+origin-src
 

--- a/betweenpoint.php
+++ b/betweenpoint.php
@@ -7,71 +7,65 @@
 
 function init()
 {
-		// create the ol map object
-		var map = new OpenLayers.Map('map');
+    // create the ol map object
+    var map = new OpenLayers.Map('map');
     
-	var osmtiles = new OpenLayers.Layer.OSM("local", "http://127.0.0.1/Maps/OSM/${z}/${x}/${y}.png")
+  var osmtiles = new OpenLayers.Layer.OSM("local", "http://127.0.0.1/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");
+    markers = new OpenLayers.Layer.Markers("Between Stop Markers");
  
 
 <?php
-$conn = pg_connect("dbname=bus user=postgres password=snmc");
-if (!$conn) {
-  echo "An error occured.\n";
-  exit;
-}
-$result_stops = pg_query($conn, "Select * FROM stops");                                     
-
-while ($stop = pg_fetch_assoc($result_stops)) {
-echo 'marker = new OpenLayers.Marker(new OpenLayers.LonLat('.($stop['lng']/10000000).",".($stop['lat']/10000000).')
+  $conn = pg_connect("dbname=bus user=postgres password=snmc");
+  if (!$conn) {
+      echo "An error occured.\n";
+      exit;
+  }
+  $result_stops = pg_query($conn, "Select * FROM stops");
+  
+  while ($stop = pg_fetch_assoc($result_stops)) {
+      echo 'marker = new OpenLayers.Marker(new OpenLayers.LonLat(' . ($stop['lng'] / 10000000) . "," . ($stop['lat'] / 10000000) . ')
             .transform(
             new OpenLayers.Projection("EPSG:4326"), // transform from WGS 1984
             new OpenLayers.Projection("EPSG:900913") // to Spherical Mercator Projection
             ));';
-
-echo '
-            marker.id="'.$stop['geohash'].'";
+      
+      echo '
+            marker.id="' . $stop['geohash'] . '";
             markers.addMarker(marker);
 marker.events.register("mousedown", marker, function() {
 document.getElementById("between_points").innerHTML += this.id+";";
 });
 ';
-}
+  }
 ?>
 var timeicon = new OpenLayers.Icon("http://maps.google.com/mapfiles/kml/pushpin/grn-pushpin.png",new OpenLayers.Size(32,32));
 var timepoints = new OpenLayers.Layer.GeoRSS("Timing Points", "displaytimepoints.georss.php", { icon: timeicon });
 
             map.addLayers([osmtiles, markers,timepoints]);
             map.addControl(new OpenLayers.Control.LayerSwitcher());
-	    map.zoomToExtent(markers.getDataExtent());
+      map.zoomToExtent(markers.getDataExtent());
  }
+    </script>
+        <script type="text/javascript">
+function submitBetween () {
+        $.post("betweenpoint.submit.php", $("#inputform").serialize(), function(html){
+        $("#response").html(html);
+        //clearForms();
+	return false;
+      });
+};
 
-	function submit(){
-		$.ajax({
-			type: "POST",
-			url: "betweenpoint.submit.php",
-			data: 	"reverse=" + document.getElementById("reverse").value + 
-					"&from=" + document.getElementById("from").value + 
-					"&to=" + document.getElementById("to").value +
-					"&routes=" + document.getElementById("routes").value +
-					"&between_points=" + document.getElementById("between_points").value,
-			success: function(html){
-				$("#response").html(html);
-				clearForms();
-			}
-		});
-		
-		}
-<!--
 function OnChange(dropdown)
 {
     var myindex  = dropdown.selectedIndex
-    var selValue = dropdown.options[myindex].value
-alert(selValue);    
+    var selValue = dropdown.options[myindex].value;
+  $("#routes").val(selValue.split(":",2)[0]);
+  fromto = selValue.split(":",2)[1];
+  $("#from").val(fromto.split("->",2)[0]);
+  $("#to").val(fromto.split("->",2)[1]);
     return true;
 }
-//--> 
 
 // function will clear input elements on each form
 function clearForms(){
@@ -96,7 +90,7 @@
           break;
         case "radio":
         case "checkbox":
-          document.forms[x].elements[y].checked = "";
+          document.forms[x].elements[y].checked = true;
           break;
         case "select-one":
           document.forms[x].elements[y].options[0].selected = true;
@@ -118,72 +112,69 @@
 <select name=selectPair onchange='OnChange(this.form.selectPair);'>
 <option>Select a from/to pair...</option>
 <?php
-include('spyc/spyc.php');
-//$timetable = Spyc::YAMLLoad('../spyc.yaml');
-$path = "maxious-canberra-transit-feed/output/";
-$dhandle = opendir("maxious-canberra-transit-feed/output/");
-// define an array to hold the files
-$files = array();
-$paths = array();
+  include('spyc/spyc.php');
+  //$timetable = Spyc::YAMLLoad('../spyc.yaml');
+  $path = "maxious-canberra-transit-feed/output/";
+  $dhandle = opendir("maxious-canberra-transit-feed/output/");
+  // define an array to hold the files
+  $files = array();
+  $paths = array();
+  
+  if ($dhandle) {
+      // loop through all of the files
+      while (false !== ($fname = readdir($dhandle))) {
+          if (($fname != '.') && ($fname != '..')) {
+              $timetable = Spyc::YAMLLoad("maxious-canberra-transit-feed/output/" . $fname);
+		// Strip off individual platforms because it usually doesn't matter for routes
+		$timetable["time_points"] = preg_replace("/-.* Platform.*/","",$timetable["time_points"]);
+              for ($i = 0; $i < sizeof($timetable["time_points"]) - 1; $i++) {
+                  @$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 ($dhandle) {
-   // loop through all of the files
-   while (false !== ($fname = readdir($dhandle))) {
-      if (($fname != '.') && ($fname != '..')) {
-		$timetable = Spyc::YAMLLoad("maxious-canberra-transit-feed/output/".$fname);
-		for ($i = 0; $i < sizeof($timetable["time_points"]) -1 ; $i++)
-		{
-			@$paths[$timetable["time_points"][$i]."->".$timetable["time_points"][$i+1]] .= $timetable["short_name"].";";
-		}
+	  if (!in_array($route,$completedRoutes)) {
+	  $incompleteRoutes .= $route.';';
+	  }
+	  
 	}
-   }
-}
-$completedPaths = Array("Cameron Ave Bus Station->Lathlain St Bus Station",
-"Lathlain St Bus Station->Cohen St Bus Station",
-"Cohen St Bus Station->Lathlain St Bus Station",
-"Lathlain St Bus Station->Cameron Ave Bus Station",
-"Lathlain St Bus Station - Platform 1->Cameron Ave Bus Station - Platform 1",
-"Lathlain St Bus Station - Platform 2->Cameron Ave Bus Station - Platform 1",
-"Lathlain St Bus Station - Platform 2->Cameron Ave Bus Station - Platform 2",
-"Lathlain St Bus Station - Platform 3->Cameron Ave Bus Station - Platform 2",
-"Lathlain St Bus Station - Platform 3->Cameron Ave Bus Station - Platform 3",
-"Lathlain St Bus Station - Platform 4->Cohen St Bus Station - Platform 4",
-"Lathlain St Bus Station - Platform 4->Cohen St Bus Station - Platform 6",
-"Lathlain St Bus Station - Platform 5->Cohen St Bus Station - Platform 5",
-"Lathlain St Bus Station - Platform 6->Cohen St Bus Station - Platform 5",
-"Cohen St Bus Station - Platform 1->Lathlain St Bus Station - Platform 2",
-"Cohen St Bus Station - Platform 1->Lathlain St Bus Station - Platform 3",
-"Cohen St Bus Station - Platform 2->Lathlain St Bus Station - Platform 1",
-"Cohen St Bus Station - Platform 2->Lathlain St Bus Station - Platform 2",
-"Cohen St Bus Station - Platform 2->Lathlain St Bus Station - Platform 3",
-"Cohen St Bus Station - Platform 3->Lathlain St Bus Station - Platform 1",
-"Cameron Ave Bus Station - Platform 4->Lathlain St Bus Station - Platform 4", 
-"Cameron Ave Bus Station - Platform 5->Lathlain St Bus Station - Platform 5",
-"Cameron Ave Bus Station - Platform 5->Lathlain St Bus Station - Platform 6"
-);
-ksort($paths);
-foreach ($paths as $path => $routes)
-{
- if (!in_array($path,$completedPaths)) echo  "<option value=\"$routes:$path\">".sizeof(explode(";",$routes))." $path</option>\n";
-}
+	if ($incompleteRoutes != "") echo "<option value=\"$incompleteRoutes:$path\">" . sizeof(explode(";", $incompleteRoutes)) . " $path</option>\n";
+      }
+      
+  }
 ?>
 </select>
- from <input type="text" id="from"/>
- to <input type="text" id="to"/>
+ from <input type="text" name="from" id="from"/>
+ to <input type="text" name="to" id="to"/>
 <br>
- on routes <input type="text" id="routes"/>
-Reverse? <input type="checkbox" name="reverse" id="reverse" value="true"/> 
-<input type="button" onclick="javascript:submit()" name="mysubmit" value="Submit!">
+ on routes <input type="text" name="routes" id="routes"/>
+Reverse? <input type="checkbox" name="reverse" id="reverse" checked="true"/> 
+<input type="button" onclick="javascript:submitBetween()" value="Submit!">
 <input type="button" value="Clear" onclick="javascript:clearForms()" title="Start clearForms() JavaScript function">
 <br>
-<textarea id="between_points" rows="1" cols="120"></textarea>
+<textarea name="between_points" id="between_points" rows="1" cols="120"></textarea>
 </form>
-<br><div id="response">
-		<!-- Our message will be echoed out here -->
-	</div>
+<div id="response">
+    <!-- Our message will be echoed out here -->
+  </div>
 </div>
    <div id="map" width="100%" height="100%"></div>
   </body>
 </html>
 
-

--- a/betweenpoint.submit.php
+++ b/betweenpoint.submit.php
@@ -1,76 +1,29 @@
 <?php
-/*
- * GeoPo Encode in PHP
- * @author : Shintaro Inagaki
- * @param $location (Array)
- * @return $geopo (String)
- */
-function geopoEncode($lat, $lng) {
-	// 64characters (number + big and small letter + hyphen + underscore)
-	$chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
-
-	$geopo = "";
-	$scale = 7;
-	
-	// Change a degree measure to a decimal number
-	$lat = ($lat + 90) / 180 * pow(8, 10);
-	$lng = ($lng + 180) / 360 * pow(8, 10);
-	// Compute a GeoPo code from head and concatenate
-	for($i = 0; $i < $scale; $i++) {
-		$geopo .= substr($chars, floor($lat / pow(8, 9 - $i) % 8) + floor($lng / pow(8, 9 - $i) % 8) * 8, 1);
-	}
-	return $geopo;
-}		
-
-/*
- * GeoPo Decode in PHP
- * @author : Shintaro Inagaki
- * @param $geopo (String)
- * @return $location (Array)
- */
-function geopoDecode($geopo) {
-	// 64characters (number + big and small letter + hyphen + underscore)
-	$chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
-	// Array for geolocation
-	$location = array ();
-
-	for ($i = 0; $i < strlen($geopo); $i++) {
-		// What number of character that equal to a GeoPo code (0-63)
-		$order = strpos($chars, substr($geopo, $i, 1));
-		// Lat/Lng plus geolocation value of scale 
-		$location['lat'] = $location['lat'] + floor($order % 8) * pow(8, 9 - $i);
-		$location['lng'] = $location['lng'] + floor($order / 8) * pow(8, 9 - $i);
-	}
-
-	// Change a decimal number to a degree measure, and plus revised value that shift center of area
-	$location['lat'] = $location['lat'] * 180 / pow(8, 10) + 180 / pow(8, strlen($geopo)) / 2 - 90;
-	$location['lng'] = $location['lng'] * 360 / pow(8, 10) + 360 / pow(8, strlen($geopo)) / 2 - 180;
-	$location['scale'] = strlen($geopo);
-
-	return $location;
-}	
-
 $conn = pg_connect("dbname=bus user=postgres password=snmc");
 if (!$conn) {
   echo "An error occured.\n";
   exit;
 }
-$xml = simplexml_load_file("04-locatebetweenpoints.osm");
-
-/* Access the <rating> nodes of the first movie.
- * Output the rating scale, too. */
-foreach ($xml->node as $node) {
-	$geoPo = geopoEncode((float)$node['lat'],(float)$node['lon']);
-	$node['lat'] = (int) ((float)$node['lat']*10000000);
-	$node['lon'] = (int) ((float)$node['lon']*10000000);
-	echo($node['lat'].",".$node['lon']."=$geoPo<br>");
-   $sql = "INSERT INTO stops (geohash, lat, lng) VALUES('$geoPo','{$node['lat']}','{$node['lon']}')";
+print_r($_REQUEST);
+$reverse=$_REQUEST["reverse"];
+$from=$_REQUEST["from"];
+$to=$_REQUEST["to"];
+$routes=$_REQUEST["routes"] ;
+$points=$_REQUEST["between_points"];
+   $sql = "INSERT INTO between_stops (fromLocation, toLocation, points, routes) VALUES('$from','$to','$points','$routes')";
      $result = pg_query($conn, $sql);
      if (!$result) {
          echo("Error in SQL query: " . pg_last_error() ."<br>\n");
      }
+     if ($reverse === "on") {
+	$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();
     
-}
 ?>
 

--- a/busui/common.inc.php
+++ b/busui/common.inc.php
@@ -1,6 +1,7 @@
 <?php
 date_default_timezone_set('Australia/ACT');
 $APIurl = "http://localhost:8765";
+error_reporting(E_ALL ^ E_NOTICE);
 
 function isDebug()
 {

--- a/maxious-canberra-transit-feed/02-tidytimepoints.rb
+++ b/maxious-canberra-transit-feed/02-tidytimepoints.rb
@@ -38,7 +38,7 @@
 			  "Lathlain St Station - Platform 5" => "Lathlain St Bus Station - Platform 5",
 			  "Lathlain St Station - Platform 6" => "Lathlain St Bus Station - Platform 6",
 			  "Flemington Rd, Sandford St" => "Flemington Rd/Sandford St",
-			  "Erindale Centre / - Sternberg Crescent" => "Erindale Drive/Sternberg",
+			  "Erindale Centre /Sternberg Crescent" => "Erindale Drive/Sternberg",
 			  "Canberra Hospita" => "Canberra Hospital",
 			  "Cohen Str Station - Platform 1" => "Cohen St Bus Station - Platform 1",
 			  "Cohen Street Station" => "Cohen St Bus Station",

--- a/maxious-canberra-transit-feed/04-generateymlinclude.rb
+++ b/maxious-canberra-transit-feed/04-generateymlinclude.rb
@@ -1,10 +1,10 @@
 #!/usr/bin/ruby
-require 'postgres'
 
 require 'highline.rb'
 include HighLine
 
 require 'rubygems'
+require 'postgres'
 require 'json'
 require 'yaml'
 require 'pp'
@@ -19,7 +19,7 @@
 	f2.puts header
 	f2.puts "stops:\n";
 	begin
-		time_points = connbus.exec("SELECT * from timing_point")
+		time_points = connbus.exec("SELECT * from timing_point ORDER BY name")
 	rescue PGError => e
 		puts "Error reading from DB #{e}"
 		#conn.close() if conn
@@ -30,7 +30,22 @@
 
 		# 1 = lat*100000
 		# 2 = lng*100000
+		#pp time_point[0]
 		f2.puts "  - { name: #{time_point[0]},stop_code: #{time_point[0]}, lat: #{Float(time_point[1])/10000000}, lng: #{Float(time_point[2])/10000000}}"
+	end
+	begin
+		stops = connbus.exec("SELECT * from stops")
+	rescue PGError => e
+		puts "Error reading from DB #{e}"
+		#conn.close() if conn
+	end
+	stops.each do |stop|
+		#pp stop
+		# 0 = geoPo
+		# 1 = lat*100000
+		# 2 = lng*100000
+		#pp time_point[0]
+		f2.puts "  - { name: #{stop[0]},stop_code: #{stop[0]}, lat: #{Float(stop[1])/10000000}, lng: #{Float(stop[2])/10000000}}"
 	end
 	f2.puts "routes:\n";
 end

--- /dev/null
+++ b/maxious-canberra-transit-feed/05-addbetweenpointstotimetables.rb
@@ -1,1 +1,50 @@
+require 'rubygems'
+require 'postgres'
+require 'pp'
+require 'yaml'
+class String
+  def escape_single_quotes
+    self.gsub(/'/, "''")
+  end
+end
+class Array
+  def to_yaml_style
+    :inline
+  end
+end
+Dir.chdir("output")
 
+connbus = PGconn.connect("localhost", 5432, '', '', "bus", "postgres", "snmc")
+
+Dir.glob("*.yml") { |file|
+  timetable = YAML::load_file(file)
+  if timetable
+    route_name = timetable["short_name"]
+    timetable["between_stops"] = {}
+    for i in 0..timetable["time_points"].length-2
+	begin
+	  searchFrom = timetable["time_points"][i].escape_single_quotes.split("-")[0].strip
+	  searchTo = timetable["time_points"][i+1].escape_single_quotes.split("-")[0].strip
+	  
+	  between_points = connbus.exec("SELECT * from between_stops
+		  WHERE fromlocation = '#{searchFrom}'
+	  AND tolocation = '#{searchTo}' AND routes LIKE '%#{route_name};%'")
+	rescue PGError => e
+		puts "Error selecting matching between points from DB #{e}"
+		#conn.close() if conn
+	end
+	between_points.each do |between_point_row|
+	  timetable["between_stops"][timetable["time_points"][i] + '-' +timetable["time_points"][i+1]] \
+	      = between_point_row['points'].split(";");
+	end
+    end
+    #pp timetable["between_stops"]
+    File.open(file, "w") do |f|
+      f.write timetable.to_yaml
+    end
+  
+  else
+    print "error, #{file} empty\n"
+  end
+}
+

--- a/maxious-canberra-transit-feed/05-generateymlinclude.rb
+++ /dev/null
@@ -1,53 +1,1 @@
-#!/usr/bin/ruby
-require 'postgres'
 
-require 'highline.rb'
-include HighLine
-
-require 'rubygems'
-require 'json'
-require 'yaml'
-require 'pp'
-# make - { name: Civic Interchange Platform 1,stop_code: civic_platform_1, lat: -35.2794347, lng: 149.130588}
-connbus = PGconn.connect("localhost", 5432, '', '', "bus", "postgres", "snmc")
-
-f = File.open('cbrtable.yml.in.in')
-header = f.readlines
-f.close
-
-File.open('cbrtable.yml.in', 'w') do |f2|  
-	f2.puts header
-	f2.puts "stops:\n";
-	begin
-		time_points = connbus.exec("SELECT * from timing_point ORDER BY name")
-	rescue PGError => e
-		puts "Error reading from DB #{e}"
-		#conn.close() if conn
-	end
-	time_points.each do |time_point|
-		#pp time_point
-		# 0 = name
-
-		# 1 = lat*100000
-		# 2 = lng*100000
-		#pp time_point[0]
-		f2.puts "  - { name: #{time_point[0]},stop_code: #{time_point[0]}, lat: #{Float(time_point[1])/10000000}, lng: #{Float(time_point[2])/10000000}}"
-	end
-	begin
-		stops = connbus.exec("SELECT * from stops")
-	rescue PGError => e
-		puts "Error reading from DB #{e}"
-		#conn.close() if conn
-	end
-	stops.each do |stop|
-		#pp stop
-		# 0 = geoPo
-		# 1 = lat*100000
-		# 2 = lng*100000
-		#pp time_point[0]
-		f2.puts "  - { name: #{stop[0]},stop_code: #{stop[0]}, lat: #{Float(stop[1])/10000000}, lng: #{Float(stop[2])/10000000}}"
-	end
-	f2.puts "routes:\n";
-end
-
-

--- a/maxious-canberra-transit-feed/900-intertown.yml
+++ b/maxious-canberra-transit-feed/900-intertown.yml
@@ -1,7 +1,9 @@
 short_name: 900
 long_name: Intertown
 time_points: [ civic_platform_6, 3042, 4531, 4929, civic_platform_1, civic_platform_5 ]
-between_stops: [ ]
+between_stops: [
+civic_platform_6-3042: [ADFA]
+]
 stop_times: [
   [ 632a, 642a, 657a, 708a, 715a, 727a],
   [ 702a, 712a, 727a, 738a, 745a, 757a],

--- a/maxious-canberra-transit-feed/Makefile
+++ b/maxious-canberra-transit-feed/Makefile
@@ -1,19 +1,21 @@
 default: cbrfeed.zip
 
 cbrfeed.zip: cbrtable.yml createfeed.py
+	sh 06-cleanupyaml.sh
 	./createfeed.py --input=cbrtable.yml --output=cbrfeed.zip
 
 cbrtable.yml: cbrtable.yml.in indent-route.pl
 	cp cbrtable.yml.in cbrtable.yml
 	@$(foreach ROUTE_FILE, $(wildcard output/*),  \
 		echo "Parsing $(ROUTE_FILE)"; \
-		echo "TODO: replace friendly timing spot names with OSM node IDs or geohash in $(ROUTE_FILE)"; \
-		echo "TODO: add inbetween stops in $(ROUTE_FILE)"; \
-	./indent-route.pl < $(ROUTE_FILE) >> cbrtable.yml;)
+		./indent-route.pl < "$(ROUTE_FILE)" >> cbrtable.yml;)
 
 cbrtable.yml.in: cbrtable.yml.in.in
-	ruby 04-generateymlinclude.rb	
+	ruby 01-extracttimes.rb	
+	ruby 02-tidytimepoints.rb 
+	ruby 04-generateymlinclude.rb 
+	ruby 05-addbetweenpointstotimetables.rb 
 
 clean:
-	rm -f cbrtable.yml cbrtable.yml.in cbrfeed.zip *~
+	rm -f cbrtable.yml cbrtable.yml.in cbrfeed.zip *~ output/*
 

--- a/maxious-canberra-transit-feed/README
+++ b/maxious-canberra-transit-feed/README
@@ -1,10 +1,9 @@
 === Introduction === 
 
 This distribution contains everything required to build a basic google transit 
-feed for Halifax Metro Transit, Nova Scotia, Canada. Note that it is woefully 
-incomplete at the moment. 
+feed for Canberra, Australia. Note that it is woefully incomplete at the moment. 
 
-Requirements: GNU Make, Perl, Python 2.5.
+Requirements: GNU Make, Perl, Python 2.5, PHP, Ruby, libpq (postgres-devel package on Fedora), postgres,json gem for Ruby, libyaml and pyyaml for Python
 
 === Usage ===
 
@@ -21,7 +20,7 @@
 Then just type "make" to build the feed. The output at the end is "feed.zip".
 For fun, you can view this feed using the snazzy transit feed view application:
 
-$HOME/src/transitfeed-1.1.7/python/schedule_viewer.py --feed=hfxfeed.zip
+$HOME/src/transitfeed-1.1.7/python/schedule_viewer.py --feed=cbrfeed.zip
 
 === Copyright ===
 
@@ -29,7 +28,7 @@
 License, please consider all software tools in distribution to be in the public 
 domain. Use them for what you will.
 
-I believe the Metro Transit route data is considered factual information
-which can not be copyrighted. Note, however, that Metro Transit and/or
-the city of Halifax may have claim over its own name and other trademarks.
+I believe the ACTION busses route data is considered factual information
+which can not be copyrighted. Note, however, that ACTION busses and/or
+the ACT Government may have claim over its own name and other trademarks.
 

--- a/maxious-canberra-transit-feed/add-between-times.pl
+++ /dev/null
@@ -1,104 +1,1 @@
-#!/usr/bin/perl
 
-use strict;
-
-sub parse_time {
-    my ($time) = @_;
-
-    my ($hour, $minute);
-
-    if ($time =~ /a\Z/) {
-	$time =~ m/([0-9]+)([0-9][0-9])a/;
-	($hour, $minute) = ($1, $2);
-    } elsif ($time =~ /p\Z/) {
-	$time =~ m/([0-9]+)([0-9][0-9])p/;
-	($hour, $minute) = ($1, $2);
-	if ($hour < 12) {
-	    $hour += 12;
-	}
-    } elsif ($time =~ /x\Z/) {
-	$time =~ m/([0-9]+)([0-9][0-9])x/;
-	($hour, $minute) = ($1, $2);
-	if ($hour == 12) {
-	    $hour += 12;
-	} else {
-	    $hour += 24;
-	}
-    } elsif ($time =~ /^\ *-\Z/) {
-	($hour, $minute) = (0, 0);
-	# no stop at this time
-    } else {
-	print "Should not happen! Time ('$time') misformed.\n";
-	exit;
-    }
-
-    return ($hour, $minute);
-}
-
-my $num_intervals = $ARGV[0] or die "No num intervals given!";
-my $interval = $ARGV[1] or die "No interval given!";
-
-my @times;
-
-$_ = <STDIN>;
-print $_;
-
-if ($_ !~ /^\#/) {
-    my @timestrs;
-    if ($_ =~ m/\[(.*)\]/) {
-	my $inner = $1;
-	@timestrs = split (/\,/, $inner);
-
-    } else {
-	@timestrs = split /\ /;
-    }
-
-    foreach (@timestrs) {
-	my ($hour, $minute) = parse_time($_);
-	push @times, [ $hour, $minute ];
-    }
-}
-
-for (my $i=1; $i<($num_intervals+1); $i++) {
-    my $first = 1;
-    foreach (@times) {
-	my $mytime = $_;
-	my ($hour, $minute) = (@$mytime[0], @$mytime[1]);
-	if ($hour > 0 || $minute > 0) {
-	    $minute += $interval * $i;
-	    if ($minute > 59) {
-		$hour += int($minute / 60);
-		$minute = $minute % 60;
-		if ($minute < 10) {
-		    $minute = "0" . $minute;
-		}
-	    }
-	}
-	
-	sub print_time {
-	    my ($hour, $minute) = @_;
-	    if ($hour == 0 && $minute == 0) {
-		print "-";
-	    } else {
-		if ($hour < 12) {
-		    print "$hour$minute" . "a";
-		} else {
-		    if ($hour > 12) {
-			$hour -= 12;
-		    }
-		    print "$hour$minute" . "p";
-		}
-	    }
-	}
-
-	if (!$first) {
-	    print " ";
-	    print_time($hour, $minute);
-	} else {
-	    $first = 0;
-	    print_time($hour, $minute);
-	}
-    }
-print "\n";
-}
-

--- a/maxious-canberra-transit-feed/cbrtable.yml
+++ b/maxious-canberra-transit-feed/cbrtable.yml
@@ -238,20777 +238,3401 @@
   - { name: Woden Interchange - Platform 9,stop_code: Woden Interchange - Platform 9, lat: -35.3442083, lng: 149.0877771}
   - { name: Woodcock/Clare Dennis,stop_code: Woodcock/Clare Dennis, lat: -35.4422566, lng: 149.0854375}
   - { name: Yarralumla Shops,stop_code: Yarralumla Shops, lat: -35.30725, lng: 149.0972}
+  - { name: Wjz2mTK,stop_code: Wjz2mTK, lat: -35.3815863, lng: 149.0936139}
+  - { name: Wjz6kCT,stop_code: Wjz6kCT, lat: -35.217402, lng: 149.0910262}
+  - { name: Wjz6keB,stop_code: Wjz6keB, lat: -35.2175697, lng: 149.0866478}
+  - { name: Wjr-TRM,stop_code: Wjr-TRM, lat: -35.2021703, lng: 149.0498418}
+  - { name: Wjr_MMi,stop_code: Wjr_MMi, lat: -35.200018, lng: 149.0491234}
+  - { name: Wjr_Mxy,stop_code: Wjr_Mxy, lat: -35.1992913, lng: 149.0468658}
+  - { name: Wjr-IeY,stop_code: Wjr-IeY, lat: -35.2176259, lng: 149.032238}
+  - { name: Wjr-J8t,stop_code: Wjr-J8t, lat: -35.2161747, lng: 149.0315719}
+  - { name: Wjr-InZ,stop_code: Wjr-InZ, lat: -35.2169003, lng: 149.0335258}
+  - { name: Wjr-Jm9,stop_code: Wjr-Jm9, lat: -35.2124379, lng: 149.0325045}
+  - { name: Wjr-J44,stop_code: Wjr-J44, lat: -35.2135626, lng: 149.0296181}
+  - { name: Wjr-BB3,stop_code: Wjr-BB3, lat: -35.2129096, lng: 149.0241561}
+  - { name: Wjr-Alc,stop_code: Wjr-Alc, lat: -35.2183514, lng: 149.021625}
+  - { name: Wjr-AY4,stop_code: Wjr-AY4, lat: -35.2190044, lng: 149.0282415}
+  - { name: Wjr-I4P,stop_code: Wjr-I4P, lat: -35.2191133, lng: 149.0306838}
+  - { name: Wjr-IcO,stop_code: Wjr-IcO, lat: -35.2191858, lng: 149.0319716}
+  - { name: Wjr-IqS,stop_code: Wjr-IqS, lat: -35.2202741, lng: 149.034858}
+  - { name: Wjr-IGJ,stop_code: Wjr-IGJ, lat: -35.2203467, lng: 149.0373003}
+  - { name: Wjr-IMR,stop_code: Wjr-IMR, lat: -35.2216889, lng: 149.0389433}
+  - { name: Wjr-H-a,stop_code: Wjr-H-a, lat: -35.2232851, lng: 149.039343}
+  - { name: Wjr-Q4G,stop_code: Wjr-Q4G, lat: -35.2192221, lng: 149.0415189}
+  - { name: Wjz6zth,stop_code: Wjz6zth, lat: -35.2241129, lng: 149.1109391}
+  - { name: Wjz6zon,stop_code: Wjz6zon, lat: -35.2269858, lng: 149.1109391}
+  - { name: Wjz6ytu,stop_code: Wjz6ytu, lat: -35.2291622, lng: 149.1110812}
+  - { name: Wjz6yir,stop_code: Wjz6yir, lat: -35.2314837, lng: 149.1098378}
+  - { name: Wjz5mpm,stop_code: Wjz5mpm, lat: -35.2538531, lng: 149.0889493}
+  - { name: Wjz5mxf,stop_code: Wjz5mxf, lat: -35.2538241, lng: 149.0902637}
+  - { name: Wjzd0oD,stop_code: Wjzd0oD, lat: -35.2874406, lng: 149.1552177}
+  - { name: Wjr-MNh,stop_code: Wjr-MNh, lat: -35.2433401, lng: 149.0492618}
+  - { name: Wjr-Mqd,stop_code: Wjr-Mqd, lat: -35.2422956, lng: 149.0448568}
+  - { name: Wjr-N9a,stop_code: Wjr-N9a, lat: -35.2377693, lng: 149.0421213}
+  - { name: Wjr-EYe,stop_code: Wjr-EYe, lat: -35.2408449, lng: 149.0394925}
+  - { name: Wjr-EA_,stop_code: Wjr-EA_, lat: -35.2407288, lng: 149.0362953}
+  - { name: Wjr-EuB,stop_code: Wjr-EuB, lat: -35.2395683, lng: 149.034448}
+  - { name: Wjr-Fw4,stop_code: Wjr-Fw4, lat: -35.2382916, lng: 149.035194}
+  - { name: Wjr-VdI,stop_code: Wjr-VdI, lat: -35.2348097, lng: 149.0539156}
+  - { name: Wjr-Vnf,stop_code: Wjr-Vnf, lat: -35.2331848, lng: 149.054555}
+  - { name: Wjr-Ws2,stop_code: Wjr-Ws2, lat: -35.230167, lng: 149.0557628}
+  - { name: Wjr-PWf,stop_code: Wjr-PWf, lat: -35.225611, lng: 149.0504341}
+  - { name: Wjr-PyX,stop_code: Wjr-PyX, lat: -35.2259882, lng: 149.0472724}
+  - { name: WjrZKZn,stop_code: WjrZKZn, lat: -35.2510294, lng: 149.0396391}
+  - { name: WjrZKnY,stop_code: WjrZKnY, lat: -35.2498968, lng: 149.0336595}
+  - { name: Wjz4S1U,stop_code: Wjz4S1U, lat: -35.2983385, lng: 149.1296979}
+  - { name: Wjz4RbQ,stop_code: Wjz4RbQ, lat: -35.3021238, lng: 149.1308574}
+  - { name: Wjz4IrL,stop_code: Wjz4IrL, lat: -35.307326, lng: 149.1225503}
+  - { name: Wjz4INj,stop_code: Wjz4INj, lat: -35.3091118, lng: 149.1261312}
+  - { name: Wjz3fO2,stop_code: Wjz3fO2, lat: -35.3359729, lng: 149.0817737}
+  - { name: Wjz3fCx,stop_code: Wjz3fCx, lat: -35.333256, lng: 149.0798309}
+  - { name: Wjz4peM,stop_code: Wjz4peM, lat: -35.322342, lng: 149.0979263}
+  - { name: Wjz4qgy,stop_code: Wjz4qgy, lat: -35.3208475, lng: 149.098981}
+  - { name: Wjz4qTw,stop_code: Wjz4qTw, lat: -35.3162151, lng: 149.1045086}
+  - { name: Wjz4qtY,stop_code: Wjz4qtY, lat: -35.3172423, lng: 149.100878}
+  - { name: Wjz4qs0,stop_code: Wjz4qs0, lat: -35.3182278, lng: 149.09964}
+  - { name: Wjz4y7z,stop_code: Wjz4y7z, lat: -35.3159129, lng: 149.1072689}
+  - { name: Wjz4yng,stop_code: Wjz4yng, lat: -35.316172, lng: 149.1095953}
+  - { name: Wjz4yzk,stop_code: Wjz4yzk, lat: -35.3186155, lng: 149.1123352}
+  - { name: Wjz4yGG,stop_code: Wjz4yGG, lat: -35.3194308, lng: 149.1142224}
+  - { name: Wjz4yQ-,stop_code: Wjz4yQ-, lat: -35.3177825, lng: 149.1159796}
+  - { name: Wjz4H0P,stop_code: Wjz4H0P, lat: -35.3152936, lng: 149.1185178}
+  - { name: Wjz4Hbx,stop_code: Wjz4Hbx, lat: -35.3133913, lng: 149.1195724}
+  - { name: Wjz4A7o,stop_code: Wjz4A7o, lat: -35.3052441, lng: 149.107042}
+  - { name: Wjz4z67,stop_code: Wjz4z67, lat: -35.3107704, lng: 149.1065979}
+  - { name: Wjz4A2c,stop_code: Wjz4A2c, lat: -35.3082791, lng: 149.1066534}
+  - { name: Wjz4tUp,stop_code: Wjz4tUp, lat: -35.3044055, lng: 149.1056974}
+  - { name: Wjz4tpE,stop_code: Wjz4tpE, lat: -35.3038329, lng: 149.1005569}
+  - { name: Wjz1HTi,stop_code: Wjz1HTi, lat: -35.4423392, lng: 149.1260397}
+  - { name: Wjz1HOf,stop_code: Wjz1HOf, lat: -35.4453654, lng: 149.1258946}
+  - { name: Wjz1HEb,stop_code: Wjz1HEb, lat: -35.4471149, lng: 149.1245306}
+  - { name: Wjz1GsO,stop_code: Wjz1GsO, lat: -35.4499519, lng: 149.1226442}
+  - { name: Wjz1Gjj,stop_code: Wjz1Gjj, lat: -35.4504956, lng: 149.1205257}
+  - { name: Wjz1rQ6,stop_code: Wjz1rQ6, lat: -35.4440887, lng: 149.1038388}
+  - { name: Wjz1zWz,stop_code: Wjz1zWz, lat: -35.4457437, lng: 149.1168111}
+  - { name: Wjz1zN3,stop_code: Wjz1zN3, lat: -35.4464057, lng: 149.1147796}
+  - { name: Wjz1ySn,stop_code: Wjz1ySn, lat: -35.4481315, lng: 149.1151569}
+  - { name: Wjz1G32,stop_code: Wjz1G32, lat: -35.4506139, lng: 149.1174495}
+  - { name: Wjz1xRC,stop_code: Wjz1xRC, lat: -35.4544199, lng: 149.1154761}
+  - { name: Wjz1xWZ,stop_code: Wjz1xWZ, lat: -35.4565002, lng: 149.1174205}
+  - { name: Wjz1F5W,stop_code: Wjz1F5W, lat: -35.4547272, lng: 149.1186974}
+  - { name: Wjz1G89,stop_code: Wjz1G89, lat: -35.4527651, lng: 149.1190457}
+  - { name: Wjz1CdY,stop_code: Wjz1CdY, lat: -35.4270927, lng: 149.1090734}
+  - { name: Wjz1CD8,stop_code: Wjz1CD8, lat: -35.4260286, lng: 149.1122294}
+  - { name: Wjz1CRl,stop_code: Wjz1CRl, lat: -35.4269745, lng: 149.1151677}
+  - { name: Wjz1K49,stop_code: Wjz1K49, lat: -35.428009, lng: 149.1176708}
+  - { name: Wjz1J4T,stop_code: Wjz1J4T, lat: -35.4330044, lng: 149.1185777}
+  - { name: Wjz1K89,stop_code: Wjz1K89, lat: -35.4308171, lng: 149.1191218}
+  - { name: Wjz1Kiu,stop_code: Wjz1Kiu, lat: -35.4289549, lng: 149.1207905}
+  - { name: Wjz1JD7,stop_code: Wjz1JD7, lat: -35.4309354, lng: 149.1230759}
+  - { name: Wjz1JTP,stop_code: Wjz1JTP, lat: -35.4312901, lng: 149.126776}
+  - { name: Wjz1S2v,stop_code: Wjz1S2v, lat: -35.4289254, lng: 149.1290251}
+  - { name: Wjz1S5I,stop_code: Wjz1S5I, lat: -35.4271223, lng: 149.1292791}
+  - { name: Wjz1SfM,stop_code: Wjz1SfM, lat: -35.4260286, lng: 149.1309478}
+  - { name: Wjz1TgM,stop_code: Wjz1TgM, lat: -35.4253782, lng: 149.1323625}
+  - { name: Wjz1TLL,stop_code: Wjz1TLL, lat: -35.4199685, lng: 149.1361715}
+  - { name: Wjz1LBV,stop_code: Wjz1LBV, lat: -35.4218605, lng: 149.1241279}
+  - { name: Wjz1Lxu,stop_code: Wjz1Lxu, lat: -35.4241367, lng: 149.1234749}
+  - { name: Wjz1Liw,stop_code: Wjz1Liw, lat: -35.4239889, lng: 149.1208993}
+  - { name: Wjz1DWq,stop_code: Wjz1DWq, lat: -35.4238411, lng: 149.1166188}
+  - { name: Wjz1DLm,stop_code: Wjz1DLm, lat: -35.4200572, lng: 149.1136804}
+  - { name: Wjz2wGU,stop_code: Wjz2wGU, lat: -35.4184904, lng: 149.1145873}
+  - { name: Wjz2wY-,stop_code: Wjz2wY-, lat: -35.4166279, lng: 149.1173443}
+  - { name: Wjz2EdX,stop_code: Wjz2EdX, lat: -35.416214, lng: 149.120065}
+  - { name: Wjz2EL2,stop_code: Wjz2EL2, lat: -35.4149132, lng: 149.1244544}
+  - { name: Wjz2EXs,stop_code: Wjz2EXs, lat: -35.4174557, lng: 149.1275741}
+  - { name: Wjz2M5R,stop_code: Wjz2M5R, lat: -35.4160071, lng: 149.129533}
+  - { name: Wjz2MYC,stop_code: Wjz2MYC, lat: -35.4166279, lng: 149.1388559}
+  - { name: Wjz2V0k,stop_code: Wjz2V0k, lat: -35.4140263, lng: 149.1397991}
+  - { name: Wjz2NPZ,stop_code: Wjz2NPZ, lat: -35.4118681, lng: 149.1378765}
+  - { name: Wjz2NH0,stop_code: Wjz2NH0, lat: -35.4123115, lng: 149.1353734}
+  - { name: Wjz2Npv,stop_code: Wjz2Npv, lat: -35.4131394, lng: 149.1331606}
+  - { name: WjrXZz3,stop_code: WjrXZz3, lat: -35.3461161, lng: 149.0570563}
+  - { name: WjrXZiM,stop_code: WjrXZiM, lat: -35.3470777, lng: 149.0553331}
+  - { name: WjrXRW0,stop_code: WjrXRW0, lat: -35.3471147, lng: 149.0502999}
+  - { name: Wjz3nLq,stop_code: Wjz3nLq, lat: -35.3325054, lng: 149.0919265}
+  - { name: Wjz4shf,stop_code: Wjz4shf, lat: -35.3086912, lng: 149.0984092}
+  - { name: Wjz4rk2,stop_code: Wjz4rk2, lat: -35.3126013, lng: 149.0982349}
+  - { name: Wjz4hPC,stop_code: Wjz4hPC, lat: -35.323921, lng: 149.0935136}
+  - { name: Wjz4gou,stop_code: Wjz4gou, lat: -35.3314972, lng: 149.0892541}
+  - { name: Wjz4hMe,stop_code: Wjz4hMe, lat: -35.3259558, lng: 149.0929241}
+  - { name: Wjz4gt5,stop_code: Wjz4gt5, lat: -35.3281248, lng: 149.0887511}
+  - { name: Wjz4h1X,stop_code: Wjz4h1X, lat: -35.3255489, lng: 149.0857143}
+  - { name: Wjz48Q1,stop_code: Wjz48Q1, lat: -35.3291744, lng: 149.0818599}
+  - { name: Wjz49Ui,stop_code: Wjz49Ui, lat: -35.3262888, lng: 149.0835377}
+  - { name: Wjz49Wd,stop_code: Wjz49Wd, lat: -35.324698, lng: 149.0833563}
+  - { name: Wjz49Y5,stop_code: Wjz49Y5, lat: -35.3233291, lng: 149.0831296}
+  - { name: Wjz4aMo,stop_code: Wjz4aMo, lat: -35.3209613, lng: 149.082268}
+  - { name: Wjz4aH6,stop_code: Wjz4aH6, lat: -35.3184453, lng: 149.0804542}
+  - { name: Wjz4arc,stop_code: Wjz4arc, lat: -35.3185933, lng: 149.0779149}
+  - { name: Wjz4a9o,stop_code: Wjz4a9o, lat: -35.3203323, lng: 149.0754663}
+  - { name: Wjz49dp,stop_code: Wjz49dp, lat: -35.3229961, lng: 149.075421}
+  - { name: Wjz499S,stop_code: Wjz499S, lat: -35.3252899, lng: 149.0759651}
+  - { name: Wjz48dZ,stop_code: Wjz48dZ, lat: -35.3281016, lng: 149.0761465}
+  - { name: Wjz48qI,stop_code: Wjz48qI, lat: -35.3302472, lng: 149.0785498}
+  - { name: WjrYUj0,stop_code: WjrYUj0, lat: -35.3299526, lng: 149.0543559}
+  - { name: WjrYUG8,stop_code: WjrYUG8, lat: -35.3306155, lng: 149.058622}
+  - { name: WjrX_SL,stop_code: WjrX_SL, lat: -35.3327937, lng: 149.0607695}
+  - { name: Wjz37Lm,stop_code: Wjz37Lm, lat: -35.3321544, lng: 149.0697369}
+  - { name: Wjz3d3K,stop_code: Wjz3d3K, lat: -35.3459087, lng: 149.0743512}
+  - { name: Wjz3e8l,stop_code: Wjz3e8l, lat: -35.3425473, lng: 149.0752509}
+  - { name: Wjz3ee-,stop_code: Wjz3ee-, lat: -35.3383098, lng: 149.0761505}
+  - { name: Wjz37Zc,stop_code: Wjz37Zc, lat: -35.3337407, lng: 149.0723488}
+  - { name: Wjz3fa8,stop_code: Wjz3fa8, lat: -35.3360845, lng: 149.0750477}
+  - { name: WjrX-Lw,stop_code: WjrX-Lw, lat: -35.3381915, lng: 149.0592024}
+  - { name: WjrX_xY,stop_code: WjrX_xY, lat: -35.3364869, lng: 149.0583028}
+  - { name: WjrX_bF,stop_code: WjrX_bF, lat: -35.3353506, lng: 149.0538045}
+  - { name: WjrX_iU,stop_code: WjrX_iU, lat: -35.3361318, lng: 149.0556038}
+  - { name: WjrX-m2,stop_code: WjrX-m2, lat: -35.3386886, lng: 149.0543559}
+  - { name: WjrX-oT,stop_code: WjrX-oT, lat: -35.3424053, lng: 149.0567937}
+  - { name: WjrX-sE,stop_code: WjrX-sE, lat: -35.3402511, lng: 149.0565615}
+  - { name: WjrX-zT,stop_code: WjrX-zT, lat: -35.3402984, lng: 149.0581286}
+  - { name: Wjz354b,stop_code: Wjz354b, lat: -35.345459, lng: 149.062772}
+  - { name: Wjz1edz,stop_code: Wjz1edz, lat: -35.4271482, lng: 149.0757082}
+  - { name: Wjz1et6,stop_code: Wjz1et6, lat: -35.4269117, lng: 149.0777759}
+  - { name: Wjz1nxQ,stop_code: Wjz1nxQ, lat: -35.4243695, lng: 149.0911255}
+  - { name: Wjz1nzY,stop_code: Wjz1nzY, lat: -35.4229506, lng: 149.0912343}
+  - { name: Wjz1f8Y,stop_code: Wjz1f8Y, lat: -35.4250198, lng: 149.076216}
+  - { name: Wjz1f2H,stop_code: Wjz1f2H, lat: -35.4237487, lng: 149.0744748}
+  - { name: Wjz20Eo,stop_code: Wjz20Eo, lat: -35.4198466, lng: 149.0699766}
+  - { name: Wjz1f7q,stop_code: Wjz1f7q, lat: -35.4203787, lng: 149.0740032}
+  - { name: Wjz20Vv,stop_code: Wjz20Vv, lat: -35.4185754, lng: 149.072661}
+  - { name: Wjz2bHS,stop_code: Wjz2bHS, lat: -35.400824, lng: 149.0814035}
+  - { name: Wjz2aLs,stop_code: Wjz2aLs, lat: -35.4037395, lng: 149.081019}
+  - { name: Wjz2b8J,stop_code: Wjz2b8J, lat: -35.4029944, lng: 149.0757807}
+  - { name: Wjz2a26,stop_code: Wjz2a26, lat: -35.4069683, lng: 149.0736259}
+  - { name: Wjz29Ya,stop_code: Wjz29Ya, lat: -35.4114741, lng: 149.0833189}
+  - { name: Wjz29-5,stop_code: Wjz29-5, lat: -35.4098244, lng: 149.083123}
+  - { name: Wjz2i3o,stop_code: Wjz2i3o, lat: -35.4068322, lng: 149.0850166}
+  - { name: Wjz2aVu,stop_code: Wjz2aVu, lat: -35.4076897, lng: 149.0836236}
+  - { name: Wjz2aGG,stop_code: Wjz2aGG, lat: -35.4073408, lng: 149.0812511}
+  - { name: Wjz2azE,stop_code: Wjz2azE, lat: -35.4068027, lng: 149.0799162}
+  - { name: Wjz2arg,stop_code: Wjz2arg, lat: -35.4068086, lng: 149.0779936}
+  - { name: Wjz2aaw,stop_code: Wjz2aaw, lat: -35.4075241, lng: 149.0756429}
+  - { name: Wjz29ea,stop_code: Wjz29ea, lat: -35.4101319, lng: 149.0751278}
+  - { name: Wjz29yh,stop_code: Wjz29yh, lat: -35.4129642, lng: 149.0794301}
+  - { name: Wjz28DH,stop_code: Wjz28DH, lat: -35.4148504, lng: 149.0799887}
+  - { name: Wjz28Yv,stop_code: Wjz28Yv, lat: -35.4165651, lng: 149.0836163}
+  - { name: Wjz2g6U,stop_code: Wjz2g6U, lat: -35.4157965, lng: 149.0857566}
+  - { name: Wjz2gvd,stop_code: Wjz2gvd, lat: -35.4146612, lng: 149.0888256}
+  - { name: Wjz2haF,stop_code: Wjz2haF, lat: -35.4129406, lng: 149.0867361}
+  - { name: Wjz2hlp,stop_code: Wjz2hlp, lat: -35.4109006, lng: 149.0878896}
+  - { name: Wjz2hBQ,stop_code: Wjz2hBQ, lat: -35.4106404, lng: 149.0911182}
+  - { name: Wjz2iEO,stop_code: Wjz2iEO, lat: -35.40876, lng: 149.0925039}
+  - { name: Wjz2iPv,stop_code: Wjz2iPv, lat: -35.4062172, lng: 149.093302}
+  - { name: Wjz2izK,stop_code: Wjz2izK, lat: -35.4062764, lng: 149.0909078}
+  - { name: Wjz34Gq,stop_code: Wjz34Gq, lat: -35.352423, lng: 149.0699271}
+  - { name: Wjz33LB,stop_code: Wjz33LB, lat: -35.3542352, lng: 149.0701992}
+  - { name: Wjz33CI,stop_code: Wjz33CI, lat: -35.3549749, lng: 149.0689295}
+  - { name: Wjz33KX,stop_code: Wjz33KX, lat: -35.3550858, lng: 149.070698}
+  - { name: Wjz33GY,stop_code: Wjz33GY, lat: -35.3577485, lng: 149.0706526}
+  - { name: Wjz33EK,stop_code: Wjz33EK, lat: -35.3589689, lng: 149.0702445}
+  - { name: WjrXXFn,stop_code: WjrXXFn, lat: -35.3581997, lng: 149.0587995}
+  - { name: WjrXXMe,stop_code: WjrXXMe, lat: -35.3589023, lng: 149.0599784}
+  - { name: WjrXWQ8,stop_code: WjrXWQ8, lat: -35.3621767, lng: 149.0600261}
+  - { name: WjrXWsn,stop_code: WjrXWsn, lat: -35.3616093, lng: 149.055979}
+  - { name: WjrXW7A,stop_code: WjrXW7A, lat: -35.3597972, lng: 149.0523061}
+  - { name: WjrXGDF,stop_code: WjrXGDF, lat: -35.3600413, lng: 149.0360091}
+  - { name: WjrXXb4,stop_code: WjrXXb4, lat: -35.3570754, lng: 149.0530316}
+  - { name: WjrX-FV,stop_code: WjrX-FV, lat: -35.3422149, lng: 149.0596338}
+  - { name: Wjz356k,stop_code: Wjz356k, lat: -35.3440169, lng: 149.0629513}
+  - { name: Wjz35av,stop_code: Wjz35av, lat: -35.3464684, lng: 149.064395}
+  - { name: Wjz358l,stop_code: Wjz358l, lat: -35.3480588, lng: 149.0643043}
+  - { name: Wjz34c4,stop_code: Wjz34c4, lat: -35.3508697, lng: 149.0639869}
+  - { name: Wjz348u,stop_code: Wjz348u, lat: -35.3534586, lng: 149.0644857}
+  - { name: Wjz33nk,stop_code: Wjz33nk, lat: -35.3543462, lng: 149.0657554}
+  - { name: Wjz337w,stop_code: Wjz337w, lat: -35.354642, lng: 149.0633068}
+  - { name: WjrXXK9,stop_code: WjrXXK9, lat: -35.355219, lng: 149.0585637}
+  - { name: WjrXXI2,stop_code: WjrXXI2, lat: -35.3565059, lng: 149.058473}
+  - { name: WjrXXyQ,stop_code: WjrXXyQ, lat: -35.3576967, lng: 149.0580467}
+  - { name: WjrXXq3,stop_code: WjrXXq3, lat: -35.3578077, lng: 149.0557251}
+  - { name: WjrXXd0,stop_code: WjrXXd0, lat: -35.3559956, lng: 149.0529772}
+  - { name: WjrXYL4,stop_code: WjrXYL4, lat: -35.3488355, lng: 149.0584095}
+  - { name: WjrXYtm,stop_code: WjrXYtm, lat: -35.3499821, lng: 149.0560969}
+  - { name: WjrXQZX,stop_code: WjrXQZX, lat: -35.3502779, lng: 149.0514717}
+  - { name: WjrXRks,stop_code: WjrXRks, lat: -35.3453958, lng: 149.0438991}
+  - { name: WjrXR3f,stop_code: WjrXR3f, lat: -35.3458397, lng: 149.040861}
+  - { name: WjrXIDX,stop_code: WjrXIDX, lat: -35.348916, lng: 149.0363428}
+  - { name: WjrXIKK,stop_code: WjrXIKK, lat: -35.3493279, lng: 149.0374035}
+  - { name: WjrXQ65,stop_code: WjrXQ65, lat: -35.349419, lng: 149.040696}
+  - { name: WjrXJfw,stop_code: WjrXJfw, lat: -35.3436463, lng: 149.031771}
+  - { name: WjrXKoe,stop_code: WjrXKoe, lat: -35.3424911, lng: 149.0339533}
+  - { name: WjrXLR-,stop_code: WjrXLR-, lat: -35.3335487, lng: 149.0390846}
+  - { name: WjrXLtK,stop_code: WjrXLtK, lat: -35.3335671, lng: 149.0346289}
+  - { name: WjrXLaD,stop_code: WjrXLaD, lat: -35.3355436, lng: 149.0316183}
+  - { name: WjrYEg0,stop_code: WjrYEg0, lat: -35.3320285, lng: 149.0323493}
+  - { name: WjrYEpn,stop_code: WjrYEpn, lat: -35.3306598, lng: 149.0341649}
+  - { name: WjrYEWc,stop_code: WjrYEWc, lat: -35.3302839, lng: 149.0394086}
+  - { name: WjrYMbF,stop_code: WjrYMbF, lat: -35.3298385, lng: 149.0428712}
+  - { name: WjrYMrj,stop_code: WjrYMrj, lat: -35.3296313, lng: 149.0450622}
+  - { name: WjrYMHm,stop_code: WjrYMHm, lat: -35.3294538, lng: 149.0477466}
+  - { name: WjrYMGB,stop_code: WjrYMGB, lat: -35.3301626, lng: 149.0481758}
+  - { name: WjrXTSe,stop_code: WjrXTSe, lat: -35.3328347, lng: 149.0489873}
+  - { name: WjrX_1g,stop_code: WjrX_1g, lat: -35.336799, lng: 149.0519909}
+  - { name: WjrXTIp,stop_code: WjrXTIp, lat: -35.3346742, lng: 149.0480789}
+  - { name: WjrXTqY,stop_code: WjrXTqY, lat: -35.3357893, lng: 149.0460156}
+  - { name: WjrXTgl,stop_code: WjrXTgl, lat: -35.3370298, lng: 149.0436997}
+  - { name: WjrXKBE,stop_code: WjrXKBE, lat: -35.3395611, lng: 149.0360582}
+  - { name: WjrXLY1,stop_code: WjrXLY1, lat: -35.3346674, lng: 149.0391656}
+  - { name: WjrXLEL,stop_code: WjrXLEL, lat: -35.3369076, lng: 149.0374236}
+  - { name: WjrXLgs,stop_code: WjrXLgs, lat: -35.3371612, lng: 149.0328459}
+  - { name: WjrXKfG,stop_code: WjrXKfG, lat: -35.338018, lng: 149.0318393}
+  - { name: Wjz2ve3,stop_code: Wjz2ve3, lat: -35.3770117, lng: 149.0968721}
+  - { name: Wjz3aaB,stop_code: Wjz3aaB, lat: -35.3631322, lng: 149.0756066}
+  - { name: Wjz39sA,stop_code: Wjz39sA, lat: -35.3673329, lng: 149.0783636}
+  - { name: Wjz39GV,stop_code: Wjz39GV, lat: -35.369019, lng: 149.0816284}
+  - { name: Wjz39PE,stop_code: Wjz39PE, lat: -35.3683683, lng: 149.0827167}
+  - { name: Wjz3h5c,stop_code: Wjz3h5c, lat: -35.3666525, lng: 149.0847118}
+  - { name: Wjz3hu6,stop_code: Wjz3hu6, lat: -35.3658261, lng: 149.0887408}
+  - { name: Wjz3j2F,stop_code: Wjz3j2F, lat: -35.3580142, lng: 149.0853648}
+  - { name: Wjz3it1,stop_code: Wjz3it1, lat: -35.3614164, lng: 149.0886297}
+  - { name: Wjz3iuk,stop_code: Wjz3iuk, lat: -35.3604697, lng: 149.0889561}
+  - { name: Wjzcrp_,stop_code: Wjzcrp_, lat: -35.3142011, lng: 149.1887666}
+  - { name: WjzcrK3,stop_code: WjzcrK3, lat: -35.3111478, lng: 149.190364}
+  - { name: Wjzcuop,stop_code: Wjzcuop, lat: -35.2989647, lng: 149.1881172}
+  - { name: Wjzcuw1,stop_code: Wjzcuw1, lat: -35.2989793, lng: 149.188937}
+  - { name: WjzcBHZ,stop_code: WjzcBHZ, lat: -35.3020154, lng: 149.2024041}
+  - { name: WjzcJ38,stop_code: WjzcJ38, lat: -35.3024713, lng: 149.2056109}
+  - { name: WjzcJ0K,stop_code: WjzcJ0K, lat: -35.3040486, lng: 149.2062653}
+  - { name: Wjzf3oM,stop_code: Wjzf3oM, lat: -35.1836894, lng: 149.1556666}
+  - { name: Wjz7smv,stop_code: Wjz7smv, lat: -35.1734671, lng: 149.0988597}
+  - { name: Wjr_Gxf,stop_code: Wjr_Gxf, lat: -35.1878657, lng: 149.0352296}
+  - { name: Wjr_Es4,stop_code: Wjr_Es4, lat: -35.1970405, lng: 149.0338265}
+  - { name: Wjr_xY9,stop_code: Wjr_xY9, lat: -35.1918291, lng: 149.028508}
+  - { name: Wjr_FTN,stop_code: Wjr_FTN, lat: -35.1897508, lng: 149.038952}
+  - { name: Wjr_xLL,stop_code: Wjr_xLL, lat: -35.1892698, lng: 149.0264062}
+  - { name: Wjr_Ej0,stop_code: Wjr_Ej0, lat: -35.1981116, lng: 149.0323079}
+  - { name: Wjr_xnT,stop_code: Wjr_xnT, lat: -35.1892671, lng: 149.0223682}
+  - { name: Wjr_FXR,stop_code: Wjr_FXR, lat: -35.1922038, lng: 149.0402464}
+  - { name: Wjr_GVA,stop_code: Wjr_GVA, lat: -35.188117, lng: 149.0399446}
+  - { name: Wjr_E1y,stop_code: Wjr_E1y, lat: -35.1992571, lng: 149.0303603}
+  - { name: Wjr_NDY,stop_code: Wjr_NDY, lat: -35.1895167, lng: 149.04724}
+  - { name: Wjr_N-q,stop_code: Wjr_N-q, lat: -35.1903433, lng: 149.0507803}
+  - { name: Wjr_V6V,stop_code: Wjr_V6V, lat: -35.1904467, lng: 149.0528033}
+  - { name: Wjr_Vt9,stop_code: Wjr_Vt9, lat: -35.191134, lng: 149.055871}
+  - { name: Wjr_Vbj,stop_code: Wjr_Vbj, lat: -35.1923583, lng: 149.0533723}
+  - { name: Wjr_V2c,stop_code: Wjr_V2c, lat: -35.192985, lng: 149.0517177}
+  - { name: Wjr_NFt,stop_code: Wjr_NFt, lat: -35.1935465, lng: 149.0479464}
+  - { name: Wjr_NpJ,stop_code: Wjr_NpJ, lat: -35.1935127, lng: 149.0455536}
+  - { name: Wjr_McO,stop_code: Wjr_McO, lat: -35.1972013, lng: 149.0429389}
+  - { name: Wjr_MjV,stop_code: Wjr_MjV, lat: -35.1979805, lng: 149.0445264}
+  - { name: Wjr_MhY,stop_code: Wjr_MhY, lat: -35.1991196, lng: 149.0445095}
+  - { name: Wjr-Tf_,stop_code: Wjr-Tf_, lat: -35.2002734, lng: 149.0432168}
+  - { name: Wjr-Lzm,stop_code: Wjr-Lzm, lat: -35.2030997, lng: 149.0354829}
+  - { name: Wjr-L1H,stop_code: Wjr-L1H, lat: -35.2046871, lng: 149.0304447}
+  - { name: Wjr-DNK,stop_code: Wjr-DNK, lat: -35.2044788, lng: 149.0277602}
+  - { name: Wjr-DQE,stop_code: Wjr-DQE, lat: -35.2029293, lng: 149.0277662}
+  - { name: Wjr-DTC,stop_code: Wjr-DTC, lat: -35.2002855, lng: 149.0276101}
+  - { name: Wjr_wf4,stop_code: Wjr_wf4, lat: -35.1950004, lng: 149.0199737}
+  - { name: Wjr_wm3,stop_code: Wjr_wm3, lat: -35.195762, lng: 149.0214528}
+  - { name: Wjr_wjn,stop_code: Wjr_wjn, lat: -35.1975263, lng: 149.0216638}
+  - { name: Wjr_pVW,stop_code: Wjr_pVW, lat: -35.1938099, lng: 149.0184155}
+  - { name: Wjr_o_j,stop_code: Wjr_o_j, lat: -35.1950629, lng: 149.0175978}
+  - { name: Wjr_oJA,stop_code: Wjr_oJA, lat: -35.1964177, lng: 149.0152805}
+  - { name: Wjr_oP1,stop_code: Wjr_oP1, lat: -35.1980445, lng: 149.0158736}
+  - { name: Wjr-CS2,stop_code: Wjr-CS2, lat: -35.2068071, lng: 149.0268212}
+  - { name: Wjr-vNL,stop_code: Wjr-vNL, lat: -35.2043835, lng: 149.0167621}
+  - { name: Wjr-Df8,stop_code: Wjr-Df8, lat: -35.2008175, lng: 149.0201835}
+  - { name: Wjr-vJY,stop_code: Wjr-vJY, lat: -35.2019113, lng: 149.0157184}
+  - { name: Wjr-uUL,stop_code: Wjr-uUL, lat: -35.210513, lng: 149.0180445}
+  - { name: Wjr-te3,stop_code: Wjr-te3, lat: -35.2122382, lng: 149.0090273}
+  - { name: Wjr-tbm,stop_code: Wjr-tbm, lat: -35.2140927, lng: 149.0093105}
+  - { name: Wjr-thp,stop_code: Wjr-thp, lat: -35.2158247, lng: 149.0109263}
+  - { name: Wjr-smi,stop_code: Wjr-smi, lat: -35.2178617, lng: 149.0106876}
+  - { name: Wjr-sKW,stop_code: Wjr-sKW, lat: -35.2178207, lng: 149.0156953}
+  - { name: Wjr-s_F,stop_code: Wjr-s_F, lat: -35.2172009, lng: 149.0180976}
+  - { name: Wjr-CsO,stop_code: Wjr-CsO, lat: -35.2082115, lng: 149.0237453}
+  - { name: Wjr-BL8,stop_code: Wjr-BL8, lat: -35.2118565, lng: 149.025622}
+  - { name: Wjr-KJQ,stop_code: Wjr-KJQ, lat: -35.2073355, lng: 149.037506}
+  - { name: Wjr-S6B,stop_code: Wjr-S6B, lat: -35.2066123, lng: 149.0412991}
+  - { name: Wjr-S9y,stop_code: Wjr-S9y, lat: -35.2102797, lng: 149.0426899}
+  - { name: Wjr-RnT,stop_code: Wjr-RnT, lat: -35.2112095, lng: 149.0444601}
+  - { name: Wjr-Rs8,stop_code: Wjr-Rs8, lat: -35.2139046, lng: 149.0449606}
+  - { name: Wjr-Q8c,stop_code: Wjr-Q8c, lat: -35.2217975, lng: 149.042121}
+  - { name: Wjr-Pk6,stop_code: Wjr-Pk6, lat: -35.2243699, lng: 149.0432872}
+  - { name: Wjr-AHx,stop_code: Wjr-AHx, lat: -35.2199899, lng: 149.0262529}
+  - { name: Wjr-z_L,stop_code: Wjr-z_L, lat: -35.222191, lng: 149.0291286}
+  - { name: Wjr-zOn,stop_code: Wjr-zOn, lat: -35.2256125, lng: 149.0272189}
+  - { name: Wjr-HbC,stop_code: Wjr-HbC, lat: -35.2250302, lng: 149.0316399}
+  - { name: Wjr-sV3,stop_code: Wjr-sV3, lat: -35.2212162, lng: 149.0172455}
+  - { name: Wjr-sQ8,stop_code: Wjr-sQ8, lat: -35.2193706, lng: 149.0159919}
+  - { name: Wjr-st9,stop_code: Wjr-st9, lat: -35.2186471, lng: 149.0119654}
+  - { name: Wjr-rv7,stop_code: Wjr-rv7, lat: -35.2221818, lng: 149.0117611}
+  - { name: Wjr-kVk,stop_code: Wjr-kVk, lat: -35.2210905, lng: 149.0066193}
+  - { name: Wjr-jRn,stop_code: Wjr-jRn, lat: -35.2235756, lng: 149.0053113}
+  - { name: Wjr-rjD,stop_code: Wjr-rjD, lat: -35.2249706, lng: 149.0111289}
+  - { name: Wjr-rQJ,stop_code: Wjr-rQJ, lat: -35.2244007, lng: 149.0167658}
+  - { name: Wjr-syd,stop_code: Wjr-syd, lat: -35.2203046, lng: 149.0133355}
+  - { name: Wjr-rxG,stop_code: Wjr-rxG, lat: -35.2267918, lng: 149.0140227}
+  - { name: Wjr-jNB,stop_code: Wjr-jNB, lat: -35.2265208, lng: 149.0056756}
+  - { name: Wjr-qcc,stop_code: Wjr-qcc, lat: -35.230013, lng: 149.0092125}
+  - { name: Wjr-qyr,stop_code: Wjr-qyr, lat: -35.2315106, lng: 149.0137011}
+  - { name: Wjr-qZg,stop_code: Wjr-qZg, lat: -35.2296561, lng: 149.0176617}
+  - { name: Wjr-rUs,stop_code: Wjr-rUs, lat: -35.2272548, lng: 149.0178319}
+  - { name: Wjr-rNr,stop_code: Wjr-rNr, lat: -35.226697, lng: 149.016389}
+  - { name: Wjr-zom,stop_code: Wjr-zom, lat: -35.2270626, lng: 149.0231771}
+  - { name: Wjr-zcC,stop_code: Wjr-zcC, lat: -35.2243517, lng: 149.0207165}
+  - { name: Wjr-yni,stop_code: Wjr-yni, lat: -35.2281496, lng: 149.0217011}
+  - { name: Wjr-yrh,stop_code: Wjr-yrh, lat: -35.2309899, lng: 149.0230231}
+  - { name: Wjr-ywh,stop_code: Wjr-ywh, lat: -35.2330631, lng: 149.0245222}
+  - { name: Wjr-yJZ,stop_code: Wjr-yJZ, lat: -35.2292857, lng: 149.0266955}
+  - { name: Wjr-ySy,stop_code: Wjr-ySy, lat: -35.228821, lng: 149.0276438}
+  - { name: Wjr-zWb,stop_code: Wjr-zWb, lat: -35.2259772, lng: 149.0283569}
+  - { name: Wjr-zC9,stop_code: Wjr-zC9, lat: -35.2234474, lng: 149.0242983}
+  - { name: Wjr-G5f,stop_code: Wjr-G5f, lat: -35.2290792, lng: 149.0298564}
+  - { name: Wjr-GeX,stop_code: Wjr-GeX, lat: -35.2287693, lng: 149.0321955}
+  - { name: Wjr-xLK,stop_code: Wjr-xLK, lat: -35.2332476, lng: 149.0263679}
+  - { name: Wjr-xRd,stop_code: Wjr-xRd, lat: -35.2347078, lng: 149.0270748}
+  - { name: Wjr-xxu,stop_code: Wjr-xxu, lat: -35.2373929, lng: 149.0246092}
+  - { name: Wjr-wDP,stop_code: Wjr-wDP, lat: -35.2389936, lng: 149.0252414}
+  - { name: Wjr-Ekp,stop_code: Wjr-Ekp, lat: -35.2412759, lng: 149.032879}
+  - { name: Wjr-Gsq,stop_code: Wjr-Gsq, lat: -35.2301636, lng: 149.0342818}
+  - { name: Wjr-GyJ,stop_code: Wjr-GyJ, lat: -35.2312775, lng: 149.0359574}
+  - { name: Wjr-GFM,stop_code: Wjr-GFM, lat: -35.2324613, lng: 149.03753}
+  - { name: Wjr-F_m,stop_code: Wjr-F_m, lat: -35.233261, lng: 149.039515}
+  - { name: Wjr-FCU,stop_code: Wjr-FCU, lat: -35.2344506, lng: 149.0363984}
+  - { name: Wjr-Fzd,stop_code: Wjr-Fzd, lat: -35.2360739, lng: 149.0353153}
+  - { name: Wjr-E8A,stop_code: Wjr-E8A, lat: -35.2437543, lng: 149.031741}
+  - { name: WjrZLdA,stop_code: WjrZLdA, lat: -35.245805, lng: 149.0316615}
+  - { name: WjrZSKp,stop_code: WjrZSKp, lat: -35.2509203, lng: 149.0480636}
+  - { name: WjrZSWs,stop_code: WjrZSWs, lat: -35.2533983, lng: 149.050782}
+  - { name: Wjr-MCk,stop_code: Wjr-MCk, lat: -35.2396029, lng: 149.0464162}
+  - { name: Wjr-M-x,stop_code: Wjr-M-x, lat: -35.2399127, lng: 149.0508416}
+  - { name: WjrZ-aT,stop_code: WjrZ-aT, lat: -35.2531402, lng: 149.053943}
+  - { name: WjrZZeD,stop_code: WjrZZeD, lat: -35.2558247, lng: 149.0536901}
+  - { name: WjrZZlR,stop_code: WjrZZlR, lat: -35.2567539, lng: 149.055397}
+  - { name: WjrZZH3,stop_code: WjrZZH3, lat: -35.2583026, lng: 149.0584315}
+  - { name: Wjz54mj,stop_code: Wjz54mj, lat: -35.2617096, lng: 149.0656385}
+  - { name: Wjz55vN,stop_code: Wjz55vN, lat: -35.2557214, lng: 149.0677248}
+  - { name: Wjz557P,stop_code: Wjz557P, lat: -35.2555149, lng: 149.0636155}
+  - { name: WjrZ-WW,stop_code: WjrZ-WW, lat: -35.2535016, lng: 149.0623511}
+  - { name: WjrZ-GZ,stop_code: WjrZ-GZ, lat: -35.2532951, lng: 149.0596327}
+  - { name: WjrZ-Jc,stop_code: WjrZ-Jc, lat: -35.2513107, lng: 149.058664}
+  - { name: WjrZ_Fk,stop_code: WjrZ_Fk, lat: -35.2485228, lng: 149.0588536}
+  - { name: Wjz57tg,stop_code: Wjz57tg, lat: -35.2461188, lng: 149.0669661}
+  - { name: Wjz57Q7,stop_code: Wjz57Q7, lat: -35.2462221, lng: 149.0708857}
+  - { name: Wjz57T_,stop_code: Wjz57T_, lat: -35.2441569, lng: 149.0719751}
+  - { name: Wjz5f2j,stop_code: Wjz5f2j, lat: -35.2479775, lng: 149.0739202}
+  - { name: Wjz5fm2,stop_code: Wjz5fm2, lat: -35.2452775, lng: 149.0763507}
+  - { name: Wjz688N,stop_code: Wjz688N, lat: -35.2439868, lng: 149.0759082}
+  - { name: Wjz68g-,stop_code: Wjz68g-, lat: -35.2436119, lng: 149.0775571}
+  - { name: Wjz5nUz,stop_code: Wjz5nUz, lat: -35.2493715, lng: 149.094909}
+  - { name: Wjz5vjd,stop_code: Wjz5vjd, lat: -35.2470998, lng: 149.0983861}
+  - { name: Wjz5v68,stop_code: Wjz5v68, lat: -35.2454993, lng: 149.0956677}
+  - { name: Wjz6gUM,stop_code: Wjz6gUM, lat: -35.2441052, lng: 149.0951619}
+  - { name: Wjz6gQ0,stop_code: Wjz6gQ0, lat: -35.2413491, lng: 149.0928379}
+  - { name: Wjz6gJc,stop_code: Wjz6gJc, lat: -35.2402968, lng: 149.0916132}
+  - { name: Wjz5vrT,stop_code: Wjz5vrT, lat: -35.2469189, lng: 149.1007523}
+  - { name: Wjz6oEz,stop_code: Wjz6oEz, lat: -35.243821, lng: 149.1030282}
+  - { name: Wjz6oJz,stop_code: Wjz6oJz, lat: -35.2403705, lng: 149.1030403}
+  - { name: Wjz7pfP,stop_code: Wjz7pfP, lat: -35.189616, lng: 149.0978803}
+  - { name: Wjz7p2n,stop_code: Wjz7p2n, lat: -35.1926501, lng: 149.0958323}
+  - { name: Wjz7hZW,stop_code: Wjz7hZW, lat: -35.1910485, lng: 149.0953265}
+  - { name: Wjz7iV0,stop_code: Wjz7iV0, lat: -35.1885169, lng: 149.0941253}
+  - { name: Wjz7iG_,stop_code: Wjz7iG_, lat: -35.1872252, lng: 149.0926713}
+  - { name: Wjz7iKx,stop_code: Wjz7iKx, lat: -35.1849518, lng: 149.0920391}
+  - { name: Wjz7ilp,stop_code: Wjz7ilp, lat: -35.1856235, lng: 149.0877402}
+  - { name: Wjz7i7r,stop_code: Wjz7i7r, lat: -35.1841251, lng: 149.0850218}
+  - { name: Wjz7jaJ,stop_code: Wjz7jaJ, lat: -35.1819033, lng: 149.0868551}
+  - { name: Wjz7jsi,stop_code: Wjz7jsi, lat: -35.1807665, lng: 149.0890046}
+  - { name: Wjz7jW4,stop_code: Wjz7jW4, lat: -35.181955, lng: 149.0941886}
+  - { name: Wjz7qfu,stop_code: Wjz7qfu, lat: -35.1838151, lng: 149.0974127}
+  - { name: Wjz7qvq,stop_code: Wjz7qvq, lat: -35.1841768, lng: 149.1001944}
+  - { name: Wjz7rzg,stop_code: Wjz7rzg, lat: -35.1815933, lng: 149.1014588}
+  - { name: Wjz7qkM,stop_code: Wjz7qkM, lat: -35.1864502, lng: 149.0992461}
+  - { name: Wjz7qwq,stop_code: Wjz7qwq, lat: -35.1890336, lng: 149.101522}
+  - { name: Wjz7pkV,stop_code: Wjz7pkV, lat: -35.1918235, lng: 149.0995622}
+  - { name: Wjz7rOj,stop_code: Wjz7rOj, lat: -35.1820066, lng: 149.104114}
+  - { name: Wjz7rMm,stop_code: Wjz7rMm, lat: -35.1831434, lng: 149.104114}
+  - { name: Wjz7qSX,stop_code: Wjz7qSX, lat: -35.1847968, lng: 149.1050623}
+  - { name: Wjz7q-_,stop_code: Wjz7q-_, lat: -35.1844351, lng: 149.1063899}
+  - { name: Wjz7yfG,stop_code: Wjz7yfG, lat: -35.1841768, lng: 149.108729}
+  - { name: Wjz7r-a,stop_code: Wjz7r-a, lat: -35.1793714, lng: 149.1053784}
+  - { name: Wjz7rRa,stop_code: Wjz7rRa, lat: -35.1800948, lng: 149.1039243}
+  - { name: Wjz7Add,stop_code: Wjz7Add, lat: -35.1743073, lng: 149.10816}
+  - { name: Wjz7B0w,stop_code: Wjz7B0w, lat: -35.1727054, lng: 149.107275}
+  - { name: Wjz7tOr,stop_code: Wjz7tOr, lat: -35.1710517, lng: 149.1042404}
+  - { name: Wjz7txI,stop_code: Wjz7txI, lat: -35.1716718, lng: 149.1018381}
+  - { name: Wjz7thn,stop_code: Wjz7thn, lat: -35.1713618, lng: 149.0985507}
+  - { name: Wjz7tug,stop_code: Wjz7tug, lat: -35.1685711, lng: 149.0999415}
+  - { name: Wjz7tvK,stop_code: Wjz7tvK, lat: -35.1673308, lng: 149.1005105}
+  - { name: Wjz7uxi,stop_code: Wjz7uxi, lat: -35.1663489, lng: 149.1013956}
+  - { name: Wjz7tLG,stop_code: Wjz7tLG, lat: -35.1677443, lng: 149.1032921}
+  - { name: Wjz7tIt,stop_code: Wjz7tIt, lat: -35.169553, lng: 149.1029128}
+  - { name: Wjz7Bg7,stop_code: Wjz7Bg7, lat: -35.1720853, lng: 149.109298}
+  - { name: Wjz7BqG,stop_code: Wjz7BqG, lat: -35.1711551, lng: 149.1115106}
+  - { name: Wjz7BsE,stop_code: Wjz7BsE, lat: -35.1699148, lng: 149.1115106}
+  - { name: Wjz7BC3,stop_code: Wjz7BC3, lat: -35.1683127, lng: 149.1120164}
+  - { name: Wjz7BJK,stop_code: Wjz7BJK, lat: -35.1687262, lng: 149.1142923}
+  - { name: Wjz7BST,stop_code: Wjz7BST, lat: -35.167951, lng: 149.1157463}
+  - { name: Wjz7BED,stop_code: Wjz7BED, lat: -35.1720853, lng: 149.1141026}
+  - { name: Wjz7BWN,stop_code: Wjz7BWN, lat: -35.1712067, lng: 149.1171372}
+  - { name: Wjz7AJS,stop_code: Wjz7AJS, lat: -35.174204, lng: 149.1143555}
+  - { name: Wjz7AGv,stop_code: Wjz7AGv, lat: -35.1762193, lng: 149.113913}
+  - { name: Wjz7AEw,stop_code: Wjz7AEw, lat: -35.1781829, lng: 149.1141659}
+  - { name: Wjz7zzB,stop_code: Wjz7zzB, lat: -35.1811799, lng: 149.1126486}
+  - { name: Wjz7CqJ,stop_code: Wjz7CqJ, lat: -35.1654186, lng: 149.1114474}
+  - { name: Wjz7CA3,stop_code: Wjz7CA3, lat: -35.16423, lng: 149.1119532}
+  - { name: Wjz7CD7,stop_code: Wjz7CD7, lat: -35.1617492, lng: 149.1119532}
+  - { name: Wjz7CKg,stop_code: Wjz7CKg, lat: -35.1630413, lng: 149.1137233}
+  - { name: Wjz7IDY,stop_code: Wjz7IDY, lat: -35.1730154, lng: 149.1242809}
+  - { name: Wjz7If2,stop_code: Wjz7If2, lat: -35.1732221, lng: 149.1188441}
+  - { name: Wjz7Ikc,stop_code: Wjz7Ikc, lat: -35.1750825, lng: 149.1204878}
+  - { name: Wjz7Iax,stop_code: Wjz7Iax, lat: -35.1766844, lng: 149.1196027}
+  - { name: Wjz7HfF,stop_code: Wjz7HfF, lat: -35.178803, lng: 149.1197924}
+  - { name: Wjz7IoZ,stop_code: Wjz7IoZ, lat: -35.1777695, lng: 149.1227637}
+  - { name: Wjz7IFg,stop_code: Wjz7IFg, lat: -35.1774595, lng: 149.1246602}
+  - { name: Wjz7IuJ,stop_code: Wjz7IuJ, lat: -35.1736356, lng: 149.1225108}
+  - { name: Wjz7JP1,stop_code: Wjz7JP1, lat: -35.1705349, lng: 149.1257982}
+  - { name: Wjz7J-7,stop_code: Wjz7J-7, lat: -35.167951, lng: 149.1270626}
+  - { name: Wjz7R6d,stop_code: Wjz7R6d, lat: -35.1681577, lng: 149.1286431}
+  - { name: Wjz7R5z,stop_code: Wjz7R5z, lat: -35.1690363, lng: 149.1291488}
+  - { name: Wjz7RdE,stop_code: Wjz7RdE, lat: -35.169243, lng: 149.1307293}
+  - { name: Wjz7RHe,stop_code: Wjz7RHe, lat: -35.1700698, lng: 149.135534}
+  - { name: Wjz7SN-,stop_code: Wjz7SN-, lat: -35.1660013, lng: 149.1378981}
+  - { name: Wjz7Y0J,stop_code: Wjz7Y0J, lat: -35.177732, lng: 149.1403005}
+  - { name: Wjz7PIc,stop_code: Wjz7PIc, lat: -35.1805599, lng: 149.135534}
+  - { name: Wjz7Pjj,stop_code: Wjz7Pjj, lat: -35.1813349, lng: 149.1316144}
+  - { name: Wjz7GSc,stop_code: Wjz7GSc, lat: -35.1847451, lng: 149.1258614}
+  - { name: Wjz7yNW,stop_code: Wjz7yNW, lat: -35.1883262, lng: 149.1159763}
+  - { name: Wjz7Ppw,stop_code: Wjz7Ppw, lat: -35.1829884, lng: 149.1332581}
+  - { name: Wjz7OBc,stop_code: Wjz7OBc, lat: -35.1853732, lng: 149.1341431}
+  - { name: Wjz7PNV,stop_code: Wjz7PNV, lat: -35.1828992, lng: 149.1380246}
+  - { name: Wjz7X2n,stop_code: Wjz7X2n, lat: -35.1817108, lng: 149.1398579}
+  - { name: Wjz7X3O,stop_code: Wjz7X3O, lat: -35.1814007, lng: 149.1404901}
+  - { name: Wjz7Xiv,stop_code: Wjz7Xiv, lat: -35.1817108, lng: 149.1427028}
+  - { name: Wjz7XxD,stop_code: Wjz7XxD, lat: -35.1823825, lng: 149.1457373}
+  - { name: Wjzf31y,stop_code: Wjzf31y, lat: -35.1828475, lng: 149.151111}
+  - { name: Wjzf2hJ,stop_code: Wjzf2hJ, lat: -35.1880144, lng: 149.154019}
+  - { name: Wjzf2rm,stop_code: Wjzf2rm, lat: -35.1865677, lng: 149.1549041}
+  - { name: Wjzf1X3,stop_code: Wjzf1X3, lat: -35.1923543, lng: 149.1600249}
+  - { name: Wjzf91m,stop_code: Wjzf91m, lat: -35.1934909, lng: 149.1618582}
+  - { name: Wjzf0ZL,stop_code: Wjzf0ZL, lat: -35.1961257, lng: 149.1609099}
+  - { name: Wjzf0EJ,stop_code: Wjzf0EJ, lat: -35.1997419, lng: 149.1581283}
+  - { name: Wjze7Cp,stop_code: Wjze7Cp, lat: -35.2014466, lng: 149.1565478}
+  - { name: Wjz6_vY,stop_code: Wjz6_vY, lat: -35.2004651, lng: 149.1448522}
+  - { name: Wjz6_7M,stop_code: Wjz6_7M, lat: -35.2008784, lng: 149.1404901}
+  - { name: Wjz6TZN,stop_code: Wjz6TZN, lat: -35.2021182, lng: 149.1392257}
+  - { name: Wjz7Oal,stop_code: Wjz7Oal, lat: -35.1873286, lng: 149.1301603}
+  - { name: Wjz7GPB,stop_code: Wjz7GPB, lat: -35.1867085, lng: 149.1264936}
+  - { name: Wjz7Gxm,stop_code: Wjz7Gxm, lat: -35.188002, lng: 149.1234035}
+  - { name: Wjz7Fmf,stop_code: Wjz7Fmf, lat: -35.1899217, lng: 149.1203537}
+  - { name: Wjz7F5C,stop_code: Wjz7F5C, lat: -35.1906966, lng: 149.118141}
+  - { name: Wjz7xO6,stop_code: Wjz7xO6, lat: -35.1928051, lng: 149.1147348}
+  - { name: Wjz7xJz,stop_code: Wjz7xJz, lat: -35.191011, lng: 149.1141277}
+  - { name: Wjz7wZg,stop_code: Wjz7wZg, lat: -35.1967555, lng: 149.1165529}
+  - { name: Wjz7E3Z,stop_code: Wjz7E3Z, lat: -35.1976337, lng: 149.1187656}
+  - { name: Wjz7EjH,stop_code: Wjz7EjH, lat: -35.1978404, lng: 149.1211679}
+  - { name: Wjz7Ezf,stop_code: Wjz7Ezf, lat: -35.1975304, lng: 149.1231277}
+  - { name: Wjz7EJ7,stop_code: Wjz7EJ7, lat: -35.1960839, lng: 149.1244553}
+  - { name: Wjz7FNw,stop_code: Wjz7FNw, lat: -35.193955, lng: 149.126474}
+  - { name: Wjz6-16,stop_code: Wjz6-16, lat: -35.20994, lng: 149.1394383}
+  - { name: Wjz6RQW,stop_code: Wjz6RQW, lat: -35.2136848, lng: 149.1379368}
+  - { name: Wjz6Zb2,stop_code: Wjz6Zb2, lat: -35.214395, lng: 149.1408607}
+  - { name: Wjz6Z8D,stop_code: Wjz6Z8D, lat: -35.216009, lng: 149.1414929}
+  - { name: Wjz6QTd,stop_code: Wjz6QTd, lat: -35.2168483, lng: 149.1369095}
+  - { name: Wjz6QPM,stop_code: Wjz6QPM, lat: -35.2200763, lng: 149.1377788}
+  - { name: Wjz6Yc1,stop_code: Wjz6Yc1, lat: -35.2193016, lng: 149.1407817}
+  - { name: Wjz6Yaq,stop_code: Wjz6Yaq, lat: -35.2205928, lng: 149.1414139}
+  - { name: Wjz6YiM,stop_code: Wjz6YiM, lat: -35.2207864, lng: 149.1433105}
+  - { name: Wjz6XiO,stop_code: Wjz6XiO, lat: -35.226071, lng: 149.143256}
+  - { name: Wjz6Wse,stop_code: Wjz6Wse, lat: -35.2298796, lng: 149.1438091}
+  - { name: Wjze2eG,stop_code: Wjze2eG, lat: -35.2288072, lng: 149.1527323}
+  - { name: Wjze3gN,stop_code: Wjze3gN, lat: -35.2275265, lng: 149.154199}
+  - { name: Wjze3Fa,stop_code: Wjze3Fa, lat: -35.2267416, lng: 149.1575876}
+  - { name: Wjze3Vq,stop_code: Wjze3Vq, lat: -35.2267416, lng: 149.1606727}
+  - { name: Wjzebjj,stop_code: Wjzebjj, lat: -35.2253369, lng: 149.1645164}
+  - { name: Wjzeaq_,stop_code: Wjzeaq_, lat: -35.2311306, lng: 149.1668636}
+  - { name: Wjze8v0,stop_code: Wjze8v0, lat: -35.2393099, lng: 149.1654981}
+  - { name: Wjze8bf,stop_code: Wjze8bf, lat: -35.2414165, lng: 149.1630705}
+  - { name: Wjze0VY,stop_code: Wjze0VY, lat: -35.2430274, lng: 149.1613003}
+  - { name: Wjze0Pi,stop_code: Wjze0Pi, lat: -35.2418709, lng: 149.1591256}
+  - { name: Wjze0vR,stop_code: Wjze0vR, lat: -35.2388968, lng: 149.1555853}
+  - { name: Wjze1hB,stop_code: Wjze1hB, lat: -35.2374923, lng: 149.1539669}
+  - { name: Wjze1c2,stop_code: Wjze1c2, lat: -35.2356747, lng: 149.1518427}
+  - { name: Wjze17N,stop_code: Wjze17N, lat: -35.2336919, lng: 149.1515898}
+  - { name: Wjze1gi,stop_code: Wjze1gi, lat: -35.2384424, lng: 149.1535117}
+  - { name: Wjz6UYK,stop_code: Wjz6UYK, lat: -35.2407969, lng: 149.1499714}
+  - { name: Wjz6UQw,stop_code: Wjz6UQw, lat: -35.2413339, lng: 149.1484036}
+  - { name: Wjz6Upu,stop_code: Wjz6Upu, lat: -35.2429035, lng: 149.1442058}
+  - { name: Wjz6Ugw,stop_code: Wjz6Ugw, lat: -35.2441014, lng: 149.142992}
+  - { name: Wjz5_mg,stop_code: Wjz5_mg, lat: -35.2454644, lng: 149.1425874}
+  - { name: Wjz5_ie,stop_code: Wjz5_ie, lat: -35.2476948, lng: 149.1423851}
+  - { name: Wjz5_y0,stop_code: Wjz5_y0, lat: -35.2482318, lng: 149.1449139}
+  - { name: Wjz5_O4,stop_code: Wjz5_O4, lat: -35.24786, lng: 149.147645}
+  - { name: Wjzd73N,stop_code: Wjzd73N, lat: -35.2474057, lng: 149.1515393}
+  - { name: Wjzd7sL,stop_code: Wjzd7sL, lat: -35.2462079, lng: 149.1554841}
+  - { name: Wjzd7LX,stop_code: Wjzd7LX, lat: -35.2445144, lng: 149.1586198}
+  - { name: Wjzd7_6,stop_code: Wjzd7_6, lat: -35.2443079, lng: 149.1601371}
+  - { name: Wjzdfaz,stop_code: Wjzdfaz, lat: -35.2479426, lng: 149.1635256}
+  - { name: WjzdeeQ,stop_code: WjzdeeQ, lat: -35.2506237, lng: 149.1639253}
+  - { name: Wjzd6XP,stop_code: Wjzd6XP, lat: -35.2527713, lng: 149.1610527}
+  - { name: Wjzd6Pn,stop_code: Wjzd6Pn, lat: -35.2524079, lng: 149.1590701}
+  - { name: Wjzd6Cq,stop_code: Wjzd6Cq, lat: -35.2507889, lng: 149.1563997}
+  - { name: Wjzd6lW,stop_code: Wjzd6lW, lat: -35.2515158, lng: 149.1544172}
+  - { name: Wjzd6iW,stop_code: Wjzd6iW, lat: -35.2535643, lng: 149.1544576}
+  - { name: Wjzd68O,stop_code: Wjzd68O, lat: -35.254952, lng: 149.1528797}
+  - { name: Wjz5ZZQ,stop_code: Wjz5ZZQ, lat: -35.2567691, lng: 149.1500474}
+  - { name: Wjz5ZO1,stop_code: Wjz5ZO1, lat: -35.2591479, lng: 149.1477412}
+  - { name: Wjz5-5y,stop_code: Wjz5-5y, lat: -35.2514497, lng: 149.1400942}
+  - { name: Wjz5SWN,stop_code: