Convert to GeoRSS for nice popups
--- /dev/null
+++ b/OpenStreetMap.js
@@ -1,1 +1,165 @@
+/**
+ * Namespace: Util.OSM
+ */
+OpenLayers.Util.OSM = {};
+/**
+ * Constant: MISSING_TILE_URL
+ * {String} URL of image to display for missing tiles
+ */
+OpenLayers.Util.OSM.MISSING_TILE_URL = "/404.php";
+
+/**
+ * Property: originalOnImageLoadError
+ * {Function} Original onImageLoadError function.
+ */
+OpenLayers.Util.OSM.originalOnImageLoadError = OpenLayers.Util.onImageLoadError;
+
+/**
+ * Function: onImageLoadError
+ */
+OpenLayers.Util.onImageLoadError = function() {
+ if (this.src.match(/^http:\/\/[abc]\.[a-z]+\.openstreetmap\.org\//)) {
+ this.src = OpenLayers.Util.OSM.MISSING_TILE_URL;
+ } else if (this.src.match(/^http:\/\/[def]\.tah\.openstreetmap\.org\//)) {
+ // do nothing - this layer is transparent
+ } else {
+ OpenLayers.Util.OSM.originalOnImageLoadError;
+ }
+};
+
+/**
+ * Class: OpenLayers.Layer.OSM.Mapnik
+ *
+ * Inherits from:
+ * - <OpenLayers.Layer.OSM>
+ */
+OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, {
+ /**
+ * Constructor: OpenLayers.Layer.OSM.Mapnik
+ *
+ * Parameters:
+ * name - {String}
+ * options - {Object} Hashtable of extra options to tag onto the layer
+ */
+ initialize: function(name, options) {
+ var url = [
+ "http://a.tiles.bigtincan.com/${z}/${x}/${y}.png",
+ "http://b.tiles.bigtincan.com/${z}/${x}/${y}.png",
+ "http://c.tiles.bigtincan.com/${z}/${x}/${y}.png"
+ ];
+ options = OpenLayers.Util.extend({ numZoomLevels: 19 }, options);
+ var newArguments = [name, url, options];
+ OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
+ },
+
+ CLASS_NAME: "OpenLayers.Layer.OSM.Mapnik"
+});
+
+OpenLayers.Layer.OSM.NearMap = OpenLayers.Class(OpenLayers.Layer.OSM, {
+ /**
+ * Constructor: OpenLayers.Layer.OSM.Mapnik
+ *
+ * Parameters:
+ * name - {String}
+ * options - {Object} Hashtable of extra options to tag onto the layer
+ */
+ initialize: function(name, options) {
+ var url = [
+ "http://nearmap:findreality@web0.nearmap.com/maps/hl=en&nml=Vert&x=${x}&y=${y}&z=${z}",
+ "http://nearmap:findreality@web1.nearmap.com/maps/hl=en&nml=Vert&x=${x}&y=${y}&z=${z}",
+ "http://nearmap:findreality@web2.nearmap.com/maps/hl=en&nml=Vert&x=${x}&y=${y}&z=${z}",
+ "http://nearmap:findreality@web3.nearmap.com/maps/hl=en&nml=Vert&x=${x}&y=${y}&z=${z}"
+ ];
+ options = OpenLayers.Util.extend({ numZoomLevels: 22 }, options);
+ var newArguments = [name, url, options];
+ OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
+ },
+
+ CLASS_NAME: "OpenLayers.Layer.OSM.NearMap"
+});
+
+/**
+ * Class: OpenLayers.Layer.OSM.Osmarender
+ *
+ * Inherits from:
+ * - <OpenLayers.Layer.OSM>
+ */
+OpenLayers.Layer.OSM.Osmarender = OpenLayers.Class(OpenLayers.Layer.OSM, {
+ /**
+ * Constructor: OpenLayers.Layer.OSM.Osmarender
+ *
+ * Parameters:
+ * name - {String}
+ * options - {Object} Hashtable of extra options to tag onto the layer
+ */
+ initialize: function(name, options) {
+ var url = [
+ "http://a.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png",
+ "http://b.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png",
+ "http://c.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png"
+ ];
+ options = OpenLayers.Util.extend({ numZoomLevels: 18 }, options);
+ var newArguments = [name, url, options];
+ OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
+ },
+
+ CLASS_NAME: "OpenLayers.Layer.OSM.Osmarender"
+});
+
+/**
+ * Class: OpenLayers.Layer.OSM.CycleMap
+ *
+ * Inherits from:
+ * - <OpenLayers.Layer.OSM>
+ */
+OpenLayers.Layer.OSM.CycleMap = OpenLayers.Class(OpenLayers.Layer.OSM, {
+ /**
+ * Constructor: OpenLayers.Layer.OSM.CycleMap
+ *
+ * Parameters:
+ * name - {String}
+ * options - {Object} Hashtable of extra options to tag onto the layer
+ */
+ initialize: function(name, options) {
+ var url = [
+ "http://a.andy.sandbox.cloudmade.com/tiles/cycle/${z}/${x}/${y}.png",
+ "http://b.andy.sandbox.cloudmade.com/tiles/cycle/${z}/${x}/${y}.png",
+ "http://c.andy.sandbox.cloudmade.com/tiles/cycle/${z}/${x}/${y}.png"
+ ];
+ options = OpenLayers.Util.extend({ numZoomLevels: 19 }, options);
+ var newArguments = [name, url, options];
+ OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
+ },
+
+ CLASS_NAME: "OpenLayers.Layer.OSM.CycleMap"
+});
+
+/**
+ * Class: OpenLayers.Layer.OSM.Maplint
+ *
+ * Inherits from:
+ * - <OpenLayers.Layer.OSM>
+ */
+OpenLayers.Layer.OSM.Maplint = OpenLayers.Class(OpenLayers.Layer.OSM, {
+ /**
+ * Constructor: OpenLayers.Layer.OSM.Maplint
+ *
+ * Parameters:
+ * name - {String}
+ * options - {Object} Hashtable of extra options to tag onto the layer
+ */
+ initialize: function(name, options) {
+ var url = [
+ "http://d.tah.openstreetmap.org/Tiles/maplint/${z}/${x}/${y}.png",
+ "http://e.tah.openstreetmap.org/Tiles/maplint/${z}/${x}/${y}.png",
+ "http://f.tah.openstreetmap.org/Tiles/maplint/${z}/${x}/${y}.png"
+ ];
+ options = OpenLayers.Util.extend({ numZoomLevels: 18, isBaseLayer: false, visibility: false }, options);
+ var newArguments = [name, url, options];
+ OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
+ },
+
+ CLASS_NAME: "OpenLayers.Layer.OSM.Maplint"
+});
+
--- a/display.php
+++ b/display.php
@@ -1,29 +1,50 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<script type="text/javascript" src="http://loki.com/plugin/files/loki.js"></script>
<script src="openlayers/OpenLayers.js"></script>
+ <SCRIPT TYPE="text/javascript" SRC="OpenStreetMap.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);
-
-}
-
-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);
+
+ // set up the map options
+ var options =
+ {
+ maxExtent: extent,
+ numZoomLevels: 20,
+ };
+
+ // create the ol map object
+ var map = new OpenLayers.Map('map', options);
+
+var osmtiles = new OpenLayers.Layer.OSM("local", "http://10.0.1.153/tiles/${z}/${x}/${y}.png");
+// use http://open.atlas.free.fr/GMapsTransparenciesImgOver.php and http://code.google.com/p/googletilecutter/ to make tiles
+ var graphic = new OpenLayers.Layer.Image(
+ 'Weekday Bus Map',
+ 'weekday_bus_map.png',
+ new OpenLayers.Bounds(149.0, -35.47, 149.16, -35.16),
+ new OpenLayers.Size(1191, 2268),
+ {baseLayer: false}
+ );
+
+var nearmap = new OpenLayers.Layer.OSM.NearMap("NearMap");
+
+ var routes = new OpenLayers.Layer.GML("Routes", "displayroutes.kml.php", {
+ format: OpenLayers.Format.KML,
+ formatOptions: {
+ extractStyles: true,
+ extractAttributes: true,
+ maxDepth: 2
+ }
+ });
+var stopicon = new OpenLayers.Icon("http://maps.google.com/mapfiles/kml/pushpin/ylw-pushpin.png",new OpenLayers.Size(32,32));
+ var stops = new OpenLayers.Layer.GeoRSS("Stops", "displaystops.georss.php", { icon: stopicon });
+var timeicon = new OpenLayers.Icon("http://maps.google.com/mapfiles/kml/pushpin/grn-pushpin.png",new OpenLayers.Size(32,32));
+ var timepoints = new OpenLayers.Layer.GeoRSS("Timing Points", "displaytimepoints.georss.php", { icon: timeicon });
+
+ map.addLayers([osmtiles,stops,routes,timepoints,nearmap]);
+
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}));
@@ -36,47 +57,9 @@
{
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);
- }
- 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", "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
- })
- })
- }));
+
}
+
</script>
</head>
--- /dev/null
+++ b/displaystops.georss.php
@@ -1,1 +1,43 @@
+<?php
+header('Content-Type: application/xml');
+echo '<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"
+ xmlns:georss="http://www.georss.org/georss"><title>Bus Stops from OSM</title>';
+$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<entry>\n";
+ echo "<summary>";
+$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 "</summary>";
+ echo "<title>$name</title>";
+
+echo "<georss:point> ";echo ($stop['latitude']/10000000)." ".($stop['longitude']/10000000);
+echo " </georss:point>";
+echo '</entry>';
+}
+
+echo "\n</feed>\n";
+?>
--- a/displaystops.kml.php
+++ /dev/null
@@ -1,58 +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="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.georss.php
@@ -1,1 +1,26 @@
+<?php
+header('Content-Type: application/xml');
+echo '<?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom" xmlns:georss="http://www.georss.org/georss">';
+echo '<title> Points</title>';
+$conn = pg_connect("dbname=bus user=postgres password=snmc");
+if (!$conn) {
+ echo "An error occured.\n";
+ exit;
+}
+$result_timepoints = pg_query($conn, "Select * FROM timing_point where lat is not null and lng is not null ");
+if (!$result_timepoints) {
+ echo "An timepoints retirieve error occured.\n";
+ exit;
+}
+
+while ($timepoint = pg_fetch_assoc($result_timepoints)) {
+ echo "<entry>";
+ echo "<summary>".htmlspecialchars ($timepoint['name'])."</summary>";
+ echo "<title>".htmlspecialchars($timepoint['name'])."</title>";
+echo "<georss:point> ".($timepoint['lat']/10000000)." ".($timepoint['lng']/10000000)."</georss:point>";
+echo "</entry>\n";
+}
+
+echo "\n</feed>\n";
+?>
--- a/displaytimepoints.kml.php
+++ /dev/null
@@ -1,58 +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="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/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,163 @@
+#!/usr/bin/ruby
+require 'postgres'
+require 'highline.rb'
+include HighLine
+
+require 'rubygems'
+require 'json'
+require 'net/http'
+def cbr_geocode(query)
+ base_url = "http://geocoding.cloudmade.com/daa03470bb8740298d4b10e3f03d63e6/geocoding/v2/find.js?query="
+ 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
+
+ # we convert the returned JSON data to native Ruby
+ # data structure - a hash
+ result = JSON.parse(data)
+
+ # if the hash has 'Error' as a key, we raise an error
+ if result.has_key? 'Error'
+ raise "web service error"
+ end
+ return result
+end
+
+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(/'/, "''").gsub("St", "%")
+ 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(mat