From: maxious Date: Tue, 02 Nov 2010 13:59:56 +0000 Subject: More network 10 updates X-Git-Url: https://maxious.lambdacomplex.org/git/?p=bus.git&a=commitdiff&h=cbd4cfb99deafe3b04112026dc22776df8727d9f --- More network 10 updates --- --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -maxious-canberra-transit-feed/source-html origin-src --- a/betweenpoint.load.php +++ /dev/null @@ -1,76 +1,1 @@ - 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
"); - $sql = "INSERT INTO stops (geohash, lat, lng) VALUES('$geoPo','{$node['lat']}','{$node['lon']}')"; - $result = pg_query($conn, $sql); - if (!$result) { - echo("Error in SQL query: " . pg_last_error() ."
\n"); - } -flush(); - -} -?> --- a/betweenpoint.php +++ b/betweenpoint.php @@ -126,7 +126,7 @@ 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"]); + $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"] . ";"; } --- a/busui/list.php +++ /dev/null @@ -1,22 +1,1 @@ -
-
-

GET Example

- AJAX -
-
- This page was loaded via AJAX. -
- -
-
-
-

Events test

- AJAX - Home -
-
- This is a test of live events. -
-
+ --- a/busui/schedule_viewer.py +++ b/busui/schedule_viewer.py @@ -337,6 +337,14 @@ def handle_json_GET_stops(self, params): schedule = self.server.schedule return [StopToTuple(s) for s in schedule.GetStopList()] + + def handle_json_GET_timingpoints(self, params): + schedule = self.server.schedule + matches = [] + for s in schedule.GetStopList(): + if s.stop_code.find("Wj") == -1: + matches.append(StopToTuple(s)) + return matches def handle_json_GET_stopsearch(self, params): schedule = self.server.schedule --- a/maxious-canberra-transit-feed/01-extracttimes.rb +++ b/maxious-canberra-transit-feed/01-extracttimes.rb @@ -14,10 +14,16 @@ 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 != "
" - timing_point = tp.content.squeeze(" ").gsub("\r\n Platform"," - Platform").gsub(" - "," - ").gsub("\n","").gsub("\r","").gsub("\\"," / ").strip + timing_point = tp.content.squeeze(" ").gsub("Bus Station"," Bus Station ").gsub(" Platform"," (Platform").gsub(" - "," - ").gsub("\n"," ").gsub("\r"," ").gsub("\t"," ").gsub("\\"," / ").gsub("/"," / ").gsub(",",", ").gsub("\302\240","").squeeze(" ").strip + if (tp.content.match('Platform')) + timing_point.concat(")") + end; + timing_point end end time_points.delete(nil) + time_points.delete("WheelchairAccessible") + time_points.delete("Wheelchair Accessible") timetable["time_points"] = time_points.to_a timetable["long_name"] = "To " + time_points.last periodtimes = [] @@ -27,8 +33,11 @@ time = time.gsub(/ *A\S?M/,"a").gsub(/ ?P\S?M/,"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(/\.+/,"-") + time = time.gsub("11.","11").gsub("12.","12").gsub(/\.+/,"-").gsub("\302\240","") + if time == "" then time = nil end + time end + times.delete(nil) if not times.empty? if not (route = times.shift) raise("TODO: account for shifting route numbers eg. intertown/redex 62/162") @@ -42,7 +51,7 @@ timetable[period] = periodtimes.to_a # pp timetable filename = timetable["short_name"] + "-" + timetable["long_name"]+ "." + period + ".yml" - filename = filename.downcase.gsub(" ","-").gsub("/","-") + filename = filename.downcase.gsub(" ","-").gsub("/","-").gsub("(","").gsub(")","") puts "Saving " + filename File.open("#{File.dirname(__FILE__)}/output/"+filename, "w") do |f| f.write timetable.to_yaml @@ -50,7 +59,6 @@ timetable end -#TODO fix route 934 Dir.glob("source-html/Route*.htm*") { |file| puts "Opened " + file doc = Nokogiri::HTML(open(file)) @@ -58,7 +66,7 @@ timetables = [] short_name = ""; doc.xpath('//title').each do |title| - short_name = title.content.gsub("Route_","").gsub("Route ","").gsub(", ","/").squeeze(" ").strip + short_name = title.content.gsub("Route_","").gsub("Route ","").gsub(", ","/").gsub("ACTION Buses Timetable for ","").squeeze(" ").strip end if short_name == "" raise "Route number(s) not found in tag" @@ -67,7 +75,15 @@ doc.xpath('//table[preceding::text()="Weekdays"]').each do |table| timetables << makeTimetable(table, "stop_times", short_name) end - + doc.xpath('//table[preceding::text()="This timetable is effective from Monday 15th November 2010."]').each do |table| + timetables << makeTimetable(table, "stop_times", short_name) + end + #all tables are weekdays on some really malformatted timetables + if short_name == "170" + doc.xpath('//table').each do |table| + timetables << makeTimetable(table, "stop_times", short_name) + end + end #weekends doc.xpath('//table[preceding::text()="Saturdays" and following::a]').each do |table| timetables << makeTimetable(table, "stop_times_saturday", short_name) --- a/maxious-canberra-transit-feed/02-tidytimepoints.rb +++ b/maxious-canberra-transit-feed/02-tidytimepoints.rb @@ -2,9 +2,9 @@ require 'pp' require 'yaml' class Array - def to_yaml_style - :inline - end + def to_yaml_style + :inline + end end Dir.chdir("output") @@ -25,60 +25,31 @@ #pp $time_points_sources.sort time_point_corrections = {"North Lynehamham" => "North Lyneham", - "Lathlain St Platform 2" => "Lathlain St Bus Station - Platform 2", - "Lathlain St Sation - Platform 5" => "Lathlain St Bus Station - Platform 5", - "Lathlain Steet Station" => "Lathlain St Bus Station", - "Lathlain St - Platform 3" => "Lathlain St Bus Station - Platform 3", - "Lathlain Steet Station - Platform 3" => "Lathlain St Bus Station - Platform 3", - "Lathlain St Station" => "Lathlain St Bus Station", - "Lathlain St Station - Platform 1" => "Lathlain St Bus Station - Platform 1", - "Lathlain St Station - Platform 2" => "Lathlain St Bus Station - Platform 2", - "Lathlain St Station - Platform 3" => "Lathlain St Bus Station - Platform 3", - "Lathlain St Station - Platform 4" => "Lathlain St Bus Station - Platform 4", - "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", - "Canberra Hospita" => "Canberra Hospital", - "Cohen Str Station - Platform 1" => "Cohen St Bus Station - Platform 1", - "Cohen Street Station" => "Cohen St Bus Station", - "Cohen Street Station - Platform 2" => "Cohen St Bus Station - Platform 2", - "Cohn St Station - Platform 3" => "Cohen St Bus Station - Platform 3", - "Cohen St Station" => "Cohen St Bus Station", - "Cohen St Station - Platform 1" => "Cohen St Bus Station - Platform 1", - "Cohen St Station - Platform 2" => "Cohen St Bus Station - Platform 2", - "Cohen St Station - Platform 3" => "Cohen St Bus Station - Platform 3", - "Cohen St Station - Platform 4" => "Cohen St Bus Station - Platform 4", - "Cohen St Station - Platform 5" => "Cohen St Bus Station - Platform 5", - "Cohen St Station - Platform 6" => "Cohen St Bus Station - Platform 6", - "City - Platform 7" => "City Interchange - Platform 7", - "Cameron Avenue Station" => "Cameron Ave Bus Station", - "Cameron Avenue Station - Platform 1" => "Cameron Ave Bus Station - Platform 1", - "Cameron Avenue Station - Platform 2" => "Cameron Ave Bus Station - Platform 2", - "Cameron Avenue Station - Platform 3" => "Cameron Ave Bus Station - Platform 3", - "Cameron Avenue Station - Platform 4" => "Cameron Ave Bus Station - Platform 4", - "Cameron Avenue Station - Platform 5" => "Cameron Ave Bus Station - Platform 5", - "Cameron Ave Station" => "Cameron Ave Bus Station", - "Cameron Ave Station - Platform 1" => "Cameron Ave Bus Station - Platform 1", - "Cameron Ave Station - Platform 2" => "Cameron Ave Bus Station - Platform 2", - "Cameron Ave Station - Platform 3" => "Cameron Ave Bus Station - Platform 3", - "Cameron Ave Station - Platform 4" => "Cameron Ave Bus Station - Platform 4", - "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", - "Manuka Captain Cook" => "Manuka/Captain Cook", - "Manuka, Captain Cook" => "Manuka/Captain Cook", - "Hospice, Menindee Drive" => "Hospice", - "Tharwa/Pocket" => "Tharwa/Pockett", - "Paul-Co / Mirrabei" => "Paul Coe / Mirrabei" - } + "Woden Bus Station Platform 10)" => "Woden Bus Station (Platform 10)", + "Saint AndrewsVillage Hughes"=>"Saint Andrews Village Hughes", + "Flemmington Road / Sandford St"=>"Flemington Road / Sandford St", + "City Interchange"=>"City Bus Station", + "City Interchange (Platform 9)"=>"City Bus Station (Platform 9)", + "Bridbabella Gardens Nursing Home"=>"Brindabella Gardens Nursing Home", + "Bridbabella GardensNursing Home"=> "Brindabella Gardens Nursing Home", + "BrindabellaBusiness Park"=> "Brindabella Business Park", + "NarrabundahTerminus"=>"Narrabundah Terminus", + "Railway StationKingston"=>"Railway Station Kingston", + "Saint AndrewsVillage Hughes"=>"Saint Andrews Village Hughes", + "Dickson ShopsAntill Street"=>"Dickson Shops", + "Cohen St Bus Station (Platform 3)"=>"Cohen Street Bus Station (Platform 3)", + "Cohen St Bus Station (Platform 6)"=>"Cohen Street Bus Station (Platform 6)", + "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", +"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| $time_points_sources[wrong].each do |wrongfile| badtimetable = YAML::load_file(wrongfile) @@ -86,7 +57,7 @@ badtimetable["time_points"][badentrynumber] = right puts "Corrected '" + wrong + "' to '" + right + "' in " + wrongfile File.open(wrongfile, "w") do |f| - f.write badtimetable.to_yaml + f.write badtimetable.to_yaml end end end --- a/maxious-canberra-transit-feed/03-locatetimepoints.rb +++ b/maxious-canberra-transit-feed/03-locatetimepoints.rb @@ -1,10 +1,10 @@ #!/usr/bin/ruby -require 'postgres' require 'highline.rb' include HighLine require 'rubygems' +require 'postgres' require 'json' require 'net/http' def cbr_geocode(query) @@ -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,13 +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(/'/, "''").gsub("St", "%") + 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 @@ -68,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;') @@ -237,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" --- a/maxious-canberra-transit-feed/04-generateymlinclude.rb +++ b/maxious-canberra-transit-feed/04-generateymlinclude.rb @@ -44,8 +44,9 @@ # 0 = geoPo # 1 = lat*100000 # 2 = lng*100000 + # 3 = name #pp time_point[0] - f2.puts " - { name: #{stop[0]},stop_code: #{stop[0]}, lat: #{Float(stop[1])/10000000}, lng: #{Float(stop[2])/10000000}}" + f2.puts " - { name: #{stop[3]},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/04-locatebetweenpoints.reversegeocode.php @@ -1,1 +1,38 @@ +<?php +function getPage($url) +{ + $ch = curl_init($url); +curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 ); +curl_setopt( $ch, CURLOPT_HEADER, 0 ); +$page = curl_exec($ch); +curl_close($ch); +return $page; +} +// +// http://developers.cloudmade.com/wiki/geocoding-http-api/Documentation +$conn = pg_connect("dbname=bus user=postgres password=snmc"); +if (!$conn) { + echo "An error occured.\n"; + exit; +} +$sql = "Select * from stops where name is null"; + $result_stops = pg_query($conn, $sql); + if (!$result_stops) { + cho("Error in SQL query: " . pg_last_error() ."<br>\n"); + } + while ($stop = pg_fetch_assoc($result_stops)) { + echo "Processing ".$stop['geohash'] . " ... "; + $url = "http://geocoding.cloudmade.com/daa03470bb8740298d4b10e3f03d63e6/geocoding/v2/find.js?around=".($stop['lat']/10000000).",".($stop['lng']/10000000)."&distance=closest&object_type=road"; + $contents = json_decode(getPage($url)); + $name = $contents->features[0]->properties->name; + echo "Saving $name ! <br>" ; + $result_save = pg_query($conn, "UPDATE stops set name = '".pg_escape_string($name)."' where geohash = '{$stop['geohash']}' "); + if (!$result_save) { + echo("Error in SQL query: " . pg_last_error() ."<br>\n"); + } + flush(); + } +?> + + --- a/maxious-canberra-transit-feed/05-addbetweenpointstotimetables.rb +++ b/maxious-canberra-transit-feed/05-addbetweenpointstotimetables.rb @@ -23,9 +23,11 @@ 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 - + searchFrom = timetable["time_points"][i].escape_single_quotes.split("(")[0].strip + searchTo = timetable["time_points"][i+1].escape_single_quotes.split("(")[0].strip + # print "SELECT * from between_stops + # WHERE fromlocation = '#{searchFrom}' + # AND tolocation = '#{searchTo}' AND routes LIKE '%#{route_name};%'" between_points = connbus.exec("SELECT * from between_stops WHERE fromlocation = '#{searchFrom}' AND tolocation = '#{searchTo}' AND routes LIKE '%#{route_name};%'") @@ -34,8 +36,9 @@ #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(";"); + points = between_point_row['points'].split(";") + points.delete("") + timetable["between_stops"][timetable["time_points"][i] + '-' +timetable["time_points"][i+1]] = points; end end #pp timetable["between_stops"] --- a/maxious-canberra-transit-feed/05-cleanupyaml.sh +++ /dev/null @@ -1,3 +1,1 @@ -#!/bin/bash -sed -i "s/- ---/- /g" 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 @@ - { name: Southlands Mawson,stop_code: Southlands Mawson, lat: -35.3650685, lng: 149.0945962} - { name: Southwell Park,stop_code: Southwell Park, lat: -35.24573, lng: 149.1321} - { name: Spence,stop_code: Spence, lat: -35.194735, lng: 149.062352} + - { name: Spence Shops,stop_code: Spence Shops, lat: -35.19968, lng: 149.06763} - { name: Spence Terminus,stop_code: Spence Terminus, lat: -35.199684, lng: 149.0676196} + - { name: St Clare of Assisi,stop_code: St Clare of Assisi, lat: -35.46063, lng: 149.09627} - { name: St Clare of Assisi Primary,stop_code: St Clare of Assisi Primary, lat: -35.4606284, lng: 149.0962704} - - { name: St Francis Xavier Florey,stop_code: St Francis Xavier Florey, lat: -35.223951, lng: 149.0406888} + - { name: St Francis Xavier, Florey,stop_code: St Francis Xavier, Florey, lat: -35.223951, lng: 149.0406888} - { name: Stromlo High Waramanga,stop_code: Stromlo High Waramanga, lat: -35.3551186, lng: 149.0547624} - - { name: St Thomas More Campbell,stop_code: St Thomas More Campbell, lat: -35.286717, lng: 149.156836} - - { name: Sydney Avenue,stop_code: Sydney Avenue, lat: -35.31193, lng: 149.13105} - - { name: Taverner/Erindale,stop_code: Taverner/Erindale, lat: -35.4059104, lng: 149.0809317} + - { name: St Thomas More's Campbell,stop_code: St Thomas More's Campbell, lat: -35.286717, lng: 149.156836} + - { name: Sydney Ave,stop_code: Sydney Ave, lat: -35.31193, lng: 149.13105} + - { name: Taverner St / Erindale Dr,stop_code: Taverner St / Erindale Dr, lat: -35.4059104, lng: 149.0809317} - { name: Tharwa Drive,stop_code: Tharwa Drive, lat: -35.458251, lng: 149.091652} - - { name: Tharwa/Knoke,stop_code: Tharwa/Knoke, lat: -35.47281, lng: 149.08926} - - { name: Tharwa/Pockett,stop_code: Tharwa/Pockett, lat: -35.47348, lng: 149.09178} + - { name: Tharwa Drive / Knoke Ave,stop_code: Tharwa Drive / Knoke Ave, lat: -35.47281, lng: 149.08926} + - { name: Tharwa Dr / Pockett Ave,stop_code: Tharwa Dr / Pockett Ave, lat: -35.47348, lng: 149.09178} - { name: Theodore,stop_code: Theodore, lat: -35.4464808, lng: 149.1234651} + - { name: Tillyard / Spalding,stop_code: Tillyard / Spalding, lat: -35.199204, lng: 149.044556} - { name: Torrens Shops,stop_code: Torrens Shops, lat: -35.3730889, lng: 149.087327} - - { name: Tuggeranong Interchange,stop_code: Tuggeranong Interchange, lat: -35.41465, lng: 149.06537} - - { name: Tuggeranong Interchange - Platform 3,stop_code: Tuggeranong Interchange - Platform 3, lat: -35.4147569, lng: 149.0657435} - - { 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: Tuggeranong Interchange - Platform 8,stop_code: Tuggeranong Interchange - Platform 8, lat: -35.4149428, lng: 149.0656523} + - { name: Tuggeranong Bus Station,stop_code: Tuggeranong Bus Station, lat: -35.41465, lng: 149.06537} + - { name: Tuggeranong Bus Station (Platform 3),stop_code: Tuggeranong Bus Station (Platform 3), lat: -35.4147569, lng: 149.0657435} + - { name: Tuggeranong Bus Station (Platform 4),stop_code: Tuggeranong Bus Station (Platform 4), lat: -35.4144924, lng: 149.0655423} + - { name: Tuggeranong Bus Station (Platform 5),stop_code: Tuggeranong Bus Station (Platform 5), lat: -35.414217, lng: 149.0653492} + - { name: Tuggeranong Bus Station (Platform 7),stop_code: Tuggeranong Bus Station (Platform 7), lat: -35.4146761, lng: 149.0654565} + - { name: Tuggeranong Bus Station (Platform 8),stop_code: Tuggeranong Bus Station (Platform 8), lat: -35.4149428, lng: 149.0656523} - { name: University of Canberra,stop_code: University of Canberra, lat: -35.2423222, lng: 149.0831522} - { name: Wanniassa High,stop_code: Wanniassa High, lat: -35.3952462, lng: 149.0852655} - { name: Waramanga,stop_code: Waramanga, lat: -35.3526825, lng: 149.0594712} - - { name: War Memorial,stop_code: War Memorial, lat: -35.280477, lng: 149.149085} + - { name: Waramanga Shops,stop_code: Waramanga Shops, lat: -35.35268, lng: 149.05948} + - { name: War Memorial, Limestone Ave,stop_code: War Memorial, Limestone Ave, lat: -35.280477, lng: 149.149085} - { name: Watson,stop_code: Watson, lat: -35.2389399, lng: 149.1535345} - { name: Watson Terminus,stop_code: Watson Terminus, lat: -35.2374698, lng: 149.1534553} - { name: Weetangera Shops,stop_code: Weetangera Shops, lat: -35.248393, lng: 149.0506342} + - { name: Westfield Bus Station,stop_code: Westfield Bus Station, lat: -35.23875, lng: 149.0638} + - { name: Westfield Bus Station (Platform 1),stop_code: Westfield Bus Station (Platform 1), lat: -35.23872, lng: 149.06387} + - { name: Westfield Bus Station (Platform 2),stop_code: Westfield Bus Station (Platform 2), lat: -35.23882, lng: 149.0637} + - { name: West Macgregor,stop_code: West Macgregor, lat: -35.21207, lng: 149.00165} - { name: Weston Creek Terminus,stop_code: Weston Creek Terminus, lat: -35.342728, lng: 149.0524906} - { name: Weston Primary,stop_code: Weston Primary, lat: -35.3305221, lng: 149.0524281} - - { name: William Webb / Ginninderra Drive,stop_code: William Webb / Ginninderra Drive, lat: -35.2355797, lng: 149.0742074} - - { name: Woden Interchange,stop_code: Woden Interchange, lat: -35.34433, lng: 149.08742} - - { name: Woden Interchange - Platform 10,stop_code: Woden Interchange - Platform 10, lat: -35.3439501, lng: 149.0877369} - - { 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: Wod