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: