gitphp 0.2.9.1 :: busui.git/commitdiff

file:a/aws/busuidb.sh -> file:b/aws/busuidb.sh

file:a/geo/route.kml.php -> file:b/geo/route.kml.php

<?php	<?php

header('Content-Type: application/vnd.google-earth.kml+xml');	header('Content-Type: application/vnd.google-earth.kml+xml');
include ('../include/common.inc.php');	include ('../include/common.inc.php');
echo '<?xml version="1.0" encoding="UTF-8"?>	echo '<?xml version="1.0" encoding="UTF-8"?>
<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:atom="http://www.w3.org/2005/Atom"><Document>';	<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:atom="http://www.w3.org/2005/Atom"><Document>';
echo '	echo '
<Style id="yellowLineGreenPoly">	<Style id="yellowLineGreenPoly">
<LineStyle>	<LineStyle>
<color>7f00ff00</color>	<color>7f00ff00</color>
<width>4</width>	<width>4</width>
</LineStyle>	</LineStyle>
<PolyStyle>	<PolyStyle>
<color>7f00ffff</color>	<color>7f00ffff</color>
</PolyStyle>	</PolyStyle>
</Style>';	</Style>';
$route = getRoute($routeid);	$route = getRoute($routeid);
echo "\n<Placemark>\n";	echo "\n<Placemark>\n";
$link = curPageURL()."/../trip.php?routeid=".htmlspecialchars ($route["route_id"]);
echo "<name>".$route['route_short_name']."</name>";	$link = curPageURL() . "/../trip.php?routeid=" . htmlspecialchars($route["route_id"]);
echo '<atom:link href="'.$link.'"/>';	echo "<name>" . $route['route_short_name'] . "</name>";
echo '<description><![CDATA[ <a href="'.$link.'">'.$route['route_short_name']." ".$route['route_long_name']."</a>]]> </description>";	echo '<atom:link href="' . $link . '"/>';
	echo '<description><![CDATA[ <a href="' . $link . '">' . $route['route_short_name'] . " " . $route['route_long_name'] . "</a>]]> </description>";
echo "<styleUrl>#yellowLineGreenPoly</styleUrl>";	echo "<styleUrl>#yellowLineGreenPoly</styleUrl>";
	$trip = getRouteNextTrip($routeid);
$trip = getRouteNextTrip($routeid);	echo getTripShape($trip['trip_id']);
echo getTripShape($trip['trip_id']);

echo "</Placemark>\n</Document></kml>\n";	echo "</Placemark>\n</Document></kml>\n";
?>	?>

file:a/geo/stops.kml.php -> file:b/geo/stops.kml.php

file:b/geo/trip.kml.php (new)

	<?php

	header('Content-Type: application/vnd.google-earth.kml+xml');
	include ('../include/common.inc.php');
	echo '<?xml version="1.0" encoding="UTF-8"?>
	<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:atom="http://www.w3.org/2005/Atom"><Document>';
	echo '
	<Style id="yellowLineGreenPoly">
	<LineStyle>
	<color>7f00ff00</color>
	<width>4</width>
	</LineStyle>
	<PolyStyle>
	<color>7f00ffff</color>
	</PolyStyle>
	</Style>';
	$trip = getTrip($tripid);
	echo "\n<Placemark>\n";
	$link = curPageURL() . "/../trip.php?tripid=" . htmlspecialchars($$tripid);
	echo "<name>" . $tripid . "</name>";
	echo '<atom:link href="' . $link . '"/>';
	echo '<description><![CDATA[ <a href="' . $link . '">' . $tripid . "</a>]]> </description>";
	echo "<styleUrl>#yellowLineGreenPoly</styleUrl>";


	echo getTripShape($tripid);

	echo "</Placemark>\n</Document></kml>\n";
	?>

file:a/include/common-net.inc.php -> file:b/include/common-net.inc.php

<?php	<?php

/*	/*
* Copyright 2010,2011 Alexander Sadleir	* Copyright 2010,2011 Alexander Sadleir

Licensed under the Apache License, Version 2.0 (the "License");	Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.	you may not use this file except in compliance with the License.
You may obtain a copy of the License at	You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0	http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software	Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,	distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and	See the License for the specific language governing permissions and
limitations under the License.	limitations under the License.
*/	*/

