projects / bus.git / commitdiff
search:
summary | shortlog | log | commit | commitdiff | tree
side by side | plain
Fix up time display format
Fix up time display format

file:a/maxious-canberra-transit-feed/01-extracttimes.rb -> file:b/maxious-canberra-transit-feed/01-extracttimes.rb 
--- a/maxious-canberra-transit-feed/01-extracttimes.rb
+++ b/maxious-canberra-transit-feed/01-extracttimes.rb
@@ -2,39 +2,49 @@
 require 'nokogiri'
 require 'open-uri'
 require 'pp'
+require 'yaml'
+class Array
+  def to_yaml_style
+    :inline
+  end
+end
+
 
 def makeTimetable(table, period, short_name)
-	timetable = {"stop_times" => [], "between_stops" => [], "short_name" => short_name}
+	timetable = {"between_stops" => [], "short_name" => short_name}
 	time_points = table.xpath('tr[1]//th').map do |tp|
 		if tp.content != "\302\240" && tp.content != "" && tp.content != "<br/>"
 			timing_point = tp.content.squeeze(" ").gsub("\r\n Platform"," - Platform").gsub("  - "," - ").gsub("\n","").gsub("\r","").gsub("\\"," / ").strip
 		end
 	end
 	time_points.delete(nil)
-	timetable["time_points"] = time_points
+	timetable["time_points"] = time_points.to_a
 	timetable["long_name"] = "To " + time_points.last
 	periodtimes = []
 	table.css('tr').each do |row|
 		times = row.css('td').map do |cell|
-			#TODO convert to GTFS time ie. replace " AM" with a
 			time = cell.content.squeeze(" ").strip
+			time = time.gsub(" AM","a").gsub(" PM","p").gsub("12:08 AM","1208x").gsub(":","").gsub("1.","1").gsub("2.","2")
+			time = time.gsub("3.","3").gsub("4.","4")
+			time = time.gsub("5.","5").gsub("6.","6").gsub("7.","7").gsub("8.","8").gsub("9.","9").gsub("10.","10")
+			time = time.gsub("11.","11").gsub("12.","12").gsub(/\.+/,"-")
 		end
 		if not times.empty?
 			if not (route = times.shift)
 				raise("TODO: account for shifting route numbers eg. intertown/redex 62/162")
 			end
-			periodtimes << times
+			periodtimes << times.to_a
 		end
 	end
 	if periodtimes.size < 1
 		raise "No times for route " + short_name + " in period " + period
 	end
-	timetable["stop_times"] = { period => periodtimes }
+	timetable[period] = periodtimes.to_a
 	# pp timetable
 	filename = timetable["short_name"] + "-" + timetable["long_name"].downcase.gsub(" ","-").gsub("/","") + "." + period + ".yml"
 	puts "Saving " + filename
 	File.open("#{File.dirname(__FILE__)}/output/"+filename, "w") do |f|
-	  	f.write timetable.to_yaml
+		f.write timetable.to_yaml
 	end
 	timetable
 end
@@ -54,26 +64,26 @@
 	end
 
 	doc.xpath('//table[preceding::text()="Weekdays"]').each do |table|
-		timetables << makeTimetable(table, "weekday", short_name)
+		timetables << makeTimetable(table, "stop_times", short_name)
 	end
 
 	#weekends
 	doc.xpath('//table[preceding::text()="Saturdays" and following::a]').each do |table|
-		timetables << makeTimetable(table, "saturday", short_name)
+		timetables << makeTimetable(table, "stop_times_saturday", short_name)
 	end
 	doc.xpath('//table[preceding::text()="Sundays"]').each do |table|
-		timetables << makeTimetable(table, "sunday",  short_name)
+		timetables << makeTimetable(table, "stop_times_sunday",  short_name)
 	end
 	#930/934 special cases
 	doc.xpath('//table[preceding::text()="Saturday" and following::h2]').each do |table|
-		timetables << makeTimetable(table, "saturday", short_name)
+		timetables << makeTimetable(table, "stop_times_saturday", short_name)
 	end
 	doc.xpath('//table[preceding::text()="Sunday"]').each do |table|
-		timetables << makeTimetable(table, "sunday",  short_name)
+		timetables << makeTimetable(table, "stop_times_sunday",  short_name)
 	end
 	#route 81 = Weekdays - School Holidays Only 
 	doc.xpath('//table[preceding::text()="Weekdays - School Holidays Only "]').each do |table|
-		timetable = makeTimetable(table, "weekday", short_name)
+		timetable = makeTimetable(table, "stop_times", short_name)
 		#TODO set active date range to only be holidays
 		timetables << timetable;
 	end
file:a/maxious-canberra-transit-feed/02-tidytimepoints.rb -> file:b/maxious-canberra-transit-feed/02-tidytimepoints.rb 
--- a/maxious-canberra-transit-feed/02-tidytimepoints.rb
+++ b/maxious-canberra-transit-feed/02-tidytimepoints.rb
@@ -62,8 +62,13 @@
 			  "Cameron Ave Station - Platform 5" => "Cameron Ave Bus Station - Platform 5",
 			  "Burton & Garranan Hall, Daley Road ANU" => "Burton & Garran Hall, Daley Road ANU",
 			  "Burton & Garranan Hall,Daley Road ANU" => "Burton & Garran Hall, Daley Road ANU",
+			  "Garran/Daley Rd" => "Burton & Garran Hall, Daley Road ANU",
+			  "Kingstons Ave/National Crt" => "Kings Ave/National Crt",
 			  "Newcastle Street after Isa St" => "Newcastle / Isa Street Fyshwick",
 			  "National Circ/Canberra Ave" => "National Circuit / Canberra Ave",
+			  "St Clare of Conder" => "St Clare of Assisi Primary",
+			  "McKillop College Isabella Campus" => "MacKillop College Isabella Campus",
+			  "Outrim / Duggan" => "Outtrim / Duggan",
 			}
 time_point_corrections.each do |wrong, right|
 	$time_points_sources[wrong].each do |wrongfile|
file:a/maxious-canberra-transit-feed/03-locatetimepoints.rb -> file:b/maxious-canberra-transit-feed/03-locatetimepoints.rb 
--- a/maxious-canberra-transit-feed/03-locatetimepoints.rb
+++ b/maxious-canberra-transit-feed/03-locatetimepoints.rb
@@ -22,6 +22,12 @@
       raise "web service error"
    end
    return result
+end
+class Array
+
+   def find_dups
+      inject(Hash.new(0)) { |h,e| h[e] += 1; h }.select { |k,v| v > 1 }.collect { |x| x.first }
+   end
 end
 
 require 'yaml'
@@ -63,6 +69,7 @@
 
 
 if ask_if("Fill null Timing Points from OSM bus_stop database?")
+# TODO Where there's a "Cnr" or a \/ or a &, Look for 2 ways or nodes and average the closest two!
 	begin
 		null_points = connbus.exec('SELECT name FROM timing_point WHERE lat IS null OR lng IS null;')
 	rescue PGError => e
@@ -74,8 +81,9 @@
 		begin
 			name = null_point_name.to_s.gsub(/\\/, '\&\&').gsub(/'/, "''")
 			pp name
+			search_name = ask("Hmm, if we're still looking, the name is probably wrong. What's the right name?", :string, :default => name)
         	     	matching_nodes = connosm.exec("Select * FROM (SELECT * from current_node_tags,
-                        (Select id as ctagid FROM current_node_tags WHERE  v LIKE '%#{name}%') as a 
+                        (Select id as ctagid FROM current_node_tags WHERE  v LIKE '%#{search_name}%') as a 
                         where a.ctagid = current_node_tags.id) as ctags INNER JOIN current_nodes ON 
                         ctags.id=current_nodes.id")
 	        rescue PGError => e
@@ -118,6 +126,103 @@
 	               	end
 		else
 			puts "Uhh, there was no suggestion ID like that. Try again next time!"
+		end
+		
+		puts "Hmm, so maybe this isn't a point? Maybe it's a way.... like a street or something? Is it a 'street' or a 'corner' or nothing?"
+		whatisit = ask("So what is it:", :string, :default => "corner") 
+		if whatisit == "street"
+			begin
+				name = null_point_name.to_s.gsub(/\\/, '\&\&').gsub(/'/, "''")
+				pp "#{name} (ways)"
+				search_name = ask("Streets tend to have pretty bad quality data, What's the real name of the street?", :string, :default => name)
+			     	matching_ways = connosm.exec("Select avg(latitude), avg(longitude), name FROM (
+				SELECT * from current_way_nodes,(Select id as ctagid, v as name FROM current_way_tags WHERE k = 'name' AND v LIKE 
+				'%#{search_name}%') as a where a.ctagid = current_way_nodes.id) as ctags INNER JOIN current_nodes ON ctags.node_id=current_nodes.id
+				GROUP BY name")
+			rescue PGError => e
+		        	puts "Error selecting matching ways from DB #{e}"
+			        #conn.close() if conn
+			end
+			suggested_ways = Hash.new()
+
+			matching_ways.each do |matching_way_row|
+				#pp matching_way_row
+				# 0 = lat*100000
+				# 1 = lng*100000
+				# 2 = name
+				suggested_way = suggested_ways.fetch(matching_way_row[2], {'lat' => Float(matching_way_row[0])/10000000,
+											      'lng' => Float(matching_way_row[1])/10000000})
+				suggested_way['name'] = suggested_way['name'] 
+				suggested_ways[matching_way_row[2]] = suggested_way
+			end
+			pp suggested_ways
+			wayID = ask("Enter selected way ID:", :string) 
+			if suggested_ways.has_key?(wayID)
+				way = suggested_ways.fetch(wayID)
+				guess = ask_if("Is this a guess?")
+				puts "Location #{way["lat"]},#{way["lng"]} for #{null_point_name}"
+				begin
+		        	        res = connbus.exec("UPDATE timing_point SET lat = #{way["lat"]*10000000}, lng = 
+	#{way["lng"]*10000000},guess = #{guess} WHERE name = '#{name}'")
+			               	puts "Put '#{null_point_name}' into DB"
+			       	rescue PGError => e
+		        	        puts "Error inserting '#{null_point_name}' to DB #{e}"
+					ask_if("Continue?")
+			               	#conn.close() if conn
+			       	end
+			else
+				puts "Uhh, there was no suggestion ID like that. Try again next time!"
+			end
+		end
+		if whatisit == "corner"
+			# Where there's a "Cnr" or a \/ or a &, look for 2 ways and find the intersections
+			
+				name = null_point_name.to_s.gsub(/\\/, '\&\&').gsub(/'/, "''")
+				search_name = ask("I need this to look like STREETNAME1/STREETNAME2, okay? Can you do that for me?", :string, :default => name)
+				search_pieces = search_name.split("/")
+				pp search_pieces
+				if search_pieces.length == 2
+					begin
+					     	matching_ways = connosm.exec("SELECT w.way_id, latitude, longitude, w.node_id from (Select current_way_nodes.id as way_id, * from current_nodes inner join current_way_nodes on current_nodes.id=current_way_nodes.node_id inner join current_ways on current_way_nodes.id=current_ways.id) as w, (select node_id, count(node_id) from 
+		(Select * FROM (SELECT * from current_way_nodes, (Select id as ctagid, v as name FROM current_way_tags WHERE k = 'name' AND v LIKE '%#{search_pieces[0]}%') as a where a.ctagid = current_way_nodes.id ) as ctags INNER JOIN current_nodes ON   ctags.node_id=current_nodes.id where sequence_id = 1 union Select * FROM ( SELECT * from current_way_nodes,  (Select id as ctagid, v as name FROM current_way_tags WHERE k = 'name' AND v LIKE '%#{search_pieces[0]}%') as a where a.ctagid = current_way_nodes.id ) as ctags INNER JOIN current_nodes ON   ctags.node_id=current_nodes.id where sequence_id = (select max(sequence_id)   from current_way_nodes cnodes   where cnodes.id = ctags.id) union Select * FROM ( SELECT * from current_way_nodes,  (Select id as ctagid, v as name FROM current_way_tags WHERE k = 'name' AND v LIKE '%#{search_pieces[1]}%') as a      where a.ctagid = current_way_nodes.id ) as ctags INNER JOIN current_nodes ON   ctags.node_id=current_nodes.id where sequence_id = 1 union Select * FROM ( SELECT * from current_way_nodes, (Select id as ctagid, v as name FROM current_way_tags WHERE k = 'name' AND v LIKE '%#{search_pieces[1]}%') as a   where a.ctagid = current_way_nodes.id ) as ctags INNER JOIN current_nodes ON   ctags.node_id=current_nodes.id where sequence_id = (select max(sequence_id)   from current_way_nodes cnodes   where cnodes.id = ctags.id) ) as t GROUP BY node_id HAVING ( COUNT(node_id) > 1 ) ) as s  where s.node_id = w.node_id")
+					rescue PGError => e
+						puts "Error selecting matching bus stops from DB #{e}"
+						#conn.close() if conn
+					end
+					suggested_ways = Hash.new()
+
+					matching_ways.each do |matching_way_row|
+						pp matching_way_row
+						# 0 = way_id				
+						# 1 = lat*100000
+						# 2 = lng*100000
+						# 3 = node_id		
+						suggested_way = suggested_ways.fetch(matching_way_row[3], {'lat' => Float(matching_way_row[1])/10000000,
+													      'lng' => Float(matching_way_row[2])/10000000})
+						suggested_way['way_id'] =  " " + matching_way_row[0]
+						suggested_way['node_id'] = matching_way_row[3]
+						suggested_ways[matching_way_row[3]] = suggested_way
+					end
+					pp suggested_ways
+					wayID = ask("Enter selected way ID:", :string) 
+					if suggested_ways.has_key?(wayID)
+						way = suggested_ways.fetch(wayID)
+						guess = ask_if("Is this a guess?")
+						puts "Location #{way["lat"]},#{way["lng"]} for #{null_point_name}"
+						begin
+							res = connbus.exec("UPDATE timing_point SET lat = #{way["lat"]*10000000}, lng = 
+			#{way["lng"]*10000000},osm_node = #{wayID} ,guess = #{guess} WHERE name 
+			= '#{name}'")
+						       	puts "Put '#{null_point_name}' into DB"
+					       	rescue PGError => e
+							puts "Error inserting '#{null_point_name}' to DB #{e}"
+							ask_if("Continue?")
+						       	#conn.close() if conn
+					       	end
+					else
+						puts "Uhh, there was no suggestion ID like that. Try again next time!"
+					end
+			end
 		end
 	end
 end
file:b/maxious-canberra-transit-feed/04-generateymlinclude.rb (new) 
--- /dev/null
+++ b/maxious-canberra-transit-feed/04-generateymlinclude.rb
@@ -1,1 +1,38 @@
+#!/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")
+	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
+		f2.puts "  - { name: #{time_point[0]},stop_code: #{time_point[0]}, lat: #{Float(time_point[1])/10000000}, lng: #{Float(time_point[2])/10000000}}"
+	end
+	f2.puts "routes:\n";
+end
+
+
file:b/maxious-canberra-transit-feed/05-cleanupyaml.sh (new) 
--- /dev/null
+++ b/maxious-canberra-transit-feed/05-cleanupyaml.sh
@@ -1,1 +1,3 @@
+#!/bin/bash
+sed -i "s/- ---/- /g" cbrtable.yml
file:a/maxious-canberra-transit-feed/Makefile -> file:b/maxious-canberra-transit-feed/Makefile 
--- a/maxious-canberra-transit-feed/Makefile
+++ b/maxious-canberra-transit-feed/Makefile
@@ -3,20 +3,16 @@
 cbrfeed.zip: cbrtable.yml createfeed.py
 	./createfeed.py --input=cbrtable.yml --output=cbrfeed.zip
 
-ROUTE_FILES=900-intertown.yml 
-
-cbrtable.yml: cbrtable.yml.in $(ROUTE_FILES) indent-route.pl
+cbrtable.yml: cbrtable.yml.in indent-route.pl
 	cp cbrtable.yml.in cbrtable.yml
-	@$(foreach ROUTE_FILE, $(ROUTE_FILES), 	\
+	@$(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
-	@echo "TODO: autogenerate stops via database, convert to YAML"
-	cp cbrtable.yml.in.in cbrtable.yml.in
-	
+	ruby 04-generateymlinclude.rb	
 
 clean:
 	rm -f cbrtable.yml cbrtable.yml.in cbrfeed.zip *~
file:a/maxious-canberra-transit-feed/cbrtable.yml -> file:b/maxious-canberra-transit-feed/cbrtable.yml 
--- a/maxious-canberra-transit-feed/cbrtable.yml
+++ b/maxious-canberra-transit-feed/cbrtable.yml
@@ -1,99 +1,1840 @@
 options:
   start_date: 20090525
-  end_date: 20100601
-  remove_date: 2010601
+  end_date: 20101001
+  remove_date: 20101001
   agency_name: ACT Internal Omnibus Network (ACTION)
   agency_url: http://www.action.act.gov.au/ 
   agency_timezone: Australia/Canberra
 
+
 stops:
-  - { name: Civic Interchange Platform 1,stop_code: civic_platform_1, lat: -35.2794347, lng: 149.130588}
-  - { name: Civic Interchange Platform 5,stop_code: civic_platform_5, lat: -35.2786, lng: 149.13033}
-  - { name: Civic Interchange Platform 6,stop_code: civic_platform_6, lat: -35.27851, lng: 149.12979 }
-  - { name: Canberra House Northbound, stop_code: 3042, lat: -35.27833, 
-lng: 149.12712 }
-  - { name: Canberra House Southbound, stop_code: 4531, 
-lat: -35.2786, lng: 149.13033 }
-  - { name: Marcus Clarke Street - Unilodge ANU, stop_code: 4929, lat: -35.2764151, lng: 149.1267199 }
+  - { name: ADFA,stop_code: ADFA, lat: -35.2937972, lng: 149.1643403}
+  - { name: Ainslie,stop_code: Ainslie, lat: -35.2620105, lng: 149.1443302}
+  - { name: Aranda,stop_code: Aranda, lat: -35.257534, lng: 149.0762963}
+  - { name: Bonython,stop_code: Bonython, lat: -35.4297416, lng: 149.0814517}
+  - { name: Botanic Gardens,stop_code: Botanic Gardens, lat: -35.278643, lng: 149.1093237}
+  - { name: Cameron Ave Bus Station,stop_code: Cameron Ave Bus Station, lat: -35.2410195, lng: 149.0722506}
+  - { name: Cameron Ave Bus Station - Platform 1,stop_code: Cameron Ave Bus Station - Platform 1, lat: -35.2410195, lng: 149.0722506}
+  - { name: Cameron Ave Bus Station - Platform 2,stop_code: Cameron Ave Bus Station - Platform 2, lat: -35.2410108, lng: 149.0717142}
+  - { name: Cameron Ave Bus Station - Platform 3,stop_code: Cameron Ave Bus Station - Platform 3, lat: -35.2410064, lng: 149.0710758}
+  - { name: Cameron Ave Bus Station - Platform 4,stop_code: Cameron Ave Bus Station - Platform 4, lat: -35.2411773, lng: 149.0709793}
+  - { name: Cameron Ave Bus Station - Platform 5,stop_code: Cameron Ave Bus Station - Platform 5, lat: -35.241186, lng: 149.0720789}
+  - { name: Canberra College Weston,stop_code: Canberra College Weston, lat: -35.3490278, lng: 149.0486277}
+  - { name: Canberra Hospital,stop_code: Canberra Hospital, lat: -35.3459462, lng: 149.1012001}
+  - { name: Canberra Times,stop_code: Canberra Times, lat: -35.3245431, lng: 149.1705533}
+  - { name: Chapman,stop_code: Chapman, lat: -35.3557877, lng: 149.0408111}
+  - { name: Charnwood,stop_code: Charnwood, lat: -35.2052138, lng: 149.0337266}
+  - { name: Chifley,stop_code: Chifley, lat: -35.350985, lng: 149.077319}
+  - { name: Bonython Primary,stop_code: Bonython Primary, lat: -35.431019, lng: 149.0831217}
+  - { name: Cohen St Bus Station - Platform 1,stop_code: Cohen St Bus Station - Platform 1, lat: -35.2394775, lng: 149.0602031}
+  - { name: Conder Primary,stop_code: Conder Primary, lat: -35.4643475, lng: 149.0986908}
+  - { name: Cook,stop_code: Cook, lat: -35.2646433, lng: 149.0631708}
+  - { name: Copland College,stop_code: Copland College, lat: -35.2127018, lng: 149.0596387}
+  - { name: Curtin,stop_code: Curtin, lat: -35.3248779, lng: 149.081441}
+  - { name: Dickson,stop_code: Dickson, lat: -35.2498434, lng: 149.1391218}
+  - { name: Duffy,stop_code: Duffy, lat: -35.3366908, lng: 149.0324311}
+  - { name: Dunlop,stop_code: Dunlop, lat: -35.1942693, lng: 149.0206702}
+  - { name: Belconnen Way,stop_code: Belconnen Way, lat: -35.24809, lng: 149.06765}
+  - { name: Calvary Hospital,stop_code: Calvary Hospital, lat: -35.25212, lng: 149.09088}
+  - { name: Causeway,stop_code: Causeway, lat: -35.31615, lng: 149.15058}
+  - { name: Chisholm Shops,stop_code: Chisholm Shops, lat: -35.41341, lng: 149.12833}
+  - { name: Dickson College,stop_code: Dickson College, lat: -35.24923, lng: 149.15315}
+  - { name: Farrer Primary School,stop_code: Farrer Primary School, lat: -35.37887, lng: 149.10641}
+  - { name: Flemington Rd,stop_code: Flemington Rd, lat: -35.20756, lng: 149.14778}
+  - { name: Kippax Centre,stop_code: Kippax Centre, lat: -35.22172, lng: 149.01995}
+  - { name: Latham Shops,stop_code: Latham Shops, lat: -35.21848, lng: 149.03214}
+  - { name: National Aquarium,stop_code: National Aquarium, lat: -35.29915, lng: 149.07025}
+  - { name: Olims Hotel,stop_code: Olims Hotel, lat: -35.27597, lng: 149.1428}
+  - { name: Sainsbury Street,stop_code: Sainsbury Street, lat: -35.3885, lng: 149.09643}
+  - { name: Scullin Shops,stop_code: Scullin Shops, lat: -35.23356, lng: 149.04056}
+  - { name: Sydney Avenue,stop_code: Sydney Avenue, lat: -35.31193, lng: 149.13105}
+  - { name: Tuggeranong Interchange,stop_code: Tuggeranong Interchange, lat: -35.41465, lng: 149.06537}
+  - { name: City Interchange - Platform 1,stop_code: City Interchange - Platform 1, lat: -35.2794346, lng: 149.1305879}
+  - { name: City Interchange - Platform 10,stop_code: City Interchange - Platform 10, lat: -35.2793571, lng: 149.1293659}
+  - { name: City Interchange - Platform 3,stop_code: City Interchange - Platform 3, lat: -35.2787886, lng: 149.1304779}
+  - { name: City Interchange - Platform 4,stop_code: City Interchange - Platform 4, lat: -35.2785658, lng: 149.1301727}
+  - { name: City Interchange - Platform 7,stop_code: City Interchange - Platform 7, lat: -35.27843, lng: 149.130345}
+  - { name: City Interchange - Platform 8,stop_code: City Interchange - Platform 8, lat: -35.2778798, lng: 149.1305995}
+  - { name: City Interchange - Platform 9,stop_code: City Interchange - Platform 9, lat: -35.2783224, lng: 149.130726}
+  - { name: Tuggeranong Interchange - Platform 4,stop_code: Tuggeranong Interchange - Platform 4, lat: -35.4144924, lng: 149.0655423}
+  - { name: Tuggeranong Interchange - Platform 5,stop_code: Tuggeranong Interchange - Platform 5, lat: -35.414217, lng: 149.0653492}
+  - { name: Tuggeranong Interchange - Platform 7,stop_code: Tuggeranong Interchange - Platform 7, lat: -35.4146761, lng: 149.0654565}
+  - { name: Cohen St Bus Station - Platform 4,stop_code: Cohen St Bus Station - Platform 4, lat: -35.239844, lng: 149.0600683}
+  - { name: Cohen St Bus Station - Platform 5,stop_code: Cohen St Bus Station - Platform 5, lat: -35.2401211, lng: 149.0597102}
+  - { name: Cohen St Bus Station - Platform 6,stop_code: Cohen St Bus Station - Platform 6, lat: -35.2400028, lng: 149.060315}
+  - { name: Lathlain St Bus Station,stop_code: Lathlain St Bus Station, lat: -35.2396657, lng: 149.0633993}
+  - { name: Bimberi Centre,stop_code: Bimberi Centre, lat: -35.3501009, lng: 149.2361084}
+  - { name: Black Mountain Telstra Tower,stop_code: Black Mountain Telstra Tower, lat: -35.2879996, lng: 149.1007271}
+  - { name: Burton & Garran Hall, Daley Road ANU,stop_code: Burton & Garran Hall, Daley Road ANU, lat: -35.2753671, lng: 149.1172822}
+  - { name: Campbell Park Offices,stop_code: Campbell Park Offices, lat: -35.3461583, lng: 149.2415608}
+  - { name: Dickson Cowper St,stop_code: Dickson Cowper St, lat: -35.250297, lng: 149.141336}
+  - { name: Dickson Shops/Antill St,stop_code: Dickson Shops/Antill St, lat: -35.2251335, lng: 149.1658895}
+  - { name: Erindale Centre,stop_code: Erindale Centre, lat: -35.4038881, lng: 149.0992283}
+  - { name: Erindale Dr/ Charleston St Monash,stop_code: Erindale Dr/ Charleston St Monash, lat: -35.4172271, lng: 149.0813467}
+  - { name: Erindale Drive/Sternberg,stop_code: Erindale Drive/Sternberg, lat: -35.4014472, lng: 149.0956545}
+  - { name: Fairbairn Park,stop_code: Fairbairn Park, lat: -35.3001773, lng: 149.2041185}
+  - { name: Fraser East Terminus,stop_code: Fraser East Terminus, lat: -35.1896539, lng: 149.0435012}
+  - { name: Fyshwick Terminus,stop_code: Fyshwick Terminus, lat: -35.3285202, lng: 149.1785592}
+  - { name: Garran/Daley Rd,stop_code: Garran/Daley Rd, lat: -35.2753671, lng: 149.1172822}
+  - { name: Gwydir Square Kaleen,stop_code: Gwydir Square Kaleen, lat: -35.2338677, lng: 149.1031998}
+  - { name: Isabella Shops,stop_code: Isabella Shops, lat: -35.4285703, lng: 149.0916837}
+  - { name: John James Hospital,stop_code: John James Hospital, lat: -35.3200295, lng: 149.0955996}
+  - { name: Kaleen Village/Maribyrnong,stop_code: Kaleen Village/Maribyrnong, lat: -35.2274031, lng: 149.1075421}
+  - { name: Kambah High,stop_code: Kambah High, lat: -35.3847749, lng: 149.0720245}
+  - { name: Lithgow St Terminus Fyshwick,stop_code: Lithgow St Terminus Fyshwick, lat: -35.3296912, lng: 149.1668153}
+  - { name: Menindee Drive - Hospice,stop_code: Menindee Drive - Hospice, lat: -35.3024506, lng: 149.149499}
+  - { name: National Hockey Centre Lyneham,stop_code: National Hockey Centre Lyneham, lat: -35.2446729, lng: 149.1288303}
+  - { name: Russell Offices,stop_code: Russell Offices, lat: -35.2973294, lng: 149.1508803}
+  - { name: Southlands Mawson,stop_code: Southlands Mawson, lat: -35.3650685, lng: 149.0945962}
+  - { name: St Thomas More Campbell,stop_code: St Thomas More Campbell, lat: -35.286717, lng: 149.156836}
+  - { name: Stromlo High Waramanga,stop_code: Stromlo High Waramanga, lat: -35.3551186, lng: 149.0547624}
+  - { name: Torrens Shops,stop_code: Torrens Shops, lat: -35.3730889, lng: 149.087327}
+  - { name: Anthony Rolfe/Moonlight,stop_code: Anthony Rolfe/Moonlight, lat: -35.1856021, lng: 149.1543639}
+  - { name: Bugden/Sternberg,stop_code: Bugden/Sternberg, lat: -35.4017223, lng: 149.0992172}
+  - { name: Chuculba/William Slim,stop_code: Chuculba/William Slim, lat: -35.2103241, lng: 149.0997736}
+  - { name: Cnr Tillyard Dr & Spalding St,stop_code: Cnr Tillyard Dr & Spalding St, lat: -35.2040477, lng: 149.0393052}
+  - { name: Deamer/Clift Richardson,stop_code: Deamer/Clift Richardson, lat: -35.4319597, lng: 149.1187876}
+  - { name: Heagney/Clift Richardson,stop_code: Heagney/Clift Richardson, lat: -35.4251299, lng: 149.104995}
+  - { name: Hibberson/Kate Crace,stop_code: Hibberson/Kate Crace, lat: -35.1861642, lng: 149.1391756}
+  - { name: Lewis Luxton/Woodcock Dr,stop_code: Lewis Luxton/Woodcock Dr, lat: -35.4422566, lng: 149.0854375}
+  - { name: Kings Ave/National Crt,stop_code: Kings Ave/National Crt, lat: -35.3062755, lng: 149.1291434}
+  - { name: Macarthur / Miller O'Connor,stop_code: Macarthur / Miller O'Connor, lat: -35.2587584, lng: 149.1153561}
+  - { name: Macarthur / Northbourne,stop_code: Macarthur / Northbourne, lat: -35.2481997, lng: 149.134308}
+  - { name: Macgregor Shops,stop_code: Macgregor Shops, lat: -35.3167001, lng: 149.1039806}
+  - { name: Mentone View/Tharwa Drive,stop_code: Mentone View/Tharwa Drive, lat: -35.4439591, lng: 149.1171964}
+  - { name: National Circuit / Canberra Ave,stop_code: National Circuit / Canberra Ave, lat: -35.3197256, lng: 149.1351202}
+  - { name: Nicholls Primary,stop_code: Nicholls Primary, lat: -35.1905592, lng: 149.0876716}
+  - { name: Northbourne Ave/Antill St,stop_code: Northbourne Ave/Antill St, lat: -35.3496859, lng: 149.2318766}
+  - { name: Page Shops,stop_code: Page Shops, lat: -35.2360695, lng: 149.0536554}
+  - { name: Shoalhaven / Katherine Ave,stop_code: Shoalhaven / Katherine Ave, lat: -35.173207, lng: 149.1225369}
+  - { name: Spence Terminus,stop_code: Spence Terminus, lat: -35.199684, lng: 149.0676196}
+  - { name: Tharwa/Knoke,stop_code: Tharwa/Knoke, lat: -35.4439591, lng: 149.1171964}
+  - { name: St Clare of Assisi Primary,stop_code: St Clare of Assisi Primary, lat: -35.4606284, lng: 149.0962704}
+  - { name: Brindabella Business Park,stop_code: Brindabella Business Park, lat: -3.5314496, lng: 14.9189145}
+  - { name: Police College Weston,stop_code: Police College Weston, lat: -3.5248423, lng: 14.9165497}
+  - { name: Australian Institute Sports Bruce,stop_code: Australian Institute Sports Bruce, lat: -3.5246351, lng: 14.9101478}
+  - { name: Outrim / Duggan,stop_code: Outrim / Duggan, lat: -3.5435871, lng: 14.9097692}
+  - { name: Mount Neighbour School,stop_code: Mount Neighbour School, lat: -3.5382445, lng: 14.9051518}
+  - { name: Calwell Shops,stop_code: Calwell Shops, lat: -0.3543524, lng: 14.9113942}
+  - { name: Proctor / Mead,stop_code: Proctor / Mead, lat: -3.5415305, lng: 14.9127204}
+  - { name: MacKillop College Wanniassa Campus,stop_code: MacKillop College Wanniassa Campus, lat: -0.0354056, lng: 14.9089774}
+  - { name: MacKillop College Isabella Campus,stop_code: MacKillop College Isabella Campus, lat: -0.0354056, lng: 14.9089774}
+  - { name: Electricity House,stop_code: Electricity House, lat: -3.5282374, lng: 14.9132047}
+  - { name: Saint Andrews Village Hughes,stop_code: Saint Andrews Village Hughes, lat: -3.5328097, lng: 14.9088685}
+  - { name: Hospice,stop_code: Hospice, lat: -0.3525171, lng: 0.1490901}
+  - { name: Fraser West Terminus,stop_code: Fraser West Terminus, lat: -3.5191513, lng: 14.9038006}
+  - { name: Evatt,stop_code: Evatt, lat: -35.2091093, lng: 149.0735343}
+  - { name: Federation Square,stop_code: Federation Square, lat: -35.1908726, lng: 149.0848153}
+  - { name: Fisher,stop_code: Fisher, lat: -35.3605627, lng: 149.0576481}
+  - { name: Flynn,stop_code: Flynn, lat: -35.2019283, lng: 149.0478356}
+  - { name: Fraser,stop_code: Fraser, lat: -35.1896539, lng: 149.0435012}
+  - { name: Geoscience Australia,stop_code: Geoscience Australia, lat: -35.3429702, lng: 149.1583893}
+  - { name: Giralang,stop_code: Giralang, lat: -35.2115608, lng: 149.0960692}
+  - { name: Gowrie,stop_code: Gowrie, lat: -35.4120264, lng: 149.1110804}
+  - { name: Hackett,stop_code: Hackett, lat: -35.2481617, lng: 149.1626094}
+  - { name: Hawker,stop_code: Hawker, lat: -35.2437386, lng: 149.0432804}
+  - { name: Hawker College,stop_code: Hawker College, lat: -35.2454598, lng: 149.0324251}
+  - { name: Holder,stop_code: Holder, lat: -35.3378123, lng: 149.0449433}
+  - { name: Holt,stop_code: Holt, lat: -35.223099, lng: 149.0126269}
+  - { name: Isaacs,stop_code: Isaacs, lat: -35.3669823, lng: 149.1119217}
+  - { name: Kingston,stop_code: Kingston, lat: -35.3197448, lng: 149.1375261}
+  - { name: Kippax,stop_code: Kippax, lat: -35.22225, lng: 149.0195627}
+  - { name: Lyneham,stop_code: Lyneham, lat: -35.2523304, lng: 149.1246184}
+  - { name: Lyneham High,stop_code: Lyneham High, lat: -35.2524016, lng: 149.130254}
+  - { name: Lyons,stop_code: Lyons, lat: -35.3415779, lng: 149.0765703}
+  - { name: Macquarie,stop_code: Macquarie, lat: -35.2483414, lng: 149.0600666}
+  - { name: Manuka,stop_code: Manuka, lat: -35.3200096, lng: 149.1341344}
+  - { name: Melba,stop_code: Melba, lat: -35.2083104, lng: 149.0485366}
+  - { name: Monash Primary,stop_code: Monash Primary, lat: -35.414879, lng: 149.089411}
+  - { name: National Museum,stop_code: National Museum, lat: -35.29248, lng: 149.1205367}
+  - { name: Ngunnawal Primary,stop_code: Ngunnawal Primary, lat: -35.1688551, lng: 149.1112569}
+  - { name: North Lyneham,stop_code: North Lyneham, lat: -35.2385618, lng: 149.1221188}
+  - { name: Parliament House,stop_code: Parliament House, lat: -35.3081571, lng: 149.1244592}
+  - { name: Pearce,stop_code: Pearce, lat: -35.3625413, lng: 149.0815935}
+  - { name: Rivett,stop_code: Rivett, lat: -35.3473758, lng: 149.0365438}
+  - { name: Spence,stop_code: Spence, lat: -35.194735, lng: 149.062352}
+  - { name: Theodore,stop_code: Theodore, lat: -35.4464808, lng: 149.1234651}
+  - { name: Lathlain St Bus Station - Platform 1,stop_code: Lathlain St Bus Station - Platform 1, lat: -35.2408973, lng: 149.0639887}
+  - { name: Lathlain St Bus Station - Platform 4,stop_code: Lathlain St Bus Station - Platform 4, lat: -35.2396657, lng: 149.0633993}
+  - { name: Lathlain St Bus Station - Platform 5,stop_code: Lathlain St Bus Station - Platform 5, lat: -35.2405468, lng: 149.0636669}
+  - { name: Lathlain St Bus Station - Platform 6,stop_code: Lathlain St Bus Station - Platform 6, lat: -35.2410486, lng: 149.0638326}
+  - { name: War Memorial,stop_code: War Memorial, lat: -35.280477, lng: 149.149085}
+  - { name: Waramanga,stop_code: Waramanga, lat: -35.3526825, lng: 149.0594712}
+  - { name: Watson,stop_code: Watson, lat: -35.2389399, lng: 149.1535345}
+  - { name: Cohen St Bus Station,stop_code: Cohen St Bus Station, lat: -35.2394775, lng: 149.0602031}
+  - { name: Cohen St Bus Station - Platform 2,stop_code: Cohen St Bus Station - Platform 2, lat: -35.2396467, lng: 149.0602152}
+  - { name: Deakin,stop_code: Deakin, lat: -35.3158608, lng: 149.1084563}
+  - { name: Duffy Primary School,stop_code: Duffy Primary School, lat: -35.334219, lng: 149.033656}
+  - { name: Eye Hospital,stop_code: Eye Hospital, lat: -35.3341884, lng: 149.1656213}
+  - { name: Florey Shops,stop_code: Florey Shops, lat: -35.2258544, lng: 149.0546214}
+  - { name: Garran,stop_code: Garran, lat: -35.3423286, lng: 149.10811}
+  - { name: Gordon Primary,stop_code: Gordon Primary, lat: -35.455517, lng: 149.086978}
+  - { name: Gungahlin Market Place,stop_code: Gungahlin Market Place, lat: -35.1769532, lng: 149.1319017}
+  - { name: Higgins,stop_code: Higgins, lat: -35.2313901, lng: 149.0271811}
+  - { name: Hughes,stop_code: Hughes, lat: -35.3339223, lng: 149.093854}
+  - { name: Kambah Village,stop_code: Kambah Village, lat: -35.3800314, lng: 149.0576581}
+  - { name: Lanyon Market Place,stop_code: Lanyon Market Place, lat: -35.4573, lng: 149.09199}
+  - { name: Citywest,stop_code: Citywest, lat: -35.2788605, lng: 149.1257969}
+  - { name: McKellar,stop_code: McKellar, lat: -35.2174267, lng: 149.0742108}
+  - { name: Monash,stop_code: Monash, lat: -35.4190254, lng: 149.0834805}
+  - { name: Narrabundah College,stop_code: Narrabundah College, lat: -35.3362106, lng: 149.1471005}
+  - { name: O'Connor,stop_code: O'Connor, lat: -35.2640376, lng: 149.1226107}
+  - { name: Red Hill,stop_code: Red Hill, lat: -35.336505, lng: 149.131645}
+  - { name: Tharwa Drive,stop_code: Tharwa Drive, lat: -35.458251, lng: 149.091652}
+  - { name: University of Canberra,stop_code: University of Canberra, lat: -35.2423222, lng: 149.0831522}
+  - { name: Lathlain St Bus Station - Platform 2,stop_code: Lathlain St Bus Station - Platform 2, lat: -35.2406038, lng: 149.0638922}
+  - { name: Lathlain St Bus Station - Platform 3,stop_code: Lathlain St Bus Station - Platform 3, lat: -35.2400517, lng: 149.0637152}
+  - { name: Alpen & Clifford St,stop_code: Alpen & Clifford St, lat: -35.20562, lng: 149.06259}
+  - { name: Caswell Drive,stop_code: Caswell Drive, lat: -35.27284, lng: 149.08802}
+  - { name: Cooleman Court,stop_code: Cooleman Court, lat: -35.34147, lng: 149.05338}
+  - { name: Hospice, Menindee Drive,stop_code: Hospice, Menindee Drive, lat: -35.3029, lng: 149.14957}
+  - { name: Manuka, Captain Cook,stop_code: Manuka, Captain Cook, lat: -35.31959, lng: 149.13346}
+  - { name: Southwell Park,stop_code: Southwell Park, lat: -35.24573, lng: 149.1321}
+  - { name: Woden Interchange,stop_code: Woden Interchange, lat: -35.34433, lng: 149.08742}
+  - { name: Yarralumla Shops,stop_code: Yarralumla Shops, lat: -35.30725, lng: 149.0972}
+  - { name: Woden Interchange - Platform 11,stop_code: Woden Interchange - Platform 11, lat: -35.3439129, lng: 149.0876216}
+  - { name: Woden Interchange - Platform 12,stop_code: Woden Interchange - Platform 12, lat: -35.3442094, lng: 149.0876444}
+  - { name: Woden Interchange - Platform 14,stop_code: Woden Interchange - Platform 14, lat: -35.34438, lng: 149.0872662}
+  - { name: Woden Interchange - Platform 15,stop_code: Woden Interchange - Platform 15, lat: -35.3444271, lng: 149.0869631}
+  - { name: Woden Interchange - Platform 16,stop_code: Woden Interchange - Platform 16, lat: -35.344484, lng: 149.0866144}
+  - { name: Woden Interchange - Platform 2,stop_code: Woden Interchange - Platform 2, lat: -35.3447574, lng: 149.0862912}
+  - { name: Woden Interchange - Platform 3,stop_code: Woden Interchange - Platform 3, lat: -35.344566, lng: 149.086774}
+  - { name: Woden Interchange - Platform 4,stop_code: Woden Interchange - Platform 4, lat: -35.3445222, lng: 149.0870436}
+  - { name: Woden Interchange - Platform 5,stop_code: Woden Interchange - Platform 5, lat: -35.3444741, lng: 149.0873533}
+  - { name: Woden Interchange - Platform 6,stop_code: Woden Interchange - Platform 6, lat: -35.34445, lng: 149.0875371}
+  - { name: Woden Interchange - Platform 9,stop_code: Woden Interchange - Platform 9, lat: -35.3442083, lng: 149.0877771}
+  - { name: City Interchange,stop_code: City Interchange, lat: -35.2794346, lng: 149.1305879}
+  - { name: City Interchange - Platform 11,stop_code: City Interchange - Platform 11, lat: -35.2787905, lng: 149.1288627}
+  - { name: City Interchange - Platform 5,stop_code: City Interchange - Platform 5, lat: -35.2785242, lng: 149.1297348}
+  - { name: Tuggeranong Interchange - Platform 3,stop_code: Tuggeranong Interchange - Platform 3, lat: -35.4147569, lng: 149.0657435}
+  - { name: Tuggeranong Interchange - Platform 8,stop_code: Tuggeranong Interchange - Platform 8, lat: -35.4149428, lng: 149.0656523}
+  - { name: Woden Interchange - Platform 10,stop_code: Woden Interchange - Platform 10, lat: -35.3439501, lng: 149.0877369}
+  - { name: Cohen St Bus Station - Platform 3,stop_code: Cohen St Bus Station - Platform 3, lat: -35.239764, lng: 149.0604531}
+  - { name: Alexander Maconochie Centre Hume,stop_code: Alexander Maconochie Centre Hume, lat: -35.3720651, lng: 149.1696618}
+  - { name: Brindabella Gardens Nursing Home,stop_code: Brindabella Gardens Nursing Home, lat: -35.3294459, lng: 149.0806116}
+  - { name: Erindale Centre /Sternberg Crescent,stop_code: Erindale Centre /Sternberg Crescent, lat: -35.4014472, lng: 149.0956545}
+  - { name: Farrer Terminus,stop_code: Farrer Terminus, lat: -35.3771794, lng: 149.1046948}
+  - { name: Fyshwick Direct Factory Outlet,stop_code: Fyshwick Direct Factory Outlet, lat: -35.3359862, lng: 149.1796322}
+  - { name: Jamison Centre,stop_code: Jamison Centre, lat: -35.2527268, lng: 149.0713712}
+  - { name: Katherine / Horse Park,stop_code: Katherine / Horse Park, lat: -35.1680901, lng: 149.1321801}
+  - { name: Merici Braddon,stop_code: Merici Braddon, lat: -35.266525, lng: 149.137037}
+  - { name: St Francis Xavier Florey,stop_code: St Francis Xavier Florey, lat: -35.223951, lng: 149.0406888}
+  - { name: Taverner/Erindale,stop_code: Taverner/Erindale, lat: -35.4059104, lng: 149.0809317}
+  - { name: Wanniassa High,stop_code: Wanniassa High, lat: -35.3952462, lng: 149.0852655}
+  - { name: Weetangera Shops,stop_code: Weetangera Shops, lat: -35.248393, lng: 149.0506342}
+  - { name: Weston Creek Terminus,stop_code: Weston Creek Terminus, lat: -35.342728, lng: 149.0524906}
+  - { name: Athllon/Sulwood Kambah,stop_code: Athllon/Sulwood Kambah, lat: -35.4119485, lng: 149.0617748}
+  - { name: Cnr Kerrigan/Lhotsky,stop_code: Cnr Kerrigan/Lhotsky, lat: -35.1995716, lng: 149.0285277}
+  - { name: Flemington Rd/Sandford St,stop_code: Flemington Rd/Sandford St, lat: -35.2008585, lng: 149.1493407}
+  - { name: Kosciuszko/Everard,stop_code: Kosciuszko/Everard, lat: -35.188901, lng: 149.1216937}
+  - { name: Livingston Shops Kambah,stop_code: Livingston Shops Kambah, lat: -35.3883359, lng: 149.0811471}
+  - { name: Majura Business Park,stop_code: Majura B