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 @@
-<?php
-/*
- * GeoPo Encode in PHP
- * @author : Shintaro Inagaki
- * @param $location (Array)
- * @return $geopo (String)
- */
-function geopoEncode($lat, $lng) {
- // 64characters (number + big and small letter + hyphen + underscore)
- $chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
-
- $geopo = "";
- $scale = 7;
-
- // Change a degree measure to a decimal number
- $lat = ($lat + 90) / 180 * pow(8, 10);
- $lng = ($lng + 180) / 360 * pow(8, 10);
- // Compute a GeoPo code from head and concatenate
- for($i = 0; $i < $scale; $i++) {
- $geopo .= substr($chars, floor($lat / pow(8, 9 - $i) % 8) + floor($lng / pow(8, 9 - $i) % 8) * 8, 1);
- }
- return $geopo;
-}
-
-/*
- * GeoPo Decode in PHP
- * @author : Shintaro Inagaki
- * @param $geopo (String)
- * @return $location (Array)
- */
-function geopoDecode($geopo) {
- // 64characters (number + big and small letter + hyphen + underscore)
- $chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
- // Array for geolocation
- $location = array ();
-
- for ($i = 0; $i < strlen($geopo); $i++) {
- // What number of character that equal to a GeoPo code (0-63)
- $order = strpos($chars, substr($geopo, $i, 1));
- // Lat/Lng plus geolocation value of scale
- $location['lat'] = $location['lat'] + floor($order % 8) * pow(8, 9 - $i);
- $location['lng'] = $location['lng'] + floor($order / 8) * pow(8, 9 - $i);
- }
-
- // Change a decimal number to a degree measure, and plus revised value that shift center of area
- $location['lat'] = $location['lat'] * 180 / pow(8, 10) + 180 / pow(8, strlen($geopo)) / 2 - 90;
- $location['lng'] = $location['lng'] * 360 / pow(8, 10) + 360 / pow(8, strlen($geopo)) / 2 - 180;
- $location['scale'] = strlen($geopo);
-
- return $location;
-}
-
-$conn = pg_connect("dbname=bus user=postgres password=snmc");
-if (!$conn) {
- echo "An error occured.\n";
- exit;
-}
-$xml = simplexml_load_file("04-locatebetweenpoints.osm");
-
-/* Access the <rating> nodes of the first movie.
- * Output the rating scale, too. */
-foreach ($xml->node as $node) {
- $geoPo = geopoEncode((float)$node['lat'],(float)$node['lon']);
- $node['lat'] = (int) ((float)$node['lat']*10000000);
- $node['lon'] = (int) ((float)$node['lon']*10000000);
- echo($node['lat'].",".$node['lon']."=$geoPo<br>");
- $sql = "INSERT INTO stops (geohash, lat, lng) VALUES('$geoPo','{$node['lat']}','{$node['lon']}')";
- $result = pg_query($conn, $sql);
- if (!$result) {
- echo("Error in SQL query: " . pg_last_error() ."<br>\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 @@
-<div id="get">
- <div class="toolbar">
- <h1>GET Example</h1>
- <a class="back" href="#">AJAX</a>
- </div>
- <div class="info">
- This page was loaded via AJAX.
- </div>
- <ul class="rounded">
- <li><a href="#livetest">Test live events</a></li>
- </ul>
-</div>
-<div id="livetest">
- <div class="toolbar">
- <h1>Events test</h1>
- <a class="back" href="#">AJAX</a>
- <a class="button goback" href="#home">Home</a>
- </div>
- <div class="info">
- This is a test of live events.
- </div>
-</div>
+
--- 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 != "<br/>"
- 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 <title> 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