function getPage($url) {	function getPage($url) {
debug($url, "json");	debug($url, "json");
$ch = curl_init($url);	$ch = curl_init($url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_HEADER, 0);	curl_setopt($ch, CURLOPT_HEADER, 0);
curl_setopt($ch, CURLOPT_TIMEOUT, 45);	curl_setopt($ch, CURLOPT_TIMEOUT, 45);
$page = curl_exec($ch);	$page = curl_exec($ch);
if (curl_errno($ch)) {	if (curl_errno($ch)) {
echo "<font color=red> Database temporarily unavailable: ";	echo "<font color=red> Database temporarily unavailable: ";
echo curl_errno($ch) . " " . curl_error($ch);	echo curl_errno($ch) . " " . curl_error($ch);
if (isDebug()) {	if (isDebug()) {
echo $url;	echo $url;
}	}
echo "</font><br>";	echo "</font><br>";
}	}
curl_close($ch);	curl_close($ch);
debug(print_r($page, true), "json");	debug(print_r($page, true), "json");
return $page;	return $page;
}	}
	function baseURL() {
	$protocol = $_SERVER['HTTPS'] ? "https" : "http";
	return $protocol . "://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];

	}
function curPageURL() {	function curPageURL() {
$isHTTPS = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on");	$isHTTPS = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on");
$port = (isset($_SERVER["SERVER_PORT"]) && ((!$isHTTPS && $_SERVER["SERVER_PORT"] != "80") \|\| ($isHTTPS && $_SERVER["SERVER_PORT"] != "443")));	$port = (isset($_SERVER["SERVER_PORT"]) && ((!$isHTTPS && $_SERVER["SERVER_PORT"] != "80") \|\| ($isHTTPS && $_SERVER["SERVER_PORT"] != "443")));
$port = ($port) ? ':' . $_SERVER["SERVER_PORT"] : '';	$port = ($port) ? ':' . $_SERVER["SERVER_PORT"] : '';
$url = ($isHTTPS ? 'https://' : 'http://') . $_SERVER["SERVER_NAME"] . $port . htmlentities(dirname($_SERVER['PHP_SELF']), ENT_QUOTES);	$url = ($isHTTPS ? 'https://' : 'http://') . $_SERVER["SERVER_NAME"] . $port . htmlentities(dirname($_SERVER['PHP_SELF']), ENT_QUOTES);
return $url;	return $url;
}	}

?>	?>

file:a/include/common-session.inc.php -> file:b/include/common-session.inc.php

file:a/include/common-template.inc.php -> file:b/include/common-template.inc.php

createdb transitdata	createdb transitdata
createlang -d transitdata plpgsql	createlang -d transitdata plpgsql
psql -d transitdata -f /var/www/lib/postgis.sql	psql -d transitdata -f /var/www/lib/postgis.sql
# curl https://github.com/maxious/ACTBus-ui/raw/master/transitdata.cbrfeed.sql.gz -o transitdata.cbrfeed.sql.gz	# curl https://github.com/maxious/ACTBus-ui/raw/master/transitdata.cbrfeed.sql.gz -o transitdata.cbrfeed.sql.gz
#made with pg_dump transitdata \| gzip -c > transitdata.cbrfeed.sql.gz	#made with pg_dump transitdata \| gzip -c > transitdata.cbrfeed.sql.gz
gunzip /var/www/transitdata.cbrfeed.sql.gz	gunzip /var/www/transitdata.cbrfeed.sql.gz
psql -d transitdata -f /var/www/transitdata.cbrfeed.sql	psql -d transitdata -f /var/www/transitdata.cbrfeed.sql
#createuser transitdata -SDRP	#createuser transitdata -SDRP
#password transitdata	#password transitdata
#psql -d transitdata -c "GRANT SELECT ON TABLE agency,calendar,calendar_dates,routes,stop_times,stops,trips TO transitdata;"	#psql -d transitdata -c "GRANT SELECT ON TABLE agency,calendar,calendar_dates,routes,stop_times,stops,trips\
	#,servicealerts_alerts,servicealerts_informed TO transitdata;"
