gitphp 0.2.9.1 :: bus.git/commitdiff

file:b/.gitignore (new)

	maxious-canberra-transit-feed/output/

file:a/display.kml.php (deleted)

<?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";
?>

file:a/display.php -> file:b/display.php

<html xmlns="http://www.w3.org/1999/xhtml">	<html xmlns="http://www.w3.org/1999/xhtml">
<head>	<head>
<script type="text/javascript" src="http://loki.com/plugin/files/loki.js"></script>	<script type="text/javascript" src="http://loki.com/plugin/files/loki.js"></script>
<script src="openlayers/OpenLayers.js"></script>	<script src="openlayers/OpenLayers.js"></script>
<script type="text/javascript">	<script type="text/javascript">
var map, layer;	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 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) {	else
alert("error in geoloc");	{
	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(){	map.addLayer(new OpenLayers.Layer.GML("KML", "displayroutes.kml.php", {
var extent = new OpenLayers.Bounds(148.98,-35.48, 149.25,-35.15);	format: OpenLayers.Format.KML,
map = new OpenLayers.Map( 'map');	formatOptions: {
layer = new OpenLayers.Layer.OSM("local", "http://10.0.1.153/tiles/${z}/${x}/${y}.png");	extractStyles: true,
map.addLayer(layer);	extractAttributes: true,
var lonLat = new OpenLayers.LonLat(149.11, -35.28).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());	maxDepth: 2
map.setCenter (lonLat, 13);	}
map.addControl(new OpenLayers.Control.MousePosition({ displayProjection: new OpenLayers.Projection("EPSG:4326"),	}));
suffix: "__________________________________" }));	map.addLayer(new OpenLayers.Layer.Vector("KML", {
map.addControl(new OpenLayers.Control.MousePosition({ displayProjection: new OpenLayers.Projection("EPSG:900913")}));	projection: map.displayProjection,
if (navigator.geolocation) {	strategies: [new OpenLayers.Strategy.Fixed()],
navigator.geolocation.getCurrentPosition(this.aaa, this.handleError);	protocol: new OpenLayers.Protocol.HTTP(
} else {	{
var loki = LokiAPI();	url: "displaystops.kml.php",
loki.onSuccess = function(location) {	format: new OpenLayers.Format.KML(
var lonLat = new OpenLayers.LonLat(location.longitude, location.latitude).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());	{
map.setCenter (lonLat, 13);	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>	</script>

</head>	</head>
<body onload="init()">	<body onload="init()">
<div id="map" width="100%" height="100%" class="smallmap"></div>	<div id="map" width="100%" height="100%" class="smallmap"></div>
</body>	</body>
</html>	</html>

file:b/displayroutes.kml.php (new)

	<?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";
	?>

file:b/displaystops.kml.php (new)

	<?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";
	?>

file:b/displaytimepoints.kml.php (new)

	<?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";
	?>

file:a/index.php (deleted)

$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;"

file:a/maxious-canberra-transit-feed/Makefile -> file:b/maxious-canberra-transit-feed/Makefile

file:a/maxious-canberra-transit-feed/extracttimes.rb -> file:b/maxious-canberra-transit-feed/extracttimes.rb

require 'rubygems'	require 'rubygems'
require 'nokogiri'	require 'nokogiri'
require 'open-uri'	require 'open-uri'
require 'pp'	require 'pp'

def makeTimetable(table, period, short_name)	def makeTimetable(table, period, short_name)
timetable = {"stop_times" => [], "between_stops" => [], "short_name" => short_name}	timetable = {"stop_times" => [], "between_stops" => [], "short_name" => short_name}
time_points = table.xpath('tr[1]//th').map do \|tp\|	time_points = table.xpath('tr[1]//th').map do \|tp\|
if tp.content != "\302\240" && tp.content != "" && tp.content != "<br/>"	if tp.content != "\302\240" && tp.content != "" && tp.content != "<br/>"
timing_point = tp.content.squeeze(" ").gsub("\r\n Platform"," - Platform").strip	timing_point = tp.content.squeeze(" ").gsub("\r\n Platform"," - Platform").gsub(" - "," - ").gsub("\n","").strip
end	end
end	end
time_points.delete(nil)	time_points.delete(nil)
timetable["time_points"] = time_points	timetable["time_points"] = time_points
timetable["long_name"] = "To " + time_points.last	timetable["long_name"] = "To " + time_points.last
periodtimes = []	periodtimes = []
table.css('tr').each do \|row\|	table.css('tr').each do \|row\|
times = row.css('td').map do \|cell\|	times = row.css('td').map do \|cell\|
#TODO convert to GTFS time	#TODO convert to GTFS time ie. replace " AM" with a
time = cell.content.squeeze(" ").strip	time = cell.content.squeeze(" ").strip
end	end
if not times.empty?	if not times.empty?
if not (route = times.shift)	if not (route = times.shift)
raise("TODO: account for shifting route numbers eg. intertown/redex 62/162")	raise("TODO: account for shifting route numbers eg. intertown/redex 62/162")
end	end
periodtimes << times	periodtimes << times
end	end
end	end
if periodtimes.size < 1	if periodtimes.size < 1
raise "No times for route " + short_name + " in period " + period	raise "No times for route " + short_name + " in period " + period
end	end
timetable["stop_times"] = { period => periodtimes }	timetable["stop_times"] = { period => periodtimes }
# pp timetable	# pp timetable
filename = timetable["short_name"] + "-" + timetable["long_name"].downcase.gsub(" ","-").gsub("/","") + "." + period + ".yml"	filename = timetable["short_name"] + "-" + timetable["long_name"].downcase.gsub(" ","-").gsub("/","") + "." + period + ".yml"
puts "Saving " + filename	puts "Saving " + filename
File.open("#{File.dirname(__FILE__)}/output/"+filename, "w") do \|f\|	File.open("#{File.dirname(__FILE__)}/output/"+filename, "w") do \|f\|
f.write timetable.to_yaml	f.write timetable.to_yaml
end	end
timetable	timetable
end	end

#TODO fix route 934	#TODO fix route 934
Dir.glob("source-html/Route.htm") { \|file\|	Dir.glob("source-html/Route.htm") { \|file\|
puts "Opened " + file	puts "Opened " + file
doc = Nokogiri::HTML(open(file))	doc = Nokogiri::HTML(open(file))
# Search for nodes by css	# Search for nodes by css
timetables = []	timetables = []
short_name = "";	short_name = "";
doc.xpath('//title').each do \|title\|	doc.xpath('//title').each do \|title\|
short_name = title.content.gsub("Route_","").gsub("Route ","").squeeze(" ").strip	short_name = title.content.gsub("Route_","").gsub("Route ","").squeeze(" ").strip
end	end
if short_name == ""	if short_name == ""
raise "Route number(s) not found in <title> tag"	raise "Route number(s) not found in <title> tag"
end	end

doc.xpath('//table[preceding::text()="Weekdays"]').each do \|table\|	doc.xpath('//table[preceding::text()="Weekdays"]').each do \|table\|
timetables << makeTimetable(table, "weekday", short_name)	timetables << makeTimetable(table, "weekday", short_name)
end	end

#weekends	#weekends
doc.xpath('//table[preceding::text()="Saturdays" and following::a]').each do \|table\|	doc.xpath('//table[preceding::text()="Saturdays" and following::a]').each do \|table\|
timetables << makeTimetable(table, "saturday", short_name)	timetables << makeTimetable(table, "saturday", short_name)
end	end
doc.xpath('//table[preceding::text()="Sundays"]').each do \|table\|	doc.xpath('//table[preceding::text()="Sundays"]').each do \|table\|
timetables << makeTimetable(table, "sunday", short_name)	timetables << makeTimetable(table, "sunday", short_name)
end	end
#930/934 special cases	#930/934 special cases
doc.xpath('//table[preceding::text()="Saturday" and following::h2]').each do \|table\|	doc.xpath('//table[preceding::text()="Saturday" and following::h2]').each do \|table\|
timetables << makeTimetable(table, "saturday", short_name)	timetables << makeTimetable(table, "saturday", short_name)
end	end
doc.xpath('//table[preceding::text()="Sunday"]').each do \|table\|	doc.xpath('//table[preceding::text()="Sunday"]').each do \|table\|
timetables << makeTimetable(table, "sunday", short_name)	timetables << makeTimetable(table, "sunday", short_name)
end	end
#route 81 = Weekdays - School Holidays Only	#route 81 = Weekdays - School Holidays Only
doc.xpath('//table[preceding::text()="Weekdays - School Holidays Only "]').each do \|table\|	doc.xpath('//table[preceding::text()="Weekdays - School Holidays Only "]').each do \|table\|
timetable = makeTimetable(table, "weekday", short_name)	timetable = makeTimetable(table, "weekday", short_name)
#TODO set active date range to only be holidays	#TODO set active date range to only be holidays
timetables << timetable;	timetables << timetable;
end	end


if timetables.size > 2	if timetables.size > 2
puts "WARNING: " + file + " more than 2 timetables (weekend split?):" + timetables.size.to_s	puts "WARNING: " + file + " more than 2 timetables (weekend split?):" + timetables.size.to_s
end	end
if timetables.size < 2	if timetables.size < 2
puts "WARNING: " + file + " less than 2 timetables (weekday loop service?):" + timetables.size.to_s	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?	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	puts "WARNING: first pair of timetable timing points are not complementary for "+ file
pp(timetables[0]["time_points"] - timetables[1]["time_points"].reverse)	pp(timetables[0]["time_points"] - timetables[1]["time_points"].reverse)
end	end
if timetables.size < 1	if timetables.size < 1
raise "No timetables extracted from " + file	raise "No timetables extracted from " + file
end	end
}	}

file:a/maxious-canberra-transit-feed/substitutetimepoints.rb -> file:b/maxious-canberra-transit-feed/substitutetimepoints.rb

default: cbrfeed.zip	default: cbrfeed.zip

cbrfeed.zip: cbrtable.yml createfeed.py	cbrfeed.zip: cbrtable.yml createfeed.py
./createfeed.py --input=cbrtable.yml --output=cbrfeed.zip	./createfeed.py --input=cbrtable.yml --output=cbrfeed.zip

ROUTE_FILES=900-intertown.yml	ROUTE_FILES=900-intertown.yml

cbrtable.yml: cbrtable.yml.in $(ROUTE_FILES) indent-route.pl	cbrtable.yml: cbrtable.yml.in $(ROUTE_FILES) indent-route.pl
cp cbrtable.yml.in cbrtable.yml	cp cbrtable.yml.in cbrtable.yml
@$(foreach ROUTE_FILE, $(ROUTE_FILES), \	@$(foreach ROUTE_FILE, $(ROUTE_FILES), \
echo "Parsing $(ROUTE_FILE)"; \	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)"; \	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	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	cp cbrtable.yml.in.in cbrtable.yml.in


clean:	clean:
rm -f cbrtable.yml cbrtable.yml.in cbrfeed.zip *~	rm -f cbrtable.yml cbrtable.yml.in cbrfeed.zip *~

require 'rubygems'	require 'rubygems'
require 'pp'	require 'pp'
require 'yaml'	require 'yaml'

time_points = []	time_points = []
time_points_sources = Hash.new([])	time_points_sources = Hash.new([])
Dir.chdir("output")	Dir.chdir("output")
Dir.glob("*.yml") { \|file\|	Dir.glob("*.yml") { \|file\|
timetable = YAML::load_file(file)	timetable = YAML::load_file(file)
time_points = time_points \| timetable["time_points"]	time_points = time_points \| timetable["time_points"]
timetable["time_points"].each do \|timepoint\|	timetable["time_points"].each do \|timepoint\|
time_points_sources[timepoint] = time_points_sources[timepoint] \| [ file ]	time_points_sources[timepoint] = time_points_sources[timepoint] \| [ file ]
end	end
}	}
pp time_points.sort!	pp time_points.sort!
pp time_points_sources.sort	#pp time_points_sources.sort

time_point_corrections = {"North Lynehamham" => "North Lyneham",	time_point_corrections = {"North Lynehamham" => "North Lyneham",
"Lathlain St Platform 2" => "Lathlain St Bus Station- Platform 2",	"Lathlain St Platform 2" => "Lathlain St Bus Station - Platform 2",
"Lathlain St Sation - Platform 5" => "Lathlain St Bus Station - Platform 5",	"Lathlain St Sation - Platform 5" => "Lathlain St Bus Station - Platform 5",
"Lathlain Steet Station" => "Lathlain St Bus Station",	"Lathlain Steet Station" => "Lathlain St Bus Station",
"Lathlain St - Platform 3" => "Lathlain St Bus Station - Platform 3",	"Lathlain St - Platform 3" => "Lathlain St Bus Station - Platform 3",
"Lathlain Steet Station - Platform 3" => "Lathlain St Bus Station - Platform 3",	"Lathlain Steet Station - Platform 3" => "Lathlain St Bus Station - Platform 3",
"Lathlain Street Station" => "Lathlain St Station",	"Lathlain St Station" => "Lathlain St Bus Station",
	"Lathlain St Station - Platform 1" => "Lathlain St Bus Station - Platform 1",
	"Lathlain St Station - Platform 2" => "Lathlain St Bus Station - Platform 2",
	"Lathlain St Station - Platform 3" => "Lathlain St Bus Station - Platform 3",
	"Lathlain St Station - Platform 4" => "Lathlain St Bus Station - Platform 4",
	"Lathlain St Station - Platform 5" => "Lathlain St Bus Station - Platform 5",
	"Lathlain St Station - Platform 6" => "Lathlain St Bus Station - Platform 6",
"Manuka Captain Cook" => "Manuka, Captain Cook",	"Manuka Captain Cook" => "Manuka, Captain Cook",
"Flemington Rd, Sandford St" => "Flemington Rd/Sandford St",	"Flemington Rd, Sandford St" => "Flemington Rd/Sandford St",
"Erindale Centre / - Sternberg Crescent" => "Erindale Drive/Sternberg",	"Erindale Centre / - Sternberg Crescent" => "Erindale Drive/Sternberg",
"Canberra Hospita" => "Canberra Hospital",	"Canberra Hospita" => "Canberra Hospital",
"Cohen Str Station - Platform 1" => "Cohen Street Bus Station - Platform 1",	"Cohen Str Station - Platform 1" => "Cohen St Bus Station - Platform 1",
"Cohen Street Station" => "Cohen Street Bus Station",	"Cohen Street Station" => "Cohen St Bus Station",
"Cohen Street Station - Platform 2" => "Cohen Street Bus Station - Platform 2",	"Cohen Street Station - Platform 2" => "Cohen St Bus Station - Platform 2",
"Cohn St Station - Platform 3" => "Cohen Street Bus Station - Platform 3",	"Cohn St Station - Platform 3" => "Cohen St Bus Station - Platform 3",
"Cohen St Station" => "Cohen Street Bus Station",	"Cohen St Station" => "Cohen St Bus Station",
"Cohen St Station - Platform 1" => "Cohen Street Bus Station - Platform 1",	"Cohen St Station - Platform 1" => "Cohen St Bus Station - Platform 1",