From: maxious Date: Mon, 19 Apr 2010 15:30:44 +0000 Subject: Add some friendly name/duplicate subsitution rules X-Git-Url: https://maxious.lambdacomplex.org/git/?p=bus.git&a=commitdiff&h=ffcb82ce533e45f2aaa310406bea272f9d6274c9 --- Add some friendly name/duplicate subsitution rules --- --- /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 +++ b/maxious-canberra-transit-feed/extracttimes.rb @@ -7,7 +7,7 @@ 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 + timing_point = tp.content.squeeze(" ").gsub("\r\n Platform"," - Platform").gsub(" - "," - ").gsub("\n","").strip end end time_points.delete(nil) @@ -16,7 +16,7 @@ periodtimes = [] table.css('tr').each do |row| times = row.css('td').map do |cell| - #TODO convert to GTFS time + #TODO convert to GTFS time ie. replace " AM" with a time = cell.content.squeeze(" ").strip end if not times.empty? --- a/maxious-canberra-transit-feed/substitutetimepoints.rb +++ b/maxious-canberra-transit-feed/substitutetimepoints.rb @@ -13,48 +13,59 @@ end } pp time_points.sort! -pp time_points_sources.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 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", + "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", "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" + "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", + "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" + "Newcastle Street after Isa St" => "Newcastle / Isa Street Fyshwick", + "National Circ/Canberra Ave" => "National Circuit / Canberra Ave", } 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 + puts "Corrected '" + wrong + "' to '" + right + "' in " + wrongfile + File.open(wrongfile, "w") do |f| + f.write badtimetable.to_yaml + end end end