Suggest timepoints using OSM database of POIs
--- /dev/null
+++ b/.gitignore
@@ -1,1 +1,2 @@
+maxious-canberra-transit-feed/output/
--- a/display.kml.php
+++ /dev/null
@@ -1,65 +1,1 @@
-<?php
-header('Content-Type: application/vnd.google-earth.kml+xml');
-echo '<?xml version="1.0" encoding="UTF-8"?>
-<kml xmlns="http://www.opengis.net/kml/2.2"><Document>';
-echo '
- <Style id="yellowLineGreenPoly">
- <LineStyle>
- <color>7f00ff00</color>
- <width>4</width>
- </LineStyle>
- <PolyStyle>
- <color>7f00ffff</color>
- </PolyStyle>
- </Style>';
-$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<Placemark>\n";
- echo "<name>".$route['v']." position at ".$route['id']."</name>";
- echo "<description>".$route['v']." position at ".$route['id']."</description>";
-echo "<styleUrl>#yellowLineGreenPoly</styleUrl>";
-echo " <LineString>
- <extrude>1</extrude>
- <coordinates> ";
-$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 " </coordinates>
- </LineString>";
-echo '</Placemark>';
-}
-
-echo "\n</Document></kml>\n";
-?>
--- a/display.php
+++ b/display.php
@@ -3,50 +3,80 @@
<script type="text/javascript" src="http://loki.com/plugin/files/loki.js"></script>
<script src="openlayers/OpenLayers.js"></script>
<script type="text/javascript">
- var map, layer;
- function aaa(a) {
-var lonLat = new OpenLayers.LonLat(a.coords.longitude, a.coords.latitude).transform(new OpenLayers.Projection("EPSG:4326"),map.getProjectionObject());
- map.setCenter (lonLat, 13);
+var map, layer;
+function aaa(a)
+{
+ var lonLat = new OpenLayers.LonLat(a.coords.longitude, a.coords.latitude).transform(new OpenLayers.Projection("EPSG:4326"),
+map.getProjectionObject());
+ map.setCenter(lonLat, 13);
+
+}
+
+function handleError(a)
+{
+ alert("error in geoloc");
+}
+
+function init()
+{
+ var extent = new OpenLayers.Bounds(148.98, -35.48, 149.25, -35.15);
+ map = new OpenLayers.Map('map');
+ layer = new OpenLayers.Layer.OSM("local", "http://10.0.1.153/tiles/${z}/${x}/${y}.png");
+ map.addLayer(layer);
+ var lonLat = new OpenLayers.LonLat(149.11, -35.28).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
+ map.setCenter(lonLat, 13);
+ map.addControl( new OpenLayers.Control.LayerSwitcher({'ascending':false}));
+ map.addControl(new OpenLayers.Control.MousePosition(
+ {
+ displayProjection: new OpenLayers.Projection("EPSG:4326"),
+ suffix: "__________________________________"
+ }));
+ map.addControl(new OpenLayers.Control.MousePosition(
+ {
+ displayProjection: new OpenLayers.Projection("EPSG:900913")
+ }));
+ if (navigator.geolocation)
+ {
+ navigator.geolocation.getCurrentPosition(this.aaa, this.handleError);
}
- function handleError(a) {
-alert("error in geoloc");
+ else
+ {
+ var loki = LokiAPI();
+ loki.onSuccess = function (location)
+ {
+ var lonLat = new OpenLayers.LonLat(location.longitude, location.latitude).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
+ map.setCenter(lonLat, 13);
+ }
+ loki.onFailure = function (error)
+ {
+ loki.requestIPLocation(true, loki.NO_STREET_ADDRESS_LOOKUP)
+ }
+ loki.setKey('maxious.lambdacomplex.org');
+ loki.requestLocation(true, loki.NO_STREET_ADDRESS_LOOKUP);
}
- function init(){
- var extent = new OpenLayers.Bounds(148.98,-35.48, 149.25,-35.15);
- map = new OpenLayers.Map( 'map');
- layer = new OpenLayers.Layer.OSM("local", "http://10.0.1.153/tiles/${z}/${x}/${y}.png");
- map.addLayer(layer);
- var lonLat = new OpenLayers.LonLat(149.11, -35.28).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
- map.setCenter (lonLat, 13);
- map.addControl(new OpenLayers.Control.MousePosition({ displayProjection: new OpenLayers.Projection("EPSG:4326"),
- suffix: "__________________________________" }));
- map.addControl(new OpenLayers.Control.MousePosition({ displayProjection: new OpenLayers.Projection("EPSG:900913")}));
- if (navigator.geolocation) {
- navigator.geolocation.getCurrentPosition(this.aaa, this.handleError);
- } else {
- var loki = LokiAPI();
- loki.onSuccess = function(location) {
-var lonLat = new OpenLayers.LonLat(location.longitude, location.latitude).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
- map.setCenter (lonLat, 13);
+ map.addLayer(new OpenLayers.Layer.GML("KML", "displayroutes.kml.php", {
+ format: OpenLayers.Format.KML,
+ formatOptions: {
+ extractStyles: true,
+ extractAttributes: true,
+ maxDepth: 2
+ }
+ }));
+ map.addLayer(new OpenLayers.Layer.Vector("KML", {
+ projection: map.displayProjection,
+ strategies: [new OpenLayers.Strategy.Fixed()],
+ protocol: new OpenLayers.Protocol.HTTP(
+ {
+ url: "displaystops.kml.php",
+ format: new OpenLayers.Format.KML(
+ {
+ extractStyles: true,
+ extractAttributes: true
+ })
+ })
+ }));
}
- loki.onFailure = function(error) {
- loki.requestIPLocation(true,loki.NO_STREET_ADDRESS_LOOKUP)
- }
- loki.setKey('maxious.lambdacomplex.org');
- loki.requestLocation(true,loki.NO_STREET_ADDRESS_LOOKUP);
- }
-map.addLayer(new OpenLayers.Layer.GML("KML", "display.kml.php",
- {
- format: OpenLayers.Format.KML,
- formatOptions: {
- extractStyles: true,
- extractAttributes: true,
- maxDepth: 2
- }
- }));
-
- }
</script>
</head>
--- /dev/null
+++ b/displayroutes.kml.php
@@ -1,1 +1,65 @@
+<?php
+header('Content-Type: application/vnd.google-earth.kml+xml');
+echo '<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2"><Document>';
+echo '
+ <Style id="yellowLineGreenPoly">
+ <LineStyle>
+ <color>7f00ff00</color>
+ <width>4</width>
+ </LineStyle>
+ <PolyStyle>
+ <color>7f00ffff</color>
+ </PolyStyle>
+ </Style>';
+$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<Placemark>\n";
+ echo "<name>".$route['v']." position at ".$route['id']."</name>";
+ echo "<description>".$route['v']." position at ".$route['id']."</description>";
+echo "<styleUrl>#yellowLineGreenPoly</styleUrl>";
+echo " <LineString>
+ <extrude>1</extrude>
+ <coordinates> ";
+$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 " </coordinates>
+ </LineString>";
+echo '</Placemark>';
+}
+
+echo "\n</Document></kml>\n";
+?>
--- /dev/null
+++ b/displaystops.kml.php
@@ -1,1 +1,58 @@
+<?php
+header('Content-Type: application/vnd.google-earth.kml+xml');
+echo '<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2"><Document>';
+echo '<Style id="target">
+ <IconStyle>
+ <Icon>
+ <href>http://maps.google.com/mapfiles/kml/pushpin/ylw-pushpin.png</href>
+ </Icon>
+ </IconStyle>
+ </Style>';
+echo '<Style id="player">
+ <IconStyle>
+ <Icon>
+ <href>http://maps.google.com/mapfiles/kml/pushpin/grn-pushpin.png</href>
+ </Icon>
+ </IconStyle>
+ </Style>';
+$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<Placemark>\n";
+ echo "<description>";
+$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 "</description>";
+ echo "<name>$name</name>";
+
+echo "<styleUrl>#target</styleUrl>";
+echo "\n <Point><coordinates> ";
+ echo ($stop['longitude']/10000000).",".($stop['latitude']/10000000)."\n";
+echo " </coordinates> </Point>";
+echo '</Placemark>';
+}
+
+echo "\n</Document></kml>\n";
+?>
--- /dev/null
+++ b/displaytimepoints.kml.php
@@ -1,1 +1,58 @@
+<?php
+header('Content-Type: application/vnd.google-earth.kml+xml');
+echo '<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2"><Document>';
+echo '<Style id="target">
+ <IconStyle>
+ <Icon>
+ <href>http://maps.google.com/mapfiles/kml/pushpin/ylw-pushpin.png</href>
+ </Icon>
+ </IconStyle>
+ </Style>';
+echo '<Style id="player">
+ <IconStyle>
+ <Icon>
+ <href>http://maps.google.com/mapfiles/kml/pushpin/grn-pushpin.png</href>
+ </Icon>
+ </IconStyle>
+ </Style>';
+$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<Placemark>\n";
+ echo "<description>";
+$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 "</description>";
+ echo "<name>$name</name>";
+
+echo "<styleUrl>#target</styleUrl>";
+echo "\n <Point><coordinates> ";
+ echo ($stop['longitude']/10000000).",".($stop['latitude']/10000000)."\n";
+echo " </coordinates> </Point>";
+echo '</Placemark>';
+}
+
+echo "\n</Document></kml>\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;"
--- /dev/null
+++ b/maxious-canberra-transit-feed/01-extracttimes.rb
@@ -1,1 +1,95 @@
+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 != "<br/>"
+ timing_point = tp.content.squeeze(" ").gsub("\r\n Platform"," - Platform").gsub(" - "," - ").gsub("\n","").gsub("\r","").gsub("\\"," / ").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 ie. replace " AM" with a
+ 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 <title> 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
+}
+
--- /dev/null
+++ b/maxious-canberra-transit-feed/02-tidytimepoints.rb
@@ -1,1 +1,82 @@
+require 'rubygems'
+require 'pp'
+require 'yaml'
+Dir.chdir("output")
+def getTimePoints()
+ $time_points = []
+ $time_points_sources = Hash.new([])
+ 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
+ }
+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",
+ "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 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",
+ "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
+ File.open(wrongfile, "w") do |f|
+ f.write badtimetable.to_yaml
+ end
+ end
+end
+
+getTimePoints()
+pp $time_points.sort!
+
--- /dev/null
+++ b/maxious-canberra-transit-feed/03-locatetimepoints.rb
@@ -1,1 +1,118 @@
+#!/usr/bin/ruby
+require 'postgres'
+require 'highline.rb'
+include HighLine
+
+require 'yaml'
+require 'pp'
+Dir.chdir("output")
+
+def getTimePoints()
+ $time_points = []
+ $time_points_sources = Hash.new([])
+ 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
+ }
+end
+
+getTimePoints()
+$time_points.sort!
+
+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(/'/, "''")
+ res = connbus.exec("INSERT INTO timing_point (name) VALUES ('#{time_point}')")
+ puts "Put '#{time_point}' into DB"
+ rescue PGError => e
+ puts "Error inserting '#{time_point}' to DB #{e}"
+ #conn.close() if conn
+ end
+ end
+end
+
+
+if ask_if("Fill null Timing Points from OSM bus_stop database?")
+ 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
+ matching_nodes = connosm.exec("Select * FROM (SELECT * from current_node_tags,
+ (Select id as ctagid FROM current_node_tags WHERE v LIKE '%#{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
+ 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;')
+ rescue PGError => e
+ puts "Error selecting null points from DB #{e}"
+ #conn.close() if conn
+ end
+
+ null_points.each do |null_point_name|
+ pp null_point_name
+ end
+end
+
+
+
--- 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&