projects / bus.git / commitdiff
search:
summary | shortlog | log | commit | commitdiff | tree
side by side | plain
More network 10 updates
More network 10 updates

file:a/.gitignore -> file:b/.gitignore 
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-maxious-canberra-transit-feed/source-html
 origin-src
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
@@ -42,7 +42,12 @@
  "Newcastle Streetafter Isa Street"=>"Newcastle Street after Isa Street",
  "William Web / Ginninderra Drive"=>"William Webb / Ginninderra Drive",
  "Procor / Mead"=>"Proctor / Mead",
-"Fyshwick DirectFactory Outlet"=>"Fyshwick Direct Factory Outlet"
+"Fyshwick DirectFactory Outlet"=>"Fyshwick Direct Factory Outlet",
+"Dickson ShopsAntill Street"=>"Dickson Shops/Antill St",
+"Yarrulumla Shops"=>"Yarralumla Shops",
+"Tharwa Dr / Pocket Ave"=>"Tharwa Dr / Pockett Ave",
+"Paul Coe / Mirrebei Dr"=>"Paul Coe / Mirrabei Dr",
+"Mirrebei Drive / Dam Wall"=>"Mirrabei Drive / Dam Wall"
 }
 
 time_point_corrections.each do |wrong, right|
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
@@ -12,7 +12,7 @@
    url = "#{base_url}#{URI.encode(query)}&bbox=-35.47,148.83,-35.16,149.25&return_location=true"
    resp = Net::HTTP.get_response(URI.parse(url))
    data = resp.body
-
+pp url
    # we convert the returned JSON data to native Ruby
    # data structure - a hash
    result = JSON.parse(data)
@@ -51,12 +51,11 @@
 
 connbus = PGconn.connect("localhost", 5432, '', '', "bus", "postgres", 
 "snmc")
-connosm = PGconn.connect("localhost", 5432, '', '', "openstreetmap", "postgres", "snmc")
 
 if ask_if("Insert Timing Point names to database?")
 	$time_points.each do |time_point|
 		begin
