From: root Date: Tue, 20 Apr 2010 11:18:35 +0000 Subject: Begin to locate time points X-Git-Url: https://maxious.lambdacomplex.org/git/?p=bus.git&a=commitdiff&h=bea01b85a230725062457d751600fe986053fd9a --- Begin to locate time points --- --- /dev/null +++ b/.gitignore @@ -1,1 +1,2 @@ +maxious-canberra-transit-feed/output/ --- a/display.kml.php +++ /dev/null @@ -1,65 +1,1 @@ - -'; -echo ' - '; -$conn = pg_connect("dbname=openstreetmap user=postgres password=snmc"); -if (!$conn) { - echo "An error occured.\n"; - exit; -} - -$result_route = pg_query($conn, "SELECT * from current_relation_tags, (Select id FROM current_relation_tags WHERE k = 'route' AND v = 'bus') as a -where a.id = current_relation_tags.id and k = 'ref';"); -if (!$result_route) { - echo "An route retirieve error occured.\n"; - exit; -} - -while ($route = pg_fetch_assoc($result_route)) { - echo "\n\n"; - echo "".$route['v']." position at ".$route['id'].""; - echo "".$route['v']." position at ".$route['id'].""; -echo "#yellowLineGreenPoly"; -echo " - 1 - "; -$result_way = pg_query($conn, 'SELECT member_id, sequence_id FROM "current_relation_members" WHERE "id" = '.$route['id'].' order by "sequence_id" -ASC'); -if (!$result_way) { - echo "An way retirieve error occured.\n"; - exit; -} - $count = 0; - -while ($way = pg_fetch_assoc($result_way)) { - $result_node = pg_query($conn, 'SELECT * FROM current_nodes INNER JOIN current_way_nodes ON current_way_nodes.node_id=current_nodes.id WHERE -current_way_nodes.id = '.$way['member_id'].' order by "sequence_id" ASC'); - if (!$result_node) { - echo "An node retirieve error occured.\n"; - exit; - } - - while ($node = pg_fetch_assoc($result_node)) { - $count++; - echo ($node['longitude']/10000000).",".($node['latitude']/10000000).",600 \n"; - } -} - if ($count == 0) echo (0).",".(0).",600 \n"; -echo " - "; -echo ''; -} - -echo "\n\n"; -?> --- a/display.php +++ b/display.php @@ -3,50 +3,80 @@ --- /dev/null +++ b/displayroutes.kml.php @@ -1,1 +1,65 @@ + +'; +echo ' + '; +$conn = pg_connect("dbname=openstreetmap user=postgres password=snmc"); +if (!$conn) { + echo "An error occured.\n"; + exit; +} + +$result_route = pg_query($conn, "SELECT * from current_relation_tags, (Select id FROM current_relation_tags WHERE k = 'route' AND v = 'bus') as a +where a.id = current_relation_tags.id and k = 'ref';"); +if (!$result_route) { + echo "An route retirieve error occured.\n"; + exit; +} + +while ($route = pg_fetch_assoc($result_route)) { + echo "\n\n"; + echo "".$route['v']." position at ".$route['id'].""; + echo "".$route['v']." position at ".$route['id'].""; +echo "#yellowLineGreenPoly"; +echo " + 1 + "; +$result_way = pg_query($conn, 'SELECT member_id, sequence_id FROM "current_relation_members" WHERE "id" = '.$route['id'].' order by "sequence_id" +ASC'); +if (!$result_way) { + echo "An way retirieve error occured.\n"; + exit; +} + $count = 0; + +while ($way = pg_fetch_assoc($result_way)) { + $result_node = pg_query($conn, 'SELECT * FROM current_nodes INNER JOIN current_way_nodes ON current_way_nodes.node_id=current_nodes.id WHERE +current_way_nodes.id = '.$way['member_id'].' order by "sequence_id" ASC'); + if (!$result_node) { + echo "An node retirieve error occured.\n"; + exit; + } + + while ($node = pg_fetch_assoc($result_node)) { + $count++; + echo ($node['longitude']/10000000).",".($node['latitude']/10000000).",600 \n"; + } +} + if ($count == 0) echo (0).",".(0).",600 \n"; +echo " + "; +echo ''; +} + +echo "\n\n"; +?> --- /dev/null +++ b/displaystops.kml.php @@ -1,1 +1,58 @@ + +'; +echo ''; +echo ''; +$conn = pg_connect("dbname=openstreetmap user=postgres password=snmc"); +if (!$conn) { + echo "An error occured.\n"; + exit; +} +/*SELECT * from current_node_tags, (Select id FROM current_node_tags WHERE "v" LIKE '%bus%') as a +where a.id = current_node_tags.id; */ +$result_stops = pg_query($conn, "Select * FROM current_node_tags INNER JOIN current_nodes ON +current_node_tags.id=current_nodes.id WHERE v LIKE '%bus%' "); +if (!$result_stops) { + echo "An stops retirieve error occured.\n"; + exit; +} + +while ($stop = pg_fetch_assoc($result_stops)) { + echo "\n\n"; + echo ""; +$result_stopkeys = pg_query($conn, "SELECT * from current_node_tags where id = {$stop['id']};"); +if (!$result_stopkeys) { + echo "An stops keys retirieve error occured.\n"; + exit; +} +$name = ""; +while ($stopkeys = pg_fetch_assoc($result_stopkeys)) { +echo htmlspecialchars(print_r($stopkeys,true)); +$name .= htmlspecialchars($stopkeys['v']); +} +echo ""; + echo "$name"; + +echo "#target"; +echo "\n "; + echo ($stop['longitude']/10000000).",".($stop['latitude']/10000000)."\n"; +echo " "; +echo ''; +} + +echo "\n\n"; +?> --- /dev/null +++ b/displaytimepoints.kml.php @@ -1,1 +1,58 @@ + +'; +echo ''; +echo ''; +$conn = pg_connect("dbname=openstreetmap user=postgres password=snmc"); +if (!$conn) { + echo "An error occured.\n"; + exit; +} +/*SELECT * from current_node_tags, (Select id FROM current_node_tags WHERE "v" LIKE '%bus%') as a +where a.id = current_node_tags.id; */ +$result_stops = pg_query($conn, "Select * FROM current_node_tags INNER JOIN current_nodes ON +current_node_tags.id=current_nodes.id WHERE v LIKE '%bus%' "); +if (!$result_stops) { + echo "An stops retirieve error occured.\n"; + exit; +} + +while ($stop = pg_fetch_assoc($result_stops)) { + echo "\n\n"; + echo ""; +$result_stopkeys = pg_query($conn, "SELECT * from current_node_tags where id = {$stop['id']};"); +if (!$result_stopkeys) { + echo "An stops keys retirieve error occured.\n"; + exit; +} +$name = ""; +while ($stopkeys = pg_fetch_assoc($result_stopkeys)) { +echo htmlspecialchars(print_r($stopkeys,true)); +$name .= htmlspecialchars($stopkeys['v']); +} +echo ""; + echo "$name"; + +echo "#target"; +echo "\n "; + echo ($stop['longitude']/10000000).",".($stop['latitude']/10000000)."\n"; +echo " "; +echo ''; +} + +echo "\n\n"; +?> --- a/index.php +++ /dev/null @@ -1,3 +1,1 @@ -$query = "SELECT * from current_relation_tags, (Select "id" FROM "public"."current_relation_tags" WHERE "k" = 'route' AND "v" = 'bus') as a where -a.id = current_relation_tags.id;" --- a/maxious-canberra-transit-feed/Makefile +++ b/maxious-canberra-transit-feed/Makefile @@ -9,12 +9,12 @@ cp cbrtable.yml.in cbrtable.yml @$(foreach ROUTE_FILE, $(ROUTE_FILES), \ echo "Parsing $(ROUTE_FILE)"; \ - echo "TODO: replace friendly timing spot names with OSM node IDs in $(ROUTE_FILE)"; \ + echo "TODO: replace friendly timing spot names with OSM node IDs or geohash in $(ROUTE_FILE)"; \ echo "TODO: add inbetween stops in $(ROUTE_FILE)"; \ ./indent-route.pl < $(ROUTE_FILE) >> cbrtable.yml;) cbrtable.yml.in: cbrtable.yml.in.in - @echo "TODO: autogenerate stops via OSM" + @echo "TODO: autogenerate stops via database, convert to YAML" cp cbrtable.yml.in.in cbrtable.yml.in --- a/maxious-canberra-transit-feed/extracttimes.rb +++ /dev/null @@ -1,95 +1,1 @@ -require 'rubygems' -require 'nokogiri' -require 'open-uri' -require 'pp' -def makeTimetable(table, period, short_name) - timetable = {"stop_times" => [], "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").strip - end - end - time_points.delete(nil) - timetable["time_points"] = time_points - timetable["long_name"] = "To " + time_points.last - periodtimes = [] - table.css('tr').each do |row| - times = row.css('td').map do |cell| - #TODO convert to GTFS time - time = cell.content.squeeze(" ").strip - end - if not times.empty? - if not (route = times.shift) - raise("TODO: account for shifting route numbers eg. intertown/redex 62/162") - end - periodtimes << times - end - end - if periodtimes.size < 1 - raise "No times for route " + short_name + " in period " + period - end - timetable["stop_times"] = { period => periodtimes } - # pp timetable - filename = timetable["short_name"] + "-" + timetable["long_name"].downcase.gsub(" ","-").gsub("/","") + "." + period + ".yml" - puts "Saving " + filename - File.open("#{File.dirname(__FILE__)}/output/"+filename, "w") do |f| - f.write timetable.to_yaml - end - timetable -end - -#TODO fix route 934 -Dir.glob("source-html/Route*.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 ","").squeeze(" ").strip - end - if short_name == "" - raise "Route number(s) not found in tag" - end - - doc.xpath('//table[preceding::text()="Weekdays"]').each do |table| - timetables << makeTimetable(table, "weekday", short_name) - end - - #weekends - doc.xpath('//table[preceding::text()="Saturdays" and following::a]').each do |table| - timetables << makeTimetable(table, "saturday", short_name) - end - doc.xpath('//table[preceding::text()="Sundays"]').each do |table| - timetables << makeTimetable(table, "sunday", short_name) - end - #930/934 special cases - doc.xpath('//table[preceding::text()="Saturday" and following::h2]').each do |table| - timetables << makeTimetable(table, "saturday", short_name) - end - doc.xpath('//table[preceding::text()="Sunday"]').each do |table| - timetables << makeTimetable(table, "sunday", short_name) - end - #route 81 = Weekdays - School Holidays Only - doc.xpath('//table[preceding::text()="Weekdays - School Holidays Only "]').each do |table| - timetable = makeTimetable(table, "weekday", short_name) - #TODO set active date range to only be holidays - timetables << timetable; - end - - - if timetables.size > 2 - puts "WARNING: " + file + " more than 2 timetables (weekend split?):" + timetables.size.to_s - end - if timetables.size < 2 - puts "WARNING: " + file + " less than 2 timetables (weekday loop service?):" + timetables.size.to_s - elsif not (timetables[0]["time_points"] - timetables[1]["time_points"].reverse).empty? - puts "WARNING: first pair of timetable timing points are not complementary for "+ file - pp(timetables[0]["time_points"] - timetables[1]["time_points"].reverse) - end - if timetables.size < 1 - raise "No timetables extracted from " + file - end -} - --- a/maxious-canberra-transit-feed/substitutetimepoints.rb +++ /dev/null @@ -1,60 +1,1 @@ -require 'rubygems' -require 'pp' -require 'yaml' -time_points = [] -time_points_sources = Hash.new([]) -Dir.chdir("output") -Dir.glob("*.yml") { |file| - timetable = YAML::load_file(file) - time_points = time_points | timetable["time_points"] - timetable["time_points"].each do |timepoint| - time_points_sources[timepoint] = time_points_sources[timepoint] | [ file ] - end -} -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 Street Station" => "Lathlain St Station", - "Manuka Captain Cook" => "Manuka, Captain Cook", - "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 Street Bus Station - Platform 1", -"Cohen Street Station" => "Cohen Street Bus Station", -"Cohen Street Station - Platform 2" => "Cohen Street Bus Station - Platform 2", -"Cohn St Station - Platform 3" => "Cohen Street Bus Station - Platform 3", -"Cohen St Station" => "Cohen Street Bus Station", -"Cohen St Station - Platform 1" => "Cohen Street Bus Station - Platform 1", -"Cohen St Station - Platform 2" => "Cohen Street Bus Station - Platform 2", -"Cohen St Station - Platform 3" => "Cohen Street Bus Station - Platform 3", -"Cohen St Station - Platform 4" => "Cohen Street Bus Station - Platform 4", -"Cohen St Station - Platform 5" => "Cohen Street Bus Station - Platform 5", -"City - Platform 7" => "City Interchange - Platform 7", -"Cameron Avenue Station" => "Cameron Ave Bus Station", -"Cameron Avenue Station - Platform 2" => "Cameron Ave Bus Station - Platform 2", -"Cameron Avenue Station - Platform 3" => "Cameron Ave Bus Station - Platform 3", -"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" - } -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 - end -end -