Add weekend Network 10
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-maxious-canberra-transit-feed/source-html
origin-src
--- a/betweenpoint.php
+++ b/betweenpoint.php
@@ -10,7 +10,7 @@
// create the ol map object
var map = new OpenLayers.Map('map');
- var osmtiles = new OpenLayers.Layer.OSM("local", "http://127.0.0.1/Maps/OSM/${z}/${x}/${y}.png")
+ var osmtiles = new OpenLayers.Layer.OSM("local", "http://127.0.0.1/tiles/${z}/${x}/${y}.png")
// use http://open.atlas.free.fr/GMapsTransparenciesImgOver.php and http://code.google.com/p/googletilecutter/ to make tiles
markers = new OpenLayers.Layer.Markers("Between Stop Markers");
@@ -64,6 +64,7 @@
fromto = selValue.split(":",2)[1];
$("#from").val(fromto.split("->",2)[0]);
$("#to").val(fromto.split("->",2)[1]);
+ document.getElementById("between_points").innerHTML = "";
return true;
}
@@ -126,7 +127,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/betweenpoint.submit.php
+++ b/betweenpoint.submit.php
@@ -16,7 +16,8 @@
echo("Error in SQL query: " . pg_last_error() ."<br>\n");
}
if ($reverse === "on") {
- $points = implode(";",array_reverse(explode(";",$points)));
+ $p = implode(";",array_reverse(explode(";",$points))).";";
+ $points = str_replace(";","",$p,1);
$sql = "INSERT INTO between_stops ( toLocation, fromLocation, points, routes) VALUES('$from','$to','$points','$routes')";
$result = pg_query($conn, $sql);
if (!$result) {
--- a/busui/common.inc.php
+++ b/busui/common.inc.php
@@ -23,6 +23,10 @@
<script src="http://code.jquery.com/jquery-1.4.3.min.js"></script><script type="text/javascript"
src="http://code.jquery.com/mobile/1.0a1/jquery.mobile-1.0a1.min.js"></script>
<script type="text/javascript" src="docs/docs.js"></script>
+ <meta name="apple-mobile-web-app-capable" content="yes" />
+ <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+ <link rel="apple-touch-startup-image" href="startup.png" />
+ <link rel="apple-touch-icon" href="apple-touch-icon.png" />
</head>
<body>
@@ -83,3 +87,4 @@
}
?>
+
--- 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
@@ -361,6 +369,7 @@
schedule = self.server.schedule
stop = schedule.GetStop(params.get('stop', None))
time = int(params.get('time', 0))
+ service_period = params.get('service_period', None)
time_trips = stop.GetStopTimeTrips(schedule)
time_trips.sort() # OPT: use bisect.insort to make this O(N*ln(N)) -> O(N)
# Keep the first 15 after param 'time'.
@@ -389,8 +398,8 @@
trip_name += route.route_long_name
if headsign:
trip_name += " (Direction: %s)" % headsign
-
- result.append((time, (trip.trip_id, trip_name, trip.service_id), tp))
+ if service_period == None or trip.service_id == service_period:
+ result.append((time, (trip.trip_id, trip_name, trip.service_id), tp))
return result
def handle_GET_ttablegraph(self,params):
--- a/busui/stop.php
+++ b/busui/stop.php
@@ -5,11 +5,12 @@
include_header("Trips passing ".$stop[1]);
echo ' <ul data-role="listview" >';
-$url = $APIurl."/json/stoptrips?stop=".$_REQUEST['stopid']."&time=".midnight_seconds();
+$url = $APIurl."/json/stoptrips?stop=".$_REQUEST['stopid']."&time=".midnight_seconds()."&service_period=".service_period();
$page = getPage($url);
+echo $page;
foreach (json_decode($page) as $row)
{
-if ($row[1][2] === service_period()) echo '<li>'.midnight_seconds_to_time($row[0]).' <a href="trip.php?stopid='.$_REQUEST['stopid'].'&tripid='.$row[1][0].'">'.$row[1][1].'</a></li>';
+echo '<li>'.midnight_seconds_to_time($row[0]).' <a href="trip.php?stopid='.$_REQUEST['stopid'].'&tripid='.$row[1][0].'">'.$row[1][1].'</a></li>';
}
echo '</ul>';
include_footer();
--- a/busui/stopList.php
+++ b/busui/stopList.php
@@ -2,7 +2,8 @@
include('common.inc.php');
include_header("Stops");
echo ' <ul data-role="listview" data-filter="true">';
-$url = $APIurl."/json/stops";
+$url = $APIurl."/json/timingpoints";
+if ($_REQUEST['allstops']) $url = $APIurl."/json/stops";
if ($_REQUEST['lat'] && $_REQUEST['lon']) $url = $APIurl."/json/neareststops?lat={$_REQUEST['lat']}&lon={$_REQUEST['lon']}&limit=15";
$contents = json_decode(getPage($url));
foreach ($contents as $key => $row) {
@@ -19,16 +20,14 @@
echo '<li><a href="stop.php?stopid='.$row[0].'">'.$row[1].'</a></li>';
}
echo '</ul>';
-/*
+echo'
<div data-role="footer" data-id="foo1" data-position="fixed">
<div data-role="navbar">
<ul>
- <li><a href="footer-persist-a.html" class="ui-btn-active">Friends</a></li>
- <li><a href="footer-persist-b.html">Albums</a></li>
- <li><a href="footer-persist-c.html">Emails</a></li>
+ <li><a href="stopList.php" class="ui-btn-active">Timing Points</a></li>
+ <li><a href="stopList.php?allstops=yes">All Stops</a></li>
</ul>
- </div><!-- /navbar -->
-*/
+ ';
include_footer();
?>
--- a/maxious-canberra-transit-feed/01-extracttimes.rb
+++ b/maxious-canberra-transit-feed/01-extracttimes.rb
@@ -14,10 +14,13 @@
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;
+ if tp.to_s.match(/[0-9][0-9][0-9]/) or tp.to_s.include? "Wheelchair"
+ timing_point = nil
+ end
timing_point
end
end
@@ -28,12 +31,17 @@
table.css('tr').each do |row|
times = row.css('td').map do |cell|
time = cell.content.squeeze(" ").strip
- 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(/ *A\S?M/,"a").gsub(/ ?P\S?M/,"p").gsub(/ *a\S?m/,"a").gsub(/ ?p\S?m/,"p")
+ time = time.gsub("12:08 AM","1208x").gsub(":","").gsub("1.","1").gsub("2.","2").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 == "" or time.include? "chool" or time.include? "On Race Days" or time.include? "Bus"
+ time = nil # This hacky way is faster than using position()>1 xpath on <TD>s!
+ end
+ time
end
- if not times.empty?
+ times.delete(nil)
+ if not times.empty?
if not (route = times.shift)
raise("TODO: account for shifting route numbers eg. intertown/redex 62/162")
end
@@ -54,15 +62,14 @@
timetable
end
-#TODO fix route 934
-Dir.glob("source-html/Route*.htm*") { |file|
+Dir.glob("source-html/*oute*.htm*") { |file|
puts "Opened " + file
doc = Nokogiri::HTML(open(file))
# Search for nodes by css
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("route ","").gsub(", ","/").gsub("ACTION Buses Timetable for ","").squeeze(" ").strip
end
if short_name == ""
raise "Route number(s) not found in <title> tag"
@@ -71,7 +78,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
@@ -19,79 +19,96 @@
end
}
end
+def correctTimePoints()
+time_point_corrections = {"North Lynehamham" => "North Lyneham",
+ "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)",
+ "City Bus Station Platfrom 9"=>"City Bus Station (Platform 9)",
+ "Belconnen Community Bus StationPlatform 2)"=>"Belconnen Community Bus Station (Platform 2)",
+ "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",
+ "Newcastle St after Isa St" => "Newcastle Street after Isa Street",
+ "Newcastle Street after Isa St" => "Newcastle Street after Isa Street",
+ "Northbourne Ave / Antill St" => "Northbourne Avenue / Antill St",
+ "Macarthur / Northbourne" => "Macarthur / Northbourne Ave",
+ "Macarthur Ave / Northbourne" => "Macarthur / Northbourne Ave",
+ "Kings Ave / National Cct"=> "Kings Ave / National Circuit",
+ "Kosciuszco Ave / Everard Street"=>"Kosciuszko / Everard",
+ "Lithgow St Terminus" => "Lithgow St Terminus Fyshwick",
+ "Hospice Menindee Dr" => "Hospice / Menindee Dr",
+ "Gungahlin Market Place"=> "Gungahlin Marketplace",
+ "Gwyder Square Kaleen"=> "Gwydir Square Kaleen",
+ "Flemington Road / Nullabor Ave"=>"Flemington Rd / Nullabor Ave",
+ "Flemington Road / Sandford St"=>"Flemington Rd / Sandford St",
+ "Heagney Cres Clift Cres Richardson"=> "Heagney / Clift Richardson",
+ "Charnwood Shops (Tillyard Drive)"=> "Charnwood Shops",
+ "charnwood Shops"=> "Charnwood Shops",
+ "Black Moutain- Telstra Tower"=>"Black Mountain Telstra Tower",
+ "Bonython Primary"=> "Bonython Primary School",
+ "Athllon Drive / Sulwood Dr Kambah"=>"Athllon / Sulwood Kambah",
+ "Alexander Machonochie Centre Hume"=>"Alexander Maconochie Centre",
+ "Alexander Maconochie Centre Hume"=>"Alexander Maconochie Centre",
+ "Anthony Rolfe Ave / Moonight Ave" =>"Anthony Rolfe Av / Moonlight Av",
+ "Australian National Botanic Gardens"=>"Botanic Gardens",
+ "Calwell shops"=> "Calwell Shops",
+ "Chuculba / William Slim Drive"=>"Chuculba / William Slim Dr",
+ "Fyshwick direct Factory Outlet"=>"Fyshwick Direct Factory Outlet",
+ "Kaleen Village / Maibrynong"=>"Kaleen Village / Marybrynong",
+ "Kaleen Village / Marybrynong Ave"=>"Kaleen Village / Marybrynong",
+ "National Aquarium"=>"National Zoo and Aquarium",
+ "chisholm Shops"=>"Chisholm Shops",
+ "O'connor Shops"=>"O'Connor Shops",
+ "Mckellar Shops"=>"McKellar Shops",
+ "Melba shops"=> "Melba Shops",
+ "William Web / Ginninderra Drive"=>"William Webb / Ginninderra Drive",
+ "Procor / Mead"=>"Proctor / Mead",
+ "Fyshwick DirectFactory Outlet"=>"Fyshwick Direct Factory Outlet",
+ "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",
+ "Tharwa / Knoke" => "Tharwa Drive / Knoke Ave",
+ "Tharwa / Pocket" => "Tharwa Dr / Pockett Ave",
+ "Outrim / Duggan" => "Outtrim / Duggan",
+ "ANU Burton and Garran Hall Daley Rd" => "Burton and Garran Hall Daley Road",
+ "Farrer Primary"=>"Farrer Primary School",
+ "St Thomas More Campbell"=>"St Thomas More's Campbell",
+ "Lyneham Shops"=>"Lyneham Shops Wattle Street",
+
+
+}
+ time_point_corrections.each do |wrong, right|
+ $time_points_sources[wrong].each do |wrongfile|
+ badtimetable = YAML::load_file(wrongfile)
+ badentrynumber = badtimetable["time_points"].index wrong
+ badtimetable["time_points"][badentrynumber] = right
+ puts "Corrected '" + wrong + "' to '" + right + "' in " + wrongfile
+ File.open(wrongfile, "w") do |f|
+ f.write badtimetable.to_yaml
+ end
+ end
+ end
+end
getTimePoints()
#pp $time_points.sort!
#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"
- }
-time_point_corrections.each do |wrong, right|
- $time_points_sources[wrong].each do |wrongfile|
- badtimetable = YAML::load_file(wrongfile)
- badentrynumber = badtimetable["time_points"].index wrong
- badtimetable["time_points"][badentrynumber] = right
- puts "Corrected '" + wrong + "' to '" + right + "' in " + wrongfile
- File.open(wrongfile, "w") do |f|
- f.write badtimetable.to_yaml
- end
- end
-end
+correctTimePoints()
+getTimePoints()
+correctTimePoints()
getTimePoints()
pp $time_points.sort!
--- 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"