#psql -d transitdata -c "GRANT SELECT,INSERT ON TABLE myway_observations,myway_routes,myway_stops,myway_timingdeltas TO transitdata;"	#psql -d transitdata -c "GRANT SELECT,INSERT ON TABLE myway_observations,myway_routes,myway_stops,myway_timingdeltas TO transitdata;"
#psql -d transitdata -c "GRANT SELECT,INSERT,UPDATE ON TABLE myway_routes,myway_stops TO transitdata;"	#psql -d transitdata -c "GRANT SELECT,INSERT,UPDATE ON TABLE myway_routes,myway_stops TO transitdata;"
##psql -d transitdata -c "GRANT SELECT ON ALL TABLES IN SCHEMA public TO transitdata;"	##psql -d transitdata -c "GRANT SELECT ON ALL TABLES IN SCHEMA public TO transitdata;"
## INSERT INTO geometry_columns(f_table_catalog, f_table_schema, f_table_name, f_geometry_column, coord_dimension, srid, "type")	## INSERT INTO geometry_columns(f_table_catalog, f_table_schema, f_table_name, f_geometry_column, coord_dimension, srid, "type")
##SELECT '', 'public', 'shapes', 'shape_pt', ST_CoordDim(shape_pt), ST_SRID(shape_pt), GeometryType(shape_pt)	##SELECT '', 'public', 'shapes', 'shape_pt', ST_CoordDim(shape_pt), ST_SRID(shape_pt), GeometryType(shape_pt)
##FROM shapes LIMIT 1;	##FROM shapes LIMIT 1;
php /var/www/updatedb.php	php /var/www/updatedb.php

<?php	<?php
	header('Content-type: application/vnd.google-earth.kml+xml');
include ('../include/common.inc.php');	include ('../include/common.inc.php');
header('Content-type: application/vnd.google-earth.kml+xml');
//http://wiki.openstreetmap.org/wiki/OpenLayers_Dynamic_KML	//http://wiki.openstreetmap.org/wiki/OpenLayers_Dynamic_KML
// Creates the KML/XML Document.	// Creates the KML/XML Document.
$dom = new DOMDocument('1.0', 'UTF-8');	$dom = new DOMDocument('1.0', 'UTF-8');
// Creates the root KML element and appends it to the root document.	// Creates the root KML element and appends it to the root document.
$node = $dom->createElementNS('http://earth.google.com/kml/2.1', 'kml');	$node = $dom->createElementNS('http://www.opengis.net/kml/2.2', 'kml');
$parNode = $dom->appendChild($node);	$parNode = $dom->appendChild($node);
// Creates a KML Document element and append it to the KML element.	// Creates a KML Document element and append it to the KML element.
$dnode = $dom->createElement('Document');	$dnode = $dom->createElement('Document');
$docNode = $parNode->appendChild($dnode);	$docNode = $parNode->appendChild($dnode);
if ($suburb != "") $result_stops = getStopsBySuburb($suburb);	if ($suburb != "") $result_stops = getStopsBySuburb($suburb);
else $result_stops = getStops();	else $result_stops = getStops();
foreach ($result_stops as $stop) {	foreach ($result_stops as $stop) {
$description = 'http://bus.lambdacomplex.org/' . 'stop.php?stopid=' . $stop['stop_id'] . " <br>";	$description = baseURL() . 'stop.php?stopid=' . $stop['stop_id'] . " <br>";
// Creates a Placemark and append it to the Document.	// Creates a Placemark and append it to the Document.
$node = $dom->createElement('Placemark');	$node = $dom->createElement('Placemark');
$placeNode = $docNode->appendChild($node);	$placeNode = $docNode->appendChild($node);
// Creates an id attribute and assign it the value of id column.	// Creates an id attribute and assign it the value of id column.
$placeNode->setAttribute('id', 'placemark' . $stop['stop_id']);	$placeNode->setAttribute('id', 'placemark' . $stop['stop_id']);
// Create name, and description elements and assigns them the values of the name and address columns from the results.	// Create name, and description elements and assigns them the values of the name and address columns from the results.
$nameNode = $dom->createElement('name', htmlentities($stop['stop_name']));	$nameNode = $dom->createElement('name', htmlentities($stop['stop_name']));
$descriptionNode = $dom->createElement('description', $description);	$descriptionNode = $dom->createElement('description', $description);
$placeNode->appendChild($nameNode);	$placeNode->appendChild($nameNode);
$placeNode->appendChild($descriptionNode);	$placeNode->appendChild($descriptionNode);
// Creates a Point element.	// Creates a Point element.
$pointNode = $dom->createElement('Point');	$pointNode = $dom->createElement('Point');
$placeNode->appendChild($pointNode);	$placeNode->appendChild($pointNode);
// Creates a coordinates element and gives it the value of the lng and lat columns from the results.	// Creates a coordinates element and gives it the value of the lng and lat columns from the results.
$coorStr = $stop['stop_lon'] . ',' . $stop['stop_lat'];	$coorStr = $stop['stop_lon'] . ',' . $stop['stop_lat'];
$coorNode = $dom->createElement('coordinates', $coorStr);	$coorNode = $dom->createElement('coordinates', $coorStr);
$pointNode->appendChild($coorNode);	$pointNode->appendChild($coorNode);
}	}
$kmlOutput = $dom->saveXML();	$kmlOutput = $dom->saveXML();
echo $kmlOutput;	echo $kmlOutput;
?>	?>

