More network 10 updates
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-maxious-canberra-transit-feed/source-html
origin-src
--- 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,7 +14,7 @@
timetable = {"between_stops" => [], "short_name" => short_name}
time_points = table.xpath('tr[1]//th').map do |tp|
if tp.content != "\302\240" && tp.content != "" && tp.content != "<br/>"
- timing_point = tp.content.squeeze(" ").gsub(" Platform"," (Platform").gsub(" - "," - ").gsub("\n","").gsub("\r","").gsub("\\"," / ").squeeze(" ").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;
@@ -22,6 +22,8 @@
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 = []
@@ -31,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")
@@ -54,7 +59,6 @@
timetable
end
-#TODO fix route 934
Dir.glob("source-html/Route*.htm*") { |file|
puts "Opened " + file
doc = Nokogiri::HTML(open(file))
@@ -62,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 <title> tag"
@@ -71,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
@@ -25,61 +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",
- "Menindee Drive - Hospice" => "Hospice",
- "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)
--- 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();
+ }
+?>
+
+
Binary files a/maxious-canberra-transit-feed/cbrfeed.zip and /dev/null differ
--- 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