rectify inline yaml sequence format
--- a/display.php
+++ b/display.php
@@ -1,23 +1,8 @@
<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()
{
@@ -28,14 +13,38 @@
{
maxExtent: extent,
numZoomLevels: 20,
- };
+ };
// create the ol map object
var map = new OpenLayers.Map('map', options);
-layer = new OpenLayers.Layer.OSM("local", "http://10.0.1.153/tiles/${z}/${x}/${y}.png");
- map.addLayer(layer);
-map.addLayer(new OpenLayers.Layer.OSM.NearMap("NearMap"));
+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}));
@@ -48,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";
-?>
--- a/maxious-canberra-transit-feed/01-extracttimes.rb
+++ b/maxious-canberra-transit-feed/01-extracttimes.rb
@@ -2,6 +2,13 @@
require 'nokogiri'
require 'open-uri'
require 'pp'
+require 'yaml'
+class Array
+ def to_yaml_style
+ :inline
+ end
+end
+
def makeTimetable(table, period, short_name)
timetable = {"stop_times" => [], "between_stops" => [], "short_name" => short_name}
@@ -11,7 +18,7 @@
end
end
time_points.delete(nil)
- timetable["time_points"] = time_points
+ timetable["time_points"] = time_points.to_a
timetable["long_name"] = "To " + time_points.last
periodtimes = []
table.css('tr').each do |row|
@@ -23,18 +30,18 @@
if not (route = times.shift)
raise("TODO: account for shifting route numbers eg. intertown/redex 62/162")
end
- periodtimes << times
+ periodtimes << times.to_a
end
end
if periodtimes.size < 1
raise "No times for route " + short_name + " in period " + period
end
- timetable["stop_times"] = { period => periodtimes }
+ timetable["stop_times"] = { period => periodtimes.to_a }
# 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
+ f.write timetable.to_yaml
end
timetable
end
--- a/maxious-canberra-transit-feed/02-tidytimepoints.rb
+++ b/maxious-canberra-transit-feed/02-tidytimepoints.rb
@@ -62,8 +62,13 @@
"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",
}
time_point_corrections.each do |wrong, right|
$time_points_sources[wrong].each do |wrongfile|
--- a/maxious-canberra-transit-feed/03-locatetimepoints.rb
+++ b/maxious-canberra-transit-feed/03-locatetimepoints.rb
@@ -22,6 +22,12 @@
raise "web service error"
end
return result
+end
+class Array
+
+ def find_dups
+ inject(Hash.new(0)) { |h,e| h[e] += 1; h }.select { |k,v| v > 1 }.collect { |x| x.first }
+ end
end
require 'yaml'
@@ -51,7 +57,7 @@
if ask_if("Insert Timing Point names to database?")
$time_points.each do |time_point|
begin
- time_point = time_point.gsub(/\\/, '\&\&').gsub(/'/, "''")
+ 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
@@ -63,6 +69,7 @@
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
@@ -74,8 +81,9 @@
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 '%#{name}%') as a
+ (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
@@ -119,6 +127,103 @@
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?")
@@ -140,11 +245,10 @@
nodeID = ask("Enter selected node ID:", :integer)
if results['features'].at(nodeID) != nil
node = results['features'][nodeID]
- guess = ask_if("Is this a guess?")
puts "Location #{node['centroid']['coordinates'][0]},#{node['centroid']['coordinates'][1]} for #{null_point_name}"
begin
res = connbus.exec("UPDATE timing_point SET lat = #{node['centroid']['coordinates'][0]*10000000}, lng =
- #{node['centroid']['coordinates'][1]*10000000},guess = #{guess} WHERE name = '#{name}'")
+ #{node['centroid']['coordinates'][1]*10000000},guess = true WHERE name = '#{name}'")
puts "Put '#{null_point_name}' into DB"
rescue PGError => e
puts "Error inserting '#{null_point_name}' to DB #{e}"
--- /dev/null
+++ b/maxious-canberra-transit-feed/04-generateymlinclude.rb
@@ -1,1 +1,38 @@
+#!/usr/bin/ruby
+require 'postgres'
+require 'highline.rb'
+include HighLine
+
+require 'rubygems'
+require 'json'
+require 'yaml'
+require 'pp'
+# make - { name: Civic Interchange Platform 1,stop_code: civic_platform_1, lat: -35.2794347, lng: 149.130588}
+connbus = PGconn.connect("localhost", 5432, '', '', "bus", "postgres", "snmc")
+
+f = File.open('cbrtable.yml.in.in')
+header = f.readlines
+f.close
+
+File.open('cbrtable.yml.in', 'w') do |f2|
+ f2.puts header
+ f2.puts "stops:\n";
+ begin
+ time_points = connbus.exec("SELECT * from timing_point")
+ rescue PGError => e
+ puts "Error reading from DB #{e}"
+ #conn.close() if conn
+ end
+ time_points.each do |time_point|
+ #pp time_point
+ # 0 = name
+
+ # 1 = lat*100000
+ # 2 = lng*100000
+ f2.puts " - { name: #{time_point[0]},stop_code: #{time_point[0]}, lat: #{Float(time_point[1])/10000000}, lng: #{Float(time_point[2])/10000000}}"
+ end
+ f2.puts "routes:\n";
+end
+
+
--- a/maxious-canberra-transit-feed/Makefile
+++ b/maxious-canberra-transit-feed/Makefile
@@ -3,20 +3,16 @@
cbrfeed.zip: cbrtable.yml createfeed.py
./createfeed.py --input=cbrtable.yml --output=cbrfeed.zip
-ROUTE_FILES=900-intertown.yml
-
-cbrtable.yml: cbrtable.yml.in $(ROUTE_FILES) indent-route.pl
+cbrtable.yml: cbrtable.yml.in indent-route.pl
cp cbrtable.yml.in cbrtable.yml
- @$(foreach ROUTE_FILE, $(ROUTE_FILES), \
+ @$(foreach ROUTE_FILE, $(wildcard output/*), \
echo "Parsing $(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;)
+ ./indent-route.pl < $(ROUTE_FILE) >> cbrtable.yml;)
cbrtable.yml.in: cbrtable.yml.in.in
- @echo "TODO: autogenerate stops via database, convert to YAML"
- cp cbrtable.yml.in.in cbrtable.yml.in
-
+ ruby 04-generateymlinclude.rb
clean:
rm -f cbrtable.yml cbrtable.yml.in cbrfeed.zip *~
--- a/maxious-canberra-transit-feed/cbrtable.yml
+++ b/maxious-canberra-transit-feed/cbrtable.yml
@@ -1,99 +1,1840 @@
options:
start_date: 20090525
- end_date: 20100601
- remove_date: 2010601
+ end_date: 20101001
+ remove_date: 20101001
agency_name: ACT Internal Omnibus Network (ACTION)
agency_url: http://www.action.act.gov.au/
agency_timezone: Australia/Canberra
+
stops:
- - { name: Civic Interchange Platform 1,stop_code: civic_platform_1, lat: -35.2794347, lng: 149.130588}
- - { name: Civic Interchange Platform 5,stop_code: civic_platform_5, lat: -35.2786, lng: 149.13033}
- - { name: Civic Interchange Platform 6,stop_code: civic_platform_6, lat: -35.27851, lng: 149.12979 }
- - { name: Canberra House Northbound, stop_code: 3042, lat: -35.27833,
-lng: 149.12712 }
- - { name: Canberra House Southbound, stop_code: 4531,
-lat: -35.2786, lng: 149.13033 }
- - { name: Marcus Clarke Street - Unilodge ANU, stop_code: 4929, lat: -35.2764151, lng: 149.1267199 }
+ - { name: ADFA,stop_code: ADFA, lat: -35.2937972, lng: 149.1643403}
+ - { name: Ainslie,stop_code: Ainslie, lat: -35.2620105, lng: 149.1443302}
+ - { name: Aranda,stop_code: Aranda, lat: -35.257534, lng: 149.0762963}
+ - { name: Bonython,stop_code: Bonython, lat: -35.4297416, lng: 149.0814517}
+ - { name: Botanic Gardens,stop_code: Botanic Gardens, lat: -35.278643, lng: 149.1093237}
+ - { name: Cameron Ave Bus Station,stop_code: Cameron Ave Bus Station, lat: -35.2410195, lng: 149.0722506}
+ - { name: Cameron Ave Bus Station - Platform 1,stop_code: Cameron Ave Bus Station - Platform 1, lat: -35.2410195, lng: 149.0722506}
+ - { name: Cameron Ave Bus Station - Platform 2,stop_code: Cameron Ave Bus Station - Platform 2, lat: -35.2410108, lng: 149.0717142}
+ - { name: Cameron Ave Bus Station - Platform 3,stop_code: Cameron Ave Bus Station - Platform 3, lat: -35.2410064, lng: 149.0710758}
+ - { name: Cameron Ave Bus Station - Platform 4,stop_code: Cameron Ave Bus Station - Platform 4, lat: -35.2411773, lng: 149.0709793}
+ - { name: Cameron Ave Bus Station - Platform 5,stop_code: Cameron Ave Bus Station - Platform 5, lat: -35.241186, lng: 149.0720789}
+ - { name: Canberra College Weston,stop_code: Canberra College Weston, lat: -35.3490278, lng: 149.0486277}
+ - { name: Canberra Hospital,stop_code: Canberra Hospital, lat: -35.3459462, lng: 149.1012001}
+ - { name: Canberra Times,stop_code: Canberra Times, lat: -35.3245431, lng: 149.1705533}
+ - { name: Chapman,stop_code: Chapman, lat: -35.3557877, lng: 149.0408111}
+ - { name: Charnwood,stop_code: Charnwood, lat: -35.2052138, lng: 149.0337266}
+ - { name: Chifley,stop_code: Chifley, lat: -35.350985, lng: 149.077319}
+ - { name: Bonython Primary,stop_code: Bonython Primary, lat: -35.431019, lng: 149.0831217}
+ - { name: Cohen St Bus Station - Platform 1,stop_code: Cohen St Bus Station - Platform 1, lat: -35.2394775, lng: 149.0602031}
+ - { name: Conder Primary,stop_code: Conder Primary, lat: -35.4643475, lng: 149.0986908}
+ - { name: Cook,stop_code: Cook, lat: -35.2646433, lng: 149.0631708}
+ - { name: Copland College,stop_code: Copland College, lat: -35.2127018, lng: 149.0596387}
+ - { name: Curtin,stop_code: Curtin, lat: -35.3248779, lng: 149.081441}
+ - { name: Dickson,stop_code: Dickson, lat: -35.2498434, lng: 149.1391218}
+ - { name: Duffy,stop_code: Duffy, lat: -35.3366908, lng: 149.0324311}
+ - { name: Dunlop,stop_code: Dunlop, lat: -35.1942693, lng: 149.0206702}
+ - { name: Belconnen Way,stop_code: Belconnen Way, lat: -35.24809, lng: 149.06765}
+ - { name: Calvary Hospital,stop_code: Calvary Hospital, lat: -35.25212, lng: 149.09088}
+ - { name: Causeway,stop_code: Causeway, lat: -35.31615, lng: 149.15058}
+ - { name: Chisholm Shops,stop_code: Chisholm Shops, lat: -35.41341, lng: 149.12833}
+ - { name: Dickson College,stop_code: Dickson College, lat: -35.24923, lng: 149.15315}
+ - { name: Farrer Primary School,stop_code: Farrer Primary School, lat: -35.37887, lng: 149.10641}
+ - { name: Flemington Rd,stop_code: Flemington Rd, lat: -35.20756, lng: 149.14778}
+ - { name: Kippax Centre,stop_code: Kippax Centre, lat: -35.22172, lng: 149.01995}
+ - { name: Latham Shops,stop_code: Latham Shops, lat: -35.21848, lng: 149.03214}
+ - { name: National Aquarium,stop_code: National Aquarium, lat: -35.29915, lng: 149.07025}
+ - { name: Olims Hotel,stop_code: Olims Hotel, lat: -35.27597, lng: 149.1428}
+ - { name: Sainsbury Street,stop_code: Sainsbury Street, lat: -35.3885, lng: 149.09643}
+ - { name: Scullin Shops,stop_code: Scullin Shops, lat: -35.23356, lng: 149.04056}
+ - { name: Sydney Avenue,stop_code: Sydney Avenue, lat: -35.31193, lng: 149.13105}
+ - { name: Tuggeranong Interchange,stop_code: Tuggeranong Interchange, lat: -35.41465, lng: 149.06537}
+ - { name: City Interchange - Platform 1,stop_code: City Interchange - Platform 1, lat: -35.2794346, lng: 149.1305879}
+ - { name: City Interchange - Platform 10,stop_code: City Interchange - Platform 10, lat: -35.2793571, lng: 149.1293659}
+ - { name: City Interchange - Platform 3,stop_code: City Interchange - Platform 3, lat: -35.2787886, lng: 149.1304779}
+ - { name: City Interchange - Platform 4,stop_code: City Interchange - Platform 4, lat: -35.2785658, lng: 149.1301727}
+ - { name: City Interchange - Platform 7,stop_code: City Interchange - Platform 7, lat: -35.27843, lng: 149.130345}
+ - { name: City Interchange - Platform 8,stop_code: City Interchange - Platform 8, lat: -35.2778798, lng: 149.1305995}
+ - { name: City Interchange - Platform 9,stop_code: City Interchange - Platform 9, lat: -35.2783224, lng: 149.130726}
+ - { name: Tuggeranong Interchange - Platform 4,stop_code: Tuggeranong Interchange - Platform 4, lat: -35.4144924, lng: 149.0655423}
+ - { name: Tuggeranong Interchange - Platform 5,stop_code: Tuggeranong Interchange - Platform 5, lat: -35.414217, lng: 149.0653492}
+ - { name: Tuggeranong Interchange - Platform 7,stop_code: Tuggeranong Interchange - Platform 7, lat: -35.4146761, lng: 149.0654565}
+ - { name: Cohen St Bus Station - Platform 4,stop_code: Cohen St Bus Station - Platform 4, lat: -35.239844, lng: 149.0600683}
+ - { name: Cohen St Bus Station - Platform 5,stop_code: Cohen St Bus Station - Platform 5, lat: -35.2401211, lng: 149.0597102}
+ - { name: Cohen St Bus Station - Platform 6,stop_code: Cohen St Bus Station - Platform 6, lat: -35.2400028, lng: 149.060315}
+ - { name: Lathlain St