<?php	<?php

/*	/*
* Copyright 2010,2011 Alexander Sadleir	* Copyright 2010,2011 Alexander Sadleir

Licensed under the Apache License, Version 2.0 (the "License");	Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.	you may not use this file except in compliance with the License.
You may obtain a copy of the License at	You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0	http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software	Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,	distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and	See the License for the specific language governing permissions and
limitations under the License.	limitations under the License.
*/	*/
// you have to open the session to be able to modify or remove it	// you have to open the session to be able to modify or remove it
session_start();	session_start();
if (isset($_REQUEST['geolocate']) && $_REQUEST['geolocate'] != "Enter co-ordinates or address here") {	if (isset($_REQUEST['geolocate']) && $_REQUEST['geolocate'] != "Enter co-ordinates or address here") {
$geocoded = false;	$geocoded = false;
if (isset($_REQUEST['lat']) && isset($_REQUEST['lon'])) {	if (isset($_REQUEST['lat']) && isset($_REQUEST['lon'])) {
$_SESSION['lat'] = trim(filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));	$_SESSION['lat'] = trim(filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
$_SESSION['lon'] = trim(filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));	$_SESSION['lon'] = trim(filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
} else {	} else {
if (startsWith($geolocate, "-")) {	if (startsWith($geolocate, "-")) {
$locateparts = explode(",", $geolocate);	$locateparts = explode(",", $geolocate);
$_SESSION['lat'] = $locateparts[0];	$_SESSION['lat'] = $locateparts[0];
$_SESSION['lon'] = $locateparts[1];	$_SESSION['lon'] = $locateparts[1];
} else if (strpos($geolocate, "(") !== false) {	} else if (strpos($geolocate, "(") !== false) {
$geoParts = explode("(", $geolocate);	$geoParts = explode("(", $geolocate);
$locateparts = explode(",", str_replace(")", "", $geoParts[1]));	$locateparts = explode(",", str_replace(")", "", $geoParts[1]));
$_SESSION['lat'] = $locateparts[0];	$_SESSION['lat'] = $locateparts[0];
$_SESSION['lon'] = $locateparts[1];	$_SESSION['lon'] = $locateparts[1];
} else {	} else {
$contents = geocode($geolocate, true);	$contents = geocode($geolocate, true);
print_r($contents);	print_r($contents);
if (isset($contents[0]->centroid)) {	if (isset($contents[0]->centroid)) {
$geocoded = true;	$geocoded = true;
$_SESSION['lat'] = $contents[0]->centroid->coordinates[0];	$_SESSION['lat'] = $contents[0]->centroid->coordinates[0];