-			time_point = time_point.gsub(/\\/, '\&\&').gsub(/'/, "''")
+			time_point = time_point.gsub(/\\/, '\&\&').gsub(/'/, "''") # DON'T PUT MORE GSUB HERE
 			res = connbus.exec("INSERT INTO timing_point (name) VALUES ('#{time_point}')")
 			puts "Put '#{time_point}' into DB"
 		rescue PGError => e
@@ -67,164 +66,6 @@
 end
 
 
-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
-                puts "Error selecting null points from DB #{e}"
-                #conn.close() if conn
-        end
-
-	null_points.each do |null_point_name|
-		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 '%#{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
-                	puts "Error selecting matching bus stops from DB #{e}"
-        	        #conn.close() if conn
-	        end
-		suggested_nodes = Hash.new()
-
-		matching_nodes.each do |matching_node_row|
-			#pp matching_node_row
-			# 0 = id
-			# 1 = k
-			# 2 = v
-			# 3,4 = redundant ids
-			# 5 = lat*100000
-			# 6 = lng*100000
-			suggested_node = suggested_nodes.fetch(matching_node_row[0], {'lat' => Float(matching_node_row[5])/10000000,
-										      'lng' => Float(matching_node_row[6])/10000000})
-			if matching_node_row[1] == "ref"
-				matching_node_row[1] = "loc_ref"
-			end
-			suggested_node[matching_node_row[1]] = matching_node_row[2]
-			suggested_nodes[matching_node_row[0]] = suggested_node
-		end
-		pp suggested_nodes
-		nodeID = ask("Enter selected node ID:", :string) 
-		if suggested_nodes.has_key?(nodeID)
-			node = suggested_nodes.fetch(nodeID)
-			guess = ask_if("Is this a guess?")
-			puts "Location #{node["lat"]},#{node["lng"]} for #{null_point_name}"
-			begin
-                	        res = connbus.exec("UPDATE timing_point SET lat = #{node["lat"]*10000000}, lng = 
-#{node["lng"]*10000000},osm_node = #{nodeID}" + (node.has_key?("loc_ref") ? ",loc_ref = #{node["loc_ref"]}" : "") + ",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
-		
-		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
 if ask_if("Fill null Timing Points from geocoder?")
 	begin
 		null_points = connbus.exec('SELECT name FROM timing_point WHERE lat IS null OR lng IS null;')
@@ -236,7 +77,7 @@
 	null_points.each do |null_point_name|
 		pp null_point_name
 		name = null_point_name.to_s.gsub(/\\/, '\&\&').gsub(/'/, "''")
-		results = cbr_geocode(null_point_name[0])
+		results = cbr_geocode(null_point_name.to_s.gsub("Shops", ""))
 		if !results.empty? 
 			results['features'].each_with_index { |feature,index|
 				print "#{index}: #{feature['properties']['name']} (#{feature['location']}) => #{feature['centroid']['coordinates']}\n"
file:a/maxious-canberra-transit-feed/cbrfeed.zip (deleted) 
 Binary files a/maxious-canberra-transit-feed/cbrfeed.zip and /dev/null differ
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
@@ -8,185 +8,229 @@
 
 
 stops:
+  - { name: ACTEW AGL House,stop_code: ACTEW AGL House, lat: -35.282374, lng: 149.132047}
   - { name: ADFA,stop_code: ADFA, lat: -35.2937972, lng: 149.1643403}
   - { name: Ainslie,stop_code: Ainslie, lat: -35.2620105, lng: 149.1443302}
-  - { name: Alexander Maconochie Centre Hume,stop_code: Alexander Maconochie Centre Hume, lat: -35.3720651, lng: 149.1696618}
+  - { name: Ainslie Shops,stop_code: Ainslie Shops, lat: -35.26198, lng: 149.14535}
+  - { name: Alexander Maconochie Centre,stop_code: Alexander Maconochie Centre, lat: -35.3720651, lng: 149.1696618}
   - { name: Alpen & Clifford St,stop_code: Alpen & Clifford St, lat: -35.20562, lng: 149.06259}
-  - { name: Anthony Rolfe/Moonlight,stop_code: Anthony Rolfe/Moonlight, lat: -35.1856021, lng: 149.1543639}
+  - { name: Anthony Rolfe Av / Moonlight Av,stop_code: Anthony Rolfe Av / Moonlight Av, lat: -35.1856021, lng: 149.1543639}
   - { name: Aranda,stop_code: Aranda, lat: -35.257534, lng: 149.0762963}
-  - { name: Athllon/Sulwood Kambah,stop_code: Athllon/Sulwood Kambah, lat: -35.38442, lng: 149.09328}
-  - { name: Australian Institute Sports Bruce,stop_code: Australian Institute Sports Bruce, lat: -35.246351, lng: 149.101478}
+  - { name: Aranda Shops,stop_code: Aranda Shops, lat: -35.25753, lng: 149.0763}
+  - { name: Athllon / Sulwood, Kambah,stop_code: Athllon / Sulwood, Kambah, lat: -35.38442, lng: 149.09328}
+  - { name: Australian Institute of Sport,stop_code: Australian Institute of Sport, lat: -35.246351, lng: 149.101478}
+  - { name: Belconnen Community Bus Station,stop_code: Belconnen Community Bus Station, lat: -35.23987, lng: 149.0619}
+  - { name: Belconnen Community Bus Station (Platform 1),stop_code: Belconnen Community Bus Station (Platform 1), lat: -35.23982, lng: 149.06978}
+  - { name: Belconnen Community Bus Station (Platform 2),stop_code: Belconnen Community Bus Station (Platform 2), lat: -35.23982, lng: 149.06926}
+  - { name: Belconnen Community Bus Station (Platform 3),stop_code: Belconnen Community Bus Station (Platform 3), lat: -35.23986, lng: 149.06847}
+  - { name: Belconnen Community Bus Station (Platform 4),stop_code: Belconnen Community Bus Station (Platform 4), lat: -35.23994, lng: 149.06887}
+  - { name: Belconnen Community Bus Station (Platform 5),stop_code: Belconnen Community Bus Station (Platform 5), lat: -35.23994, lng: 149.06928}
+  - { name: Belconnen Community Bus Station (Platform 6),stop_code: Belconnen Community Bus Station (Platform 6), lat: -35.23994, lng: 149.0698}
   - { name: Belconnen Way,stop_code: Belconnen Way, lat: -35.24809, lng: 149.06765}
   - { name: Bimberi Centre,stop_code: Bimberi Centre, lat: -35.2219941, lng: 149.1546928}
   - { name: Black Mountain Telstra Tower,stop_code: Black Mountain Telstra Tower, lat: -35.2748058, lng: 149.0972461}
   - { name: Bonython,stop_code: Bonython, lat: -35.4297416, lng: 149.0814517}
-  - { name: Bonython Primary,stop_code: Bonython Primary, lat: -35.431019, lng: 149.0831217}
+  - { name: Bonython Primary School,stop_code: Bonython Primary School, lat: -35.431019, lng: 149.0831217}
   - { name: Botanic Gardens,stop_code: Botanic Gardens, lat: -35.278643, lng: 149.1093237}
   - { name: Brindabella Business Park,stop_code: Brindabella Business Park, lat: -35.314496, lng: 149.189145}
   - { name: Brindabella Gardens Nursing Home,stop_code: Brindabella Gardens Nursing Home, lat: -35.3294459, lng: 149.0806116}
-  - { name: Bugden/Sternberg,stop_code: Bugden/Sternberg, lat: -35.4017223, lng: 149.0992172}
-  - { name: Burton & Garran Hall/Daley Road ANU,stop_code: Burton & Garran Hall/Daley Road ANU, lat: -35.2753671, lng: 149.1172822}
+  - { name: Bugden Sternberg,stop_code: Bugden Sternberg, lat: -35.4017223, lng: 149.0992172}
+  - { name: Burton and Garran Hall, Daley Road,stop_code: Burton and Garran Hall, Daley Road, lat: -35.2753671, lng: 149.1172822}
   - { name: Calvary Hospital,stop_code: Calvary Hospital, lat: -35.25212, lng: 149.09088}
   - { name: Calwell Shops,stop_code: Calwell Shops, lat: -35.43524, lng: 149.113942}
   - { name: 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: 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: Campbell Park Offices,stop_code: Campbell Park Offices, lat: -35.28368, lng: 149.17045}
-  - { name: Canberra College Weston,stop_code: Canberra College Weston, lat: -35.3490278, lng: 149.0486277}
+  - { name: Canberra College, Weston Campus,stop_code: Canberra College, Weston Campus, 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: Caswell Drive,stop_code: Caswell Drive, lat: -35.25922, lng: 149.08576}
   - { name: Causeway,stop_code: Causeway, lat: -35.31615, lng: 149.15058}
-  - { name: Centre Link Tuggeranong,stop_code: Centre Link Tuggeranong, lat: -35.4207496, lng: 149.0700973}
+  - { name: Centrelink Tuggeranong,stop_code: Centrelink Tuggeranong, lat: -35.4207496, lng: 149.0700973}
   - { name: Chapman,stop_code: Chapman, lat: -35.3557877, lng: 149.0408111}
+  - { name: Chapman Shops,stop_code: Chapman Shops, lat: -35.35579, lng: 149.04082}
   - { name: Charnwood,stop_code: Charnwood, lat: -35.2052138, lng: 149.0337266}
+  - { name: Charnwood Shops,stop_code: Charnwood Shops, lat: -35.20472, lng: 149.03336}
+  - { name: Charnwood, Tillyard Dr,stop_code: Charnwood, Tillyard Dr, lat: -35.20295, lng: 149.04027}
   - { name: Chifley,stop_code: Chifley, lat: -35.350985, lng: 149.077319}
+  - { name: Chifley Shops,stop_code: Chifley Shops, lat: -35.35099, lng: 149.07732}
   - { name: Chisholm Shops,stop_code: Chisholm Shops, lat: -35.41341, lng: 149.12833}
-  - { name: Chuculba/William Slim,stop_code: Chuculba/William Slim, lat: -35.2103241, lng: 149.0997736}
-  - { name: City Interchange,stop_code: City Interchange, lat: -35.2794346, lng: 149.1305879}
-  - { 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 11,stop_code: City Interchange - Platform 11, lat: -35.2787905, lng: 149.1288627}
-  - { 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 5,stop_code: City Interchange - Platform 5, lat: -35.2785242, lng: 149.1297348}
-  - { 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: Citywest,stop_code: Citywest, lat: -35.2788605, lng: 149.1257969}
+  - { name: Chuculba / William Slim Dr,stop_code: Chuculba / William Slim Dr, lat: -35.208931, lng: 149.088499}
+  - { name: CIT Weston,stop_code: CIT Weston, lat: -35.330234, lng: 149.058632}
+  - { name: City Bus Station,stop_code: City Bus Station, lat: -35.2794346, lng: 149.1305879}
+  - { name: City Bus Station (Platform 1),stop_code: City Bus Station (Platform 1), lat: -35.2794346, lng: 149.1305879}
+  - { name: City Bus Station (Platform 10),stop_code: City Bus Station (Platform 10), lat: -35.2793571, lng: 149.1293659}
+  - { name: City Bus Station (Platform 11),stop_code: City Bus Station (Platform 11), lat: -35.2787905, lng: 149.1288627}
+  - { name: City Bus Station (Platform 2),stop_code: City Bus Station (Platform 2), lat: -35.278907, lng: 149.130612}
+  - { name: City Bus Station (Platform 3),stop_code: City Bus Station (Platform 3), lat: -35.2787886, lng: 149.1304779}
+  - { name: City Bus Station (Platform 4),stop_code: City Bus Station (Platform 4), lat: -35.2785658, lng: 149.1301727}
+  - { name: City Bus Station (Platform 5),stop_code: City Bus Station (Platform 5), lat: -35.2785242, lng: 149.1297348}
+  - { name: City Bus Station (Platform 7),stop_code: City Bus Station (Platform 7), lat: -35.27843, lng: 149.130345}
+  - { name: City Bus Station (Platform 8),stop_code: City Bus Station (Platform 8), lat: -35.2778798, lng: 149.1305995}
+  - { name: City Bus Station (Platform 9),stop_code: City Bus Station (Platform 9), lat: -35.2783224, lng: 149.130726}
+  - { name: City West,stop_code: City West, lat: -35.2788605, lng: 149.1257969}
   - { name: Cnr Kerrigan/Lhotsky,stop_code: Cnr Kerrigan/Lhotsky, lat: -35.1995716, lng: 149.0285277}
   - { name: Cnr Tillyard Dr & Spalding St,stop_code: Cnr Tillyard Dr & Spalding St, lat: -35.2040477, lng: 149.0393052}
-  - { name: Cohen St Bus Station,stop_code: Cohen St Bus Station, lat: -35.2394775, lng: 149.0602031}
-  - { name: Cohen St Bus Station - Platform 1,stop_code: Cohen St Bus Station - Platform 1, 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: Cohen St Bus Station - Platform 3,stop_code: Cohen St Bus Station - Platform 3, lat: -35.239764, lng: 149.0604531}
-  - { 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: Cohen Street Bus Station,stop_code: Cohen Street Bus Station, lat: -35.2394775, lng: 149.0602031}
+  - { name: Cohen Street Bus Station (Platform 1),stop_code: Cohen Street Bus Station (Platform 1), lat: -35.2394775, lng: 149.0602031}
+  - { name: Cohen Street Bus Station (Platform 2),stop_code: Cohen Street Bus Station (Platform 2), lat: -35.2396467, lng: 149.0602152}
+  - { name: Cohen Street Bus Station (Platform 3),stop_code: Cohen Street Bus Station (Platform 3), lat: -35.239764, lng: 149.0604531}
+  - { name: Cohen Street Bus Station (Platform 4),stop_code: Cohen Street Bus Station (Platform 4), lat: -35.239844, lng: 149.0600683}
+  - { name: Cohen Street Bus Station (Platform 5),stop_code: Cohen Street Bus Station (Platform 5), lat: -35.2401211, lng: 149.0597102}
+  - { name: Cohen Street Bus Station (Platform 6),stop_code: Cohen Street Bus Station (Platform 6), lat: -35.2400028, lng: 149.060315}
   - { name: Conder Primary,stop_code: Conder Primary, lat: -35.4643475, lng: 149.0986908}
   - { name: Cook,stop_code: Cook, lat: -35.2596, lng: 149.0638}
+  - { name: Cook Shops,stop_code: Cook Shops, lat: -35.25898, lng: 149.06343}
   - { name: Cooleman Court,stop_code: Cooleman Court, lat: -35.34147, lng: 149.05338}
   - { 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: Curtin Shops,stop_code: Curtin Shops, lat: -35.32515, lng: 149.08224}
   - { name: Deakin,stop_code: Deakin, lat: -35.3158608, lng: 149.1084563}
-  - { name: Deamer/Clift Richardson,stop_code: Deamer/Clift Richardson, lat: -35.4319597, lng: 149.1187876}
+  - { name: Deakin Shops,stop_code: Deakin Shops, lat: -35.31473, lng: 149.10771}
+  - { name: Deamer / Clift Richardson,stop_code: Deamer / Clift Richardson, lat: -35.4319597, lng: 149.1187876}
   - { name: Dickson,stop_code: Dickson, lat: -35.2498434, lng: 149.1391218}
   - { name: Dickson College,stop_code: Dickson College, lat: -35.24923, lng: 149.15315}
   - { name: Dickson Cowper St,stop_code: Dickson Cowper St, lat: -35.250297, lng: 149.141336}
+  - { name: Dickson Shops,stop_code: Dickson Shops, lat: -35.25045, lng: 149.14044}
   - { name: Dickson Shops/Antill St,stop_code: Dickson Shops/Antill St, lat: -35.2251335, lng: 149.1658895}
   - { name: Duffy,stop_code: Duffy, lat: -35.3366908, lng: 149.0324311}
-  - { name: Duffy Primary School,stop_code: Duffy Primary School, lat: -35.334219, lng: 149.033656}
+  - { name: Duffy Primary,stop_code: Duffy Primary, lat: -35.334219, lng: 149.033656}
   - { name: Dunlop,stop_code: Dunlop, lat: -35.1942693, lng: 149.0206702}
-  - { name: Electricity House,stop_code: Electricity House, lat: -35.282374, lng: 149.132047}
   - { name: Erindale Centre,stop_code: Erindale Centre, lat: -35.4038881, lng: 149.0992283}
-  - { name: Erindale Centre /Sternberg Crescent,stop_code: Erindale Centre /Sternberg Crescent, lat: -35.4014472, lng: 149.0956545}
-  - { 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: Erindale Dr / Charleston St, Monash,stop_code: Erindale Dr / Charleston St, Monash, lat: -35.414616, lng: 149.07888}
+  - { name: Erindale / Sternberg Cres,stop_code: Erindale / Sternberg Cres, lat: -35.4014472, lng: 149.0956545}
   - { name: Evatt,stop_code: Evatt, lat: -35.2091093, lng: 149.0735343}
+  - { name: Evatt Shops,stop_code: Evatt Shops, lat: -35.21203, lng: 149.06505}
   - { name: Eye Hospital,stop_code: Eye Hospital, lat: -35.3341884, lng: 149.1656213}
   - { name: Fairbairn Park,stop_code: Fairbairn Park, lat: -35.3001773, lng: 149.2041185}
   - { name: Farrer Primary School,stop_code: Farrer Primary School, lat: -35.37887, lng: 149.10641}
   - { name: Farrer Terminus,stop_code: Farrer Terminus, lat: -35.3771794, lng: 149.1046948}
   - { 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: Flemington/Nullabor,stop_code: Flemington/Nullabor, lat: -35.2008585, lng: 149.1493407}
+  - { name: Fisher Shops,stop_code: Fisher Shops, lat: -35.36056, lng: 149.05765}
   - { name: Flemington Rd,stop_code: Flemington Rd, lat: -35.20756, lng: 149.14778}
-  - { name: Flemington Rd/Sandford St,stop_code: Flemington Rd/Sandford St, lat: -35.2008585, lng: 149.1493407}
+  - { name: Flemington Rd / Nullabor Ave,stop_code: Flemington Rd / Nullabor Ave, lat: -35.2008585, lng: 149.1493407}
+  - { name: Flemington Road / Sandford St,stop_code: Flemington Road / Sandford St, lat: -35.2008585, lng: 149.1493407}
   - { name: Florey Shops,stop_code: Florey Shops, lat: -35.2258544, lng: 149.0546214}
   - { name: Flynn,stop_code: Flynn, lat: -35.2019283, lng: 149.0478356}
   - { name: Fraser,stop_code: Fraser, lat: -35.1896539, lng: 149.0435012}
   - { name: Fraser East Terminus,stop_code: Fraser East Terminus, lat: -35.1896539, lng: 149.0435012}
+  - { name: Fraser Shops,stop_code: Fraser Shops, lat: -35.18966, lng: 149.0435}
   - { name: Fraser West Terminus,stop_code: Fraser West Terminus, lat: -35.191513, lng: 149.038006}
   - { name: Fyshwick Direct Factory Outlet,stop_code: Fyshwick Direct Factory Outlet, lat: -35.3359862, lng: 149.1796322}
   - { name: Fyshwick Terminus,stop_code: Fyshwick Terminus, lat: -35.3285202, lng: 149.1785592}
   - { name: Garran,stop_code: Garran, lat: -35.3423286, lng: 149.10811}
+  - { name: Garran Shops,stop_code: Garran Shops, lat: -35.34236, lng: 149.1082}
   - { 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: Gordon Primary,stop_code: Gordon Primary, lat: -35.455517, lng: 149.086978}
   - { name: Gowrie,stop_code: Gowrie, lat: -35.4120264, lng: 149.1110804}
-  - { name: Gungahlin Market Place,stop_code: Gungahlin Market Place, lat: -35.1769532, lng: 149.1319017}
+  - { name: Gungahlin Marketplace,stop_code: Gungahlin Marketplace, lat: -35.1769532, lng: 149.1319017}
   - { name: Gwydir Square Kaleen,stop_code: Gwydir Square Kaleen, lat: -35.2338677, lng: 149.1031998}
   - { name: Hackett,stop_code: Hackett, lat: -35.2481617, lng: 149.1626094}
+  - { name: Hackett Shops,stop_code: Hackett Shops, lat: -35.24825, lng: 149.16271}
   - { 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: Hawker Shops,stop_code: Hawker Shops, lat: -35.24398, lng: 149.04361}
   - { name: Heagney/Clift Richardson,stop_code: Heagney/Clift Richardson, lat: -35.4251299, lng: 149.11375}
-  - { name: Hibberson/Kate Crace,stop_code: Hibberson/Kate Crace, lat: -35.1861642, lng: 149.1391756}
+  - { name: Hibberson / Kate Crace,stop_code: Hibberson / Kate Crace, lat: -35.1861642, lng: 149.1391756}
   - { name: Higgins,stop_code: Higgins, lat: -35.2313901, lng: 149.0271811}
+  - { name: Higgins Shops,stop_code: Higgins Shops, lat: -35.23136, lng: 149.02611}
   - { name: Holder,stop_code: Holder, lat: -35.3378123, lng: 149.0449433}
+  - { name: Holder Shops,stop_code: Holder Shops, lat: -35.33781, lng: 149.04494}
   - { name: Holt,stop_code: Holt, lat: -35.223099, lng: 149.0126269}
-  - { name: Hospice,stop_code: Hospice, lat: -35.3029, lng: 149.14957}
+  - { name: Holt Shops,stop_code: Holt Shops, lat: -35.2231, lng: 149.01263}
+  - { name: Hoskins Street / Oodgeroo Ave,stop_code: Hoskins Street / Oodgeroo Ave, lat: -35.201095, lng: 149.139941}
+  - { name: Hospice / Menindee Dr,stop_code: Hospice / Menindee Dr, lat: -35.303557, lng: 149.151627}
   - { name: Hughes,stop_code: Hughes, lat: -35.3339223, lng: 149.093854}
+  - { name: Hughes Shops,stop_code: Hughes Shops, lat: -35.3335, lng: 149.09392}
   - { name: Isaacs,stop_code: Isaacs, lat: -35.3669823, lng: 149.1119217}
+  - { name: Isaacs Shops,stop_code: Isaacs Shops, lat: -35.36698, lng: 149.11192}
   - { name: Isabella Shops,stop_code: Isabella Shops, lat: -35.4285703, lng: 149.0916837}
   - { name: Jamison Centre,stop_code: Jamison Centre, lat: -35.2527268, lng: 149.0713712}
   - { 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: Kaleen Village / Maibrynong,stop_code: Kaleen Village / Maibrynong, lat: -35.220819, lng: 149.099751}
+  - { 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: Kambah Village,stop_code: Kambah Village, lat: -35.3800314, lng: 149.0576581}
-  - { name: Katherine / Horse Park,stop_code: Katherine / Horse Park, lat: -35.1680901, lng: 149.1321801}
-  - { name: Kings Ave/National Crt,stop_code: Kings Ave/National Crt, lat: -35.3062755, lng: 149.1291434}
+  - { name: Katherine Ave / Horse Park Drive,stop_code: Katherine Ave / Horse Park Drive, lat: -35.1680901, lng: 149.1321801}
+  - { name: Kerrigan / Lhotsky,stop_code: Kerrigan / Lhotsky, lat: -35.193801, lng: 149.035689}
+  - { name: Kings Ave / National Circuit,stop_code: Kings Ave / National Circuit, lat: -35.305004, lng: 149.13262}
   - { name: Kingston,stop_code: Kingston, lat: -35.3197448, lng: 149.1375261}
   - { name: Kippax,stop_code: Kippax, lat: -35.22225, lng: 149.0195627}
   - { name: Kippax Centre,stop_code: Kippax Centre, lat: -35.22172, lng: 149.01995}
-  - { name: Kosciuszko/Everard,stop_code: Kosciuszko/Everard, lat: -35.188901, lng: 149.1216937}
+  - { name: Kosciuszko / Everard,stop_code: Kosciuszko / Everard, lat: -35.188901, lng: 149.1216937}
   - { name: Lanyon Market Place,stop_code: Lanyon Market Place, lat: -35.4573, lng: 149.09199}
+  - { name: Latham Post Office,stop_code: Latham Post Office, lat: -35.21906, lng: 149.03223}
   - { name: Latham Shops,stop_code: Latham Shops, lat: -35.21848, lng: 149.03214}
   - { name: Lathlain St Bus Station,stop_code: Lathlain St Bus Station, lat: -35.2396657, lng: 149.0633993}
-  - { 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 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: 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: 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 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: 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: Lewis Luxton/Woodcock Dr,stop_code: Lewis Luxton/Woodcock Dr, lat: -35.4422566, lng: 149.0854375}
+  - { name: Lithgow St Terminus,stop_code: Lithgow St Terminus, lat: -35.32899, lng: 149.16942}
   - { name: Lithgow St Terminus Fyshwick,stop_code: Lithgow St Terminus Fyshwick, lat: -35.3296912, lng: 149.1668153}
   - { name: Livingston Shops Kambah,stop_code: Livingston Shops Kambah, lat: -35.3883359, lng: 149.0811471}
+  - { name: Livingston Shops / Kambah,stop_code: Livingston Shops / Kambah, lat: -35.390246, lng: 149.07822}
   - { name: Lyneham,stop_code: Lyneham, lat: -35.2523304, lng: 149.1246184}
+  - { name: Lyneham , ACT, Wattle Street,stop_code: Lyneham , ACT, Wattle Street, lat: -35.36253, lng: 149.22632}
   - { name: Lyneham High,stop_code: Lyneham High, lat: -35.2524016, lng: 149.130254}
+  - { name: Lyneham Shops, Wattle Street,stop_code: Lyneham Shops, Wattle Street, lat: -35.25205, lng: 149.12524}
   - { name: Lyons,stop_code: Lyons, lat: -35.3415779, lng: 149.0765703}
+  - { name: Lyons Shops,stop_code: Lyons Shops, lat: -35.34019, lng: 149.0771}
   - { 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: Macarthur / Northbourne Ave,stop_code: Macarthur / Northbourne Ave, lat: -35.2481997, lng: 149.134308}
   - { name: Macgregor Shops,stop_code: Macgregor Shops, lat: -35.2100645, lng: 149.0122952}
-  - { name: MacKillop College Isabella Campus,stop_code: MacKillop College Isabella Campus, lat: -35.42597, lng: 149.09172}
-  - { name: MacKillop College Wanniassa Campus,stop_code: MacKillop College Wanniassa Campus, lat: -35.4056, lng: 149.089774}
+  - { name: MacKillop College, Isabella Campus,stop_code: MacKillop College, Isabella Campus, lat: -35.42597, lng: 149.09172}
+  - { name: MacKillop College, Wanniassa Campus,stop_code: MacKillop College, Wanniassa Campus, lat: -35.4056, lng: 149.089774}
   - { name: Macquarie,stop_code: Macquarie, lat: -35.2483414, lng: 149.0600666}
   - { name: Majura Business Park,stop_code: Majura Business Park, lat: -35.2987, lng: 149.18561}
+  - { name: Manning Clarke / Oodgeroo,stop_code: Manning Clarke / Oodgeroo, lat: -35.193236, lng: 149.146534}
   - { name: Manuka,stop_code: Manuka, lat: -35.3200096, lng: 149.1341344}
-  - { name: Manuka/Captain Cook,stop_code: Manuka/Captain Cook, lat: -35.3217, lng: 149.13445}
+  - { name: Manuka / Captain Cook Cres,stop_code: Manuka / Captain Cook Cres, lat: -35.3217, lng: 149.13445}
   - { name: McKellar,stop_code: McKellar, lat: -35.2174267, lng: 149.0742108}
+  - { name: McKellar Shops,stop_code: McKellar Shops, lat: -35.2182, lng: 149.07555}
   - { name: Melba,stop_code: Melba, lat: -35.2083104, lng: 149.0485366}
-  - { name: Menindee Drive - Hospice,stop_code: Menindee Drive - Hospice, lat: -35.3024506, lng: 149.149499}
-  - { name: Mentone View/Tharwa Drive,stop_code: Mentone View/Tharwa Drive, lat: -35.45144, lng: 149.0919}
-  - { name: Merici Braddon,stop_code: Merici Braddon, lat: -35.266525, lng: 149.137037}
+  - { name: Melba Shops,stop_code: Melba Shops, lat: -35.21004, lng: 149.05302}
+  - { name: Mentone View / Tharwa Drive,stop_code: Mentone View / Tharwa Drive, lat: -35.45144, lng: 149.0919}
+  - { name: Merici College,stop_code: Merici College, lat: -35.266525, lng: 149.137037}
+  - { name: Mirrabei Drive / Dam Wall,stop_code: Mirrabei Drive / Dam Wall, lat: -35.177453, lng: 149.124291}
   - { name: Monash,stop_code: Monash, lat: -35.4190254, lng: 149.0834805}
+  - { name: Monash, Goodwin Village,stop_code: Monash, Goodwin Village, lat: -35.421084, lng: 149.097438}
   - { name: Monash Primary,stop_code: Monash Primary, lat: -35.414879, lng: 149.089411}
   - { name: Mount Neighbour School,stop_code: Mount Neighbour School, lat: -35.382445, lng: 149.051518}
   - { name: Narrabundah College,stop_code: Narrabundah College, lat: -35.3362106, lng: 149.1471005}
   - { name: Narrabundah Terminus,stop_code: Narrabundah Terminus, lat: -35.332605, lng: 149.154049}
   - { name: National Aquarium,stop_code: National Aquarium, lat: -35.29915, lng: 149.07025}
-  - { name: National Circuit / Canberra Ave,stop_code: National Circuit / Canberra Ave, lat: -35.31407, lng: 149.13011}
+  - { name: National Circ / Canberra Ave,stop_code: National Circ / Canberra Ave, lat: -35.31407, lng: 149.13011}
   - { name: National Hockey Centre Lyneham,stop_code: National Hockey Centre Lyneham, lat: -35.2446729, lng: 149.1288303}
-  - { name: National Museum,stop_code: National Museum, lat: -35.29248, lng: 149.1205367}
-  - { name: Newcastle / Isa Street Fyshwick,stop_code: Newcastle / Isa Street Fyshwick, lat: -35.3255, lng: 149.173291}
+  - { name: National Museum of Australia,stop_code: National Museum of Australia, lat: -35.29248, lng: 149.1205367}
+  - { name: Newcastle Street after Isa Street,stop_code: Newcastle Street after Isa Street, lat: -35.3255, lng: 149.173291}
   - { name: Ngunnawal Primary,stop_code: Ngunnawal Primary, lat: -35.1688551, lng: 149.1112569}
   - { 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.248287, lng: 149.134241}
+  - { name: Northbourne Avenue / Antill St,stop_code: Northbourne Avenue / Antill St, lat: -35.248287, lng: 149.134241}
   - { name: North Lyneham,stop_code: North Lyneham, lat: -35.2385618, lng: 149.1221188}
   - { name: O'Connor,stop_code: O'Connor, lat: -35.2640376, lng: 149.1226107}
+  - { name: O'Connor Shops,stop_code: O'Connor Shops, lat: -35.25662, lng: 149.11559}
   - { name: Olims Hotel,stop_code: Olims Hotel, lat: -35.27597, lng: 149.1428}
   - { name: Outtrim / Duggan,stop_code: Outtrim / Duggan, lat: -35.435871, lng: 149.097692}
   - { name: Page Shops,stop_code: Page Shops, lat: -35.2360695, lng: 149.0536554}
   - { name: Parliament House,stop_code: Parliament House, lat: -35.3081571, lng: 149.1244592}
-  - { name: Paul Coe / Mirrabei,stop_code: Paul Coe / Mirrabei, lat: -35.17467, lng: 149.12005}
+  - { name: Paul Coe / Mirrabei Dr,stop_code: Paul Coe / Mirrabei Dr, lat: -35.17467, lng: 149.12005}
   - { name: Pearce,stop_code: Pearce, lat: -35.3625413, lng: 149.0815935}
   - { name: Police College Weston,stop_code: Police College Weston, lat: -35.33018, lng: 149.05458}
   - { name: Proctor / Mead,stop_code: Proctor / Mead, lat: -35.415305, lng: 149.127204}
   - { name: Railway Station Kingston,stop_code: Railway Station Kingston, lat: -35.319602, lng: 149.149083}
   - { name: Red Hill,stop_code: Red Hill, lat: -35.336505, lng: 149.131645}
   - { name: Rivett,stop_code: Rivett, lat: -35.3473758, lng: 149.0365438}
+  - { name: Rivett Shops,stop_code: Rivett Shops, lat: -35.34737, lng: 149.03654}
   - { name: Russell Offices,stop_code: Russell Offices, lat: -35.2973294, lng: 149.1508803}
   - { name: Sainsbury Street,stop_code: Sainsbury Street, lat: -35.3885, lng: 149.09643}
   - { name: Saint Andrews Village Hughes,stop_code: Saint Andrews Village Hughes, lat: -35.328097, lng: 149.088685}
@@ -195,3445 +239,2481 @@