More network 10 updates
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-maxious-canberra-transit-feed/output/
+origin-src
--- a/betweenpoint.load.php
+++ /dev/null
@@ -1,76 +1,1 @@
-<?php
-/*
- * GeoPo Encode in PHP
- * @author : Shintaro Inagaki
- * @param $location (Array)
- * @return $geopo (String)
- */
-function geopoEncode($lat, $lng) {
- // 64characters (number + big and small letter + hyphen + underscore)
- $chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
-
- $geopo = "";
- $scale = 7;
-
- // Change a degree measure to a decimal number
- $lat = ($lat + 90) / 180 * pow(8, 10);
- $lng = ($lng + 180) / 360 * pow(8, 10);
- // Compute a GeoPo code from head and concatenate
- for($i = 0; $i < $scale; $i++) {
- $geopo .= substr($chars, floor($lat / pow(8, 9 - $i) % 8) + floor($lng / pow(8, 9 - $i) % 8) * 8, 1);
- }
- return $geopo;
-}
-
-/*
- * GeoPo Decode in PHP
- * @author : Shintaro Inagaki
- * @param $geopo (String)
- * @return $location (Array)
- */
-function geopoDecode($geopo) {
- // 64characters (number + big and small letter + hyphen + underscore)
- $chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
- // Array for geolocation
- $location = array ();
-
- for ($i = 0; $i < strlen($geopo); $i++) {
- // What number of character that equal to a GeoPo code (0-63)
- $order = strpos($chars, substr($geopo, $i, 1));
- // Lat/Lng plus geolocation value of scale
- $location['lat'] = $location['lat'] + floor($order % 8) * pow(8, 9 - $i);
- $location['lng'] = $location['lng'] + floor($order / 8) * pow(8, 9 - $i);
- }
-
- // Change a decimal number to a degree measure, and plus revised value that shift center of area
- $location['lat'] = $location['lat'] * 180 / pow(8, 10) + 180 / pow(8, strlen($geopo)) / 2 - 90;
- $location['lng'] = $location['lng'] * 360 / pow(8, 10) + 360 / pow(8, strlen($geopo)) / 2 - 180;
- $location['scale'] = strlen($geopo);
-
- return $location;
-}
-
-$conn = pg_connect("dbname=bus user=postgres password=snmc");
-if (!$conn) {
- echo "An error occured.\n";
- exit;
-}
-$xml = simplexml_load_file("04-locatebetweenpoints.osm");
-
-/* Access the <rating> nodes of the first movie.
- * Output the rating scale, too. */
-foreach ($xml->node as $node) {
- $geoPo = geopoEncode((float)$node['lat'],(float)$node['lon']);
- $node['lat'] = (int) ((float)$node['lat']*10000000);
- $node['lon'] = (int) ((float)$node['lon']*10000000);
- echo($node['lat'].",".$node['lon']."=$geoPo<br>");
- $sql = "INSERT INTO stops (geohash, lat, lng) VALUES('$geoPo','{$node['lat']}','{$node['lon']}')";
- $result = pg_query($conn, $sql);
- if (!$result) {
- echo("Error in SQL query: " . pg_last_error() ."<br>\n");
- }
-flush();
-
-}
-?>
--- a/betweenpoint.php
+++ b/betweenpoint.php
@@ -7,71 +7,65 @@
function init()
{
- // create the ol map object
- var map = new OpenLayers.Map('map');
+ // create the ol map object
+ var map = new OpenLayers.Map('map');
- var osmtiles = new OpenLayers.Layer.OSM("local", "http://127.0.0.1/Maps/OSM/${z}/${x}/${y}.png")
+ var osmtiles = new OpenLayers.Layer.OSM("local", "http://127.0.0.1/Maps/OSM/${z}/${x}/${y}.png")
// use http://open.atlas.free.fr/GMapsTransparenciesImgOver.php and http://code.google.com/p/googletilecutter/ to make tiles
- markers = new OpenLayers.Layer.Markers("Between Stop Markers");
+ markers = new OpenLayers.Layer.Markers("Between Stop Markers");
<?php
-$conn = pg_connect("dbname=bus user=postgres password=snmc");
-if (!$conn) {
- echo "An error occured.\n";
- exit;
-}
-$result_stops = pg_query($conn, "Select * FROM stops");
-
-while ($stop = pg_fetch_assoc($result_stops)) {
-echo 'marker = new OpenLayers.Marker(new OpenLayers.LonLat('.($stop['lng']/10000000).",".($stop['lat']/10000000).')
+ $conn = pg_connect("dbname=bus user=postgres password=snmc");
+ if (!$conn) {
+ echo "An error occured.\n";
+ exit;
+ }
+ $result_stops = pg_query($conn, "Select * FROM stops");
+
+ while ($stop = pg_fetch_assoc($result_stops)) {
+ echo 'marker = new OpenLayers.Marker(new OpenLayers.LonLat(' . ($stop['lng'] / 10000000) . "," . ($stop['lat'] / 10000000) . ')
.transform(
new OpenLayers.Projection("EPSG:4326"), // transform from WGS 1984
new OpenLayers.Projection("EPSG:900913") // to Spherical Mercator Projection
));';
-
-echo '
- marker.id="'.$stop['geohash'].'";
+
+ echo '
+ marker.id="' . $stop['geohash'] . '";
markers.addMarker(marker);
marker.events.register("mousedown", marker, function() {
document.getElementById("between_points").innerHTML += this.id+";";
});
';
-}
+ }
?>
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, markers,timepoints]);
map.addControl(new OpenLayers.Control.LayerSwitcher());
- map.zoomToExtent(markers.getDataExtent());
+ map.zoomToExtent(markers.getDataExtent());
}
+ </script>
+ <script type="text/javascript">
+function submitBetween () {
+ $.post("betweenpoint.submit.php", $("#inputform").serialize(), function(html){
+ $("#response").html(html);
+ //clearForms();
+ return false;
+ });
+};
- function submit(){
- $.ajax({
- type: "POST",
- url: "betweenpoint.submit.php",
- data: "reverse=" + document.getElementById("reverse").value +
- "&from=" + document.getElementById("from").value +
- "&to=" + document.getElementById("to").value +
- "&routes=" + document.getElementById("routes").value +
- "&between_points=" + document.getElementById("between_points").value,
- success: function(html){
- $("#response").html(html);
- clearForms();
- }
- });
-
- }
-<!--
function OnChange(dropdown)
{
var myindex = dropdown.selectedIndex
- var selValue = dropdown.options[myindex].value
-alert(selValue);
+ var selValue = dropdown.options[myindex].value;
+ $("#routes").val(selValue.split(":",2)[0]);
+ fromto = selValue.split(":",2)[1];
+ $("#from").val(fromto.split("->",2)[0]);
+ $("#to").val(fromto.split("->",2)[1]);
return true;
}
-//-->
// function will clear input elements on each form
function clearForms(){
@@ -96,7 +90,7 @@
break;
case "radio":
case "checkbox":
- document.forms[x].elements[y].checked = "";
+ document.forms[x].elements[y].checked = true;
break;
case "select-one":
document.forms[x].elements[y].options[0].selected = true;
@@ -118,72 +112,69 @@
<select name=selectPair onchange='OnChange(this.form.selectPair);'>
<option>Select a from/to pair...</option>
<?php
-include('spyc/spyc.php');
-//$timetable = Spyc::YAMLLoad('../spyc.yaml');
-$path = "maxious-canberra-transit-feed/output/";
-$dhandle = opendir("maxious-canberra-transit-feed/output/");
-// define an array to hold the files
-$files = array();
-$paths = array();
+ include('spyc/spyc.php');
+ //$timetable = Spyc::YAMLLoad('../spyc.yaml');
+ $path = "maxious-canberra-transit-feed/output/";
+ $dhandle = opendir("maxious-canberra-transit-feed/output/");
+ // define an array to hold the files
+ $files = array();
+ $paths = array();
+
+ if ($dhandle) {
+ // loop through all of the files
+ while (false !== ($fname = readdir($dhandle))) {
+ if (($fname != '.') && ($fname != '..')) {
+ $timetable = Spyc::YAMLLoad("maxious-canberra-transit-feed/output/" . $fname);
+ // Strip off individual platforms because it usually doesn't matter for routes
+ $timetable["time_points"] = preg_replace("/(Platform.*/","",$timetable["time_points"]);
+ for ($i = 0; $i < sizeof($timetable["time_points"]) - 1; $i++) {
+ @$paths[trim($timetable["time_points"][$i]) . "->" . trim($timetable["time_points"][$i + 1])] .= $timetable["short_name"] . ";";
+ }
+ }
+ }
+ }
+ ksort($paths);
+
+ $completedPaths = array();
+ $result_betweenstops = pg_query($conn, "Select * FROM between_stops");
+ while ($path = pg_fetch_assoc($result_betweenstops)) {
+ $completedPaths[trim($path['fromlocation']) . "->" . trim($path['tolocation'])] .= trim($path['routes']);
+ }
+
+ foreach ($paths as $path => $routes) {
+ if (!in_array($path, array_keys($completedPaths))) {
+ echo "<option value=\"$routes:$path\">" . sizeof(explode(";", $routes)) . " $path</option>\n";
+ } else {
+ $completedRoutes = explode(";", $completedPaths[$path]);
+ $incompleteRoutes = "";
+ foreach (explode(";", $routes) as $route) {
-if ($dhandle) {
- // loop through all of the files
- while (false !== ($fname = readdir($dhandle))) {
- if (($fname != '.') && ($fname != '..')) {
- $timetable = Spyc::YAMLLoad("maxious-canberra-transit-feed/output/".$fname);
- for ($i = 0; $i < sizeof($timetable["time_points"]) -1 ; $i++)
- {
- @$paths[$timetable["time_points"][$i]."->".$timetable["time_points"][$i+1]] .= $timetable["short_name"].";";
- }
+ if (!in_array($route,$completedRoutes)) {
+ $incompleteRoutes .= $route.';';
+ }
+
}
- }
-}
-$completedPaths = Array("Cameron Ave Bus Station->Lathlain St Bus Station",
-"Lathlain St Bus Station->Cohen St Bus Station",
-"Cohen St Bus Station->Lathlain St Bus Station",
-"Lathlain St Bus Station->Cameron Ave Bus Station",
-"Lathlain St Bus Station - Platform 1->Cameron Ave Bus Station - Platform 1",
-"Lathlain St Bus Station - Platform 2->Cameron Ave Bus Station - Platform 1",
-"Lathlain St Bus Station - Platform 2->Cameron Ave Bus Station - Platform 2",
-"Lathlain St Bus Station - Platform 3->Cameron Ave Bus Station - Platform 2",
-"Lathlain St Bus Station - Platform 3->Cameron Ave Bus Station - Platform 3",
-"Lathlain St Bus Station - Platform 4->Cohen St Bus Station - Platform 4",
-"Lathlain St Bus Station - Platform 4->Cohen St Bus Station - Platform 6",
-"Lathlain St Bus Station - Platform 5->Cohen St Bus Station - Platform 5",
-"Lathlain St Bus Station - Platform 6->Cohen St Bus Station - Platform 5",
-"Cohen St Bus Station - Platform 1->Lathlain St Bus Station - Platform 2",
-"Cohen St Bus Station - Platform 1->Lathlain St Bus Station - Platform 3",
-"Cohen St Bus Station - Platform 2->Lathlain St Bus Station - Platform 1",
-"Cohen St Bus Station - Platform 2->Lathlain St Bus Station - Platform 2",
-"Cohen St Bus Station - Platform 2->Lathlain St Bus Station - Platform 3",
-"Cohen St Bus Station - Platform 3->Lathlain St Bus Station - Platform 1",
-"Cameron Ave Bus Station - Platform 4->Lathlain St Bus Station - Platform 4",
-"Cameron Ave Bus Station - Platform 5->Lathlain St Bus Station - Platform 5",
-"Cameron Ave Bus Station - Platform 5->Lathlain St Bus Station - Platform 6"
-);
-ksort($paths);
-foreach ($paths as $path => $routes)
-{
- if (!in_array($path,$completedPaths)) echo "<option value=\"$routes:$path\">".sizeof(explode(";",$routes))." $path</option>\n";
-}
+ if ($incompleteRoutes != "") echo "<option value=\"$incompleteRoutes:$path\">" . sizeof(explode(";", $incompleteRoutes)) . " $path</option>\n";
+ }
+
+ }
?>
</select>
- from <input type="text" id="from"/>
- to <input type="text" id="to"/>
+ from <input type="text" name="from" id="from"/>
+ to <input type="text" name="to" id="to"/>
<br>
- on routes <input type="text" id="routes"/>
-Reverse? <input type="checkbox" name="reverse" id="reverse" value="true"/>
-<input type="button" onclick="javascript:submit()" name="mysubmit" value="Submit!">
+ on routes <input type="text" name="routes" id="routes"/>
+Reverse? <input type="checkbox" name="reverse" id="reverse" checked="true"/>
+<input type="button" onclick="javascript:submitBetween()" value="Submit!">
<input type="button" value="Clear" onclick="javascript:clearForms()" title="Start clearForms() JavaScript function">
<br>
-<textarea id="between_points" rows="1" cols="120"></textarea>
+<textarea name="between_points" id="between_points" rows="1" cols="120"></textarea>
</form>
-<br><div id="response">
- <!-- Our message will be echoed out here -->
- </div>
+<div id="response">
+ <!-- Our message will be echoed out here -->
+ </div>
</div>
<div id="map" width="100%" height="100%"></div>
</body>
</html>
-
--- a/betweenpoint.submit.php
+++ b/betweenpoint.submit.php
@@ -1,76 +1,29 @@
<?php
-/*
- * GeoPo Encode in PHP
- * @author : Shintaro Inagaki
- * @param $location (Array)
- * @return $geopo (String)
- */
-function geopoEncode($lat, $lng) {
- // 64characters (number + big and small letter + hyphen + underscore)
- $chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
-
- $geopo = "";
- $scale = 7;
-
- // Change a degree measure to a decimal number
- $lat = ($lat + 90) / 180 * pow(8, 10);
- $lng = ($lng + 180) / 360 * pow(8, 10);
- // Compute a GeoPo code from head and concatenate
- for($i = 0; $i < $scale; $i++) {
- $geopo .= substr($chars, floor($lat / pow(8, 9 - $i) % 8) + floor($lng / pow(8, 9 - $i) % 8) * 8, 1);
- }
- return $geopo;
-}
-
-/*
- * GeoPo Decode in PHP
- * @author : Shintaro Inagaki
- * @param $geopo (String)
- * @return $location (Array)
- */
-function geopoDecode($geopo) {
- // 64characters (number + big and small letter + hyphen + underscore)
- $chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
- // Array for geolocation
- $location = array ();
-
- for ($i = 0; $i < strlen($geopo); $i++) {
- // What number of character that equal to a GeoPo code (0-63)
- $order = strpos($chars, substr($geopo, $i, 1));
- // Lat/Lng plus geolocation value of scale
- $location['lat'] = $location['lat'] + floor($order % 8) * pow(8, 9 - $i);
- $location['lng'] = $location['lng'] + floor($order / 8) * pow(8, 9 - $i);
- }
-
- // Change a decimal number to a degree measure, and plus revised value that shift center of area
- $location['lat'] = $location['lat'] * 180 / pow(8, 10) + 180 / pow(8, strlen($geopo)) / 2 - 90;
- $location['lng'] = $location['lng'] * 360 / pow(8, 10) + 360 / pow(8, strlen($geopo)) / 2 - 180;
- $location['scale'] = strlen($geopo);
-
- return $location;
-}
-
$conn = pg_connect("dbname=bus user=postgres password=snmc");
if (!$conn) {
echo "An error occured.\n";
exit;
}
-$xml = simplexml_load_file("04-locatebetweenpoints.osm");
-
-/* Access the <rating> nodes of the first movie.
- * Output the rating scale, too. */
-foreach ($xml->node as $node) {
- $geoPo = geopoEncode((float)$node['lat'],(float)$node['lon']);
- $node['lat'] = (int) ((float)$node['lat']*10000000);
- $node['lon'] = (int) ((float)$node['lon']*10000000);
- echo($node['lat'].",".$node['lon']."=$geoPo<br>");
- $sql = "INSERT INTO stops (geohash, lat, lng) VALUES('$geoPo','{$node['lat']}','{$node['lon']}')";
+print_r($_REQUEST);
+$reverse=$_REQUEST["reverse"];
+$from=$_REQUEST["from"];
+$to=$_REQUEST["to"];
+$routes=$_REQUEST["routes"] ;
+$points=$_REQUEST["between_points"];
+ $sql = "INSERT INTO between_stops (fromLocation, toLocation, points, routes) VALUES('$from','$to','$points','$routes')";
$result = pg_query($conn, $sql);
if (!$result) {
echo("Error in SQL query: " . pg_last_error() ."<br>\n");
}
+ if ($reverse === "on") {
+ $points = implode(";",array_reverse(explode(";",$points)));
+$sql = "INSERT INTO between_stops ( toLocation, fromLocation, points, routes) VALUES('$from','$to','$points','$routes')";
+$result = pg_query($conn, $sql);
+ if (!$result) {
+ echo("Error in SQL query: " . pg_last_error() ."<br>\n");
+ }
+ }
flush();
-}
?>
--- a/busui/common.inc.php
+++ b/busui/common.inc.php
@@ -1,6 +1,7 @@
<?php
date_default_timezone_set('Australia/ACT');
$APIurl = "http://localhost:8765";
+error_reporting(E_ALL ^ E_NOTICE);
function isDebug()
{
--- a/busui/list.php
+++ /dev/null
@@ -1,22 +1,1 @@
-<div id="get">
- <div class="toolbar">
- <h1>GET Example</h1>
- <a class="back" href="#">AJAX</a>
- </div>
- <div class="info">
- This page was loaded via AJAX.
- </div>
- <ul class="rounded">
- <li><a href="#livetest">Test live events</a></li>
- </ul>
-</div>
-<div id="livetest">
- <div class="toolbar">
- <h1>Events test</h1>
- <a class="back" href="#">AJAX</a>
- <a class="button goback" href="#home">Home</a>
- </div>
- <div class="info">
- This is a test of live events.
- </div>
-</div>
+
--- a/busui/schedule_viewer.py
+++ b/busui/schedule_viewer.py
@@ -337,6 +337,14 @@
def handle_json_GET_stops(self, params):
schedule = self.server.schedule
return [StopToTuple(s) for s in schedule.GetStopList()]
+
+ def handle_json_GET_timingpoints(self, params):
+ schedule = self.server.schedule
+ matches = []
+ for s in schedule.GetStopList():
+ if s.stop_code.find("Wj") == -1:
+ matches.append(StopToTuple(s))
+ return matches
def handle_json_GET_stopsearch(self, params):
schedule = self.server.schedule
--- a/maxious-canberra-transit-feed/01-extracttimes.rb
+++ b/maxious-canberra-transit-feed/01-extracttimes.rb
@@ -14,10 +14,16 @@
timetable = {"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
+ timing_point = tp.content.squeeze(" ").gsub("Bus Station"," Bus Station ").gsub(" Platform"," (Platform").gsub(" - "," - ").gsub("\n"," ").gsub("\r"," ").gsub("\t"," ").gsub("\\"," / ").gsub("/"," / ").gsub(",",", ").gsub("\302\240","").squeeze(" ").strip
+ if (tp.content.match('Platform'))
+ timing_point.concat(")")
+ end;
+ timing_point
end
end
time_points.delete(nil)
+ time_points.delete("WheelchairAccessible")
+ time_points.delete("Wheelchair Accessible")
timetable["time_points"] = time_points.to_a
timetable["long_name"] = "To " + time_points.last
periodtimes = []
@@ -27,8 +33,11 @@
time = time.gsub(/ *A\S?M/,"a").gsub(/ ?P\S?M/,"p").gsub("12:08 AM","1208x").gsub(":","").gsub("1.","1").gsub("2.","2")
time = time.gsub("3.","3").gsub("4.","4")
time = time.gsub("5.","5").gsub("6.","6").gsub("7.","7").gsub("8.","8").gsub("9.","9").gsub("10.","10")
- time = time.gsub("11.","11").gsub("12.","12").gsub(/\.+/,"-")
+ time = time.gsub("11.","11").gsub("12.","12").gsub(/\.+/,"-").gsub("\302\240","")
+ if time == "" then time = nil end
+ time
end
+ times.delete(nil)
if not times.empty?
if not (route = times.shift)
raise("TODO: account for shifting route numbers eg. intertown/redex 62/162")
@@ -42,7 +51,7 @@
timetable[period] = periodtimes.to_a
# pp timetable
filename = timetable["short_name"] + "-" + timetable["long_name"]+ "." + period + ".yml"
- filename = filename.downcase.gsub(" ","-").gsub("/","-")
+ filename = filename.downcase.gsub(" ","-").gsub("/","-").gsub("(","").gsub(")","")
puts "Saving " + filename
File.open("#{File.dirname(__FILE__)}/output/"+filename, "w") do |f|
f.write timetable.to_yaml
@@ -50,7 +59,6 @@
timetable
end
-#TODO fix route 934
Dir.glob("source-html/Route*.htm*") { |file|
puts "Opened " + file
doc = Nokogiri::HTML(open(file))
@@ -58,7 +66,7 @@
timetables = []
short_name = "";
doc.xpath('//title').each do |title|
- short_name = title.content.gsub("Route_","").gsub("Route ","").gsub(", ","/").squeeze(" ").strip
+ short_name = title.content.gsub("Route_","").gsub("Route ","").gsub(", ","/").gsub("ACTION Buses Timetable for ","").squeeze(" ").strip
end
if short_name == ""
raise "Route number(s) not found in <title> tag"
@@ -67,7 +75,15 @@
doc.xpath('//table[preceding::text()="Weekdays"]').each do |table|
timetables << makeTimetable(table, "stop_times", short_name)
end
-
+ doc.xpath('//table[preceding::text()="This timetable is effective from Monday 15th November 2010."]').each do |table|
+ timetables << makeTimetable(table, "stop_times", short_name)
+ end
+ #all tables are weekdays on some really malformatted timetables
+ if short_name == "170"
+ doc.xpath('//table').each do |table|
+ timetables << makeTimetable(table, "stop_times", short_name)
+ end
+ end
#weekends
doc.xpath('//table[preceding::text()="Saturdays" and following::a]').each do |table|
timetables << makeTimetable(table, "stop_times_saturday", short_name)
--- a/maxious-canberra-transit-feed/02-tidytimepoints.rb
+++ b/maxious-canberra-transit-feed/02-tidytimepoints.rb
@@ -2,9 +2,9 @@
require 'pp'
require 'yaml'
class Array
- def to_yaml_style
- :inline
- end
+ def to_yaml_style
+ :inline
+ end
end
Dir.chdir("output")
@@ -25,60 +25,31 @@
#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",
- "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",
- "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",
- "Manuka Captain Cook" => "Manuka/Captain Cook",
- "Manuka, Captain Cook" => "Manuka/Captain Cook",
- "Hospice, Menindee Drive" => "Hospice",
- "Tharwa/Pocket" => "Tharwa/Pockett",
- "Paul-Co / Mirrabei" => "Paul Coe / Mirrabei"
- }
+ "Woden Bus Station Platform 10)" => "Woden Bus Station (Platform 10)",
+ "Saint AndrewsVillage Hughes"=>"Saint Andrews Village Hughes",
+ "Flemmington Road / Sandford St"=>"Flemington Road / Sandford St",
+ "City Interchange"=>"City Bus Station",
+ "City Interchange (Platform 9)"=>"City Bus Station (Platform 9)",
+ "Bridbabella Gardens Nursing Home"=>"Brindabella Gardens Nursing Home",
+ "Bridbabella GardensNursing Home"=> "Brindabella Gardens Nursing Home",
+ "BrindabellaBusiness Park"=> "Brindabella Business Park",
+ "NarrabundahTerminus"=>"Narrabundah Terminus",
+ "Railway StationKingston"=>"Railway Station Kingston",
+ "Saint AndrewsVillage Hughes"=>"Saint Andrews Village Hughes",
+ "Dickson ShopsAntill Street"=>"Dickson Shops",
+ "Cohen St Bus Station (Platform 3)"=>"Cohen Street Bus Station (Platform 3)",
+ "Cohen St Bus Station (Platform 6)"=>"Cohen Street Bus Station (Platform 6)",
+ "Newcastle Streetafter Isa Street"=>"Newcastle Street after Isa Street",
+ "William Web / Ginninderra Drive"=>"William Webb / Ginninderra Drive",
+ "Procor / Mead"=>"Proctor / Mead",
+"Fyshwick DirectFactory Outlet"=>"Fyshwick Direct Factory Outlet",
+"Dickson ShopsAntill Street"=>"Dickson Shops/Antill St",
+"Yarrulumla Shops"=>"Yarralumla Shops",
+"Tharwa Dr / Pocket Ave"=>"Tharwa Dr / Pockett Ave",
+"Paul Coe / Mirrebei Dr"=>"Paul Coe / Mirrabei Dr",
+"Mirrebei Drive / Dam Wall"=>"Mirrabei Drive / Dam Wall"
+}
+
time_point_corrections.each do |wrong, right|
$time_points_sources[wrong].each do |wrongfile|
badtimetable = YAML::load_file(wrongfile)
@@ -86,7 +57,7 @@
badtimetable["time_points"][badentrynumber] = right
puts "Corrected '" + wrong + "' to '" + right + "' in " + wrongfile
File.open(wrongfile, "w") do |f|
- f.write badtimetable.to_yaml
+ f.write badtimetable.to_yaml
end
end
end
--- a/maxious-canberra-transit-feed/03-locatetimepoints.rb
+++ b/maxious-canberra-transit-feed/03-locatetimepoints.rb
@@ -1,10 +1,10 @@
#!/usr/bin/ruby
-require 'postgres'
require 'highline.rb'
include HighLine
require 'rubygems'
+require 'postgres'
require 'json'
require 'net/http'
def cbr_geocode(query)
@@ -12,7 +12,7 @@
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
-
+pp url
# we convert the returned JSON data to native Ruby
# data structure - a hash
result = JSON.parse(data)
@@ -51,13 +51,11 @@
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", "%")
+ time_point = time_point.gs