gitphp 0.2.9.1 :: busui.git/commitdiff

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');
	header('Content-Disposition: attachment; filename="route.' . urlencode($routeid) . '.kml"');
	$debugOkay = Array(); // disable debugging output even on dev server
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="ylw-pushpin">
	<IconStyle>
	<Icon>
	<href>http://maps.google.com/mapfiles/kml/pushpin/ylw-pushpin.png</href>

	</Icon>
	</IconStyle>

	</Style>
	<Style id="blue-pushpin">
	<IconStyle>
	<Icon>
	<href>http://maps.google.com/mapfiles/kml/pushpin/blue-pushpin.png</href>

	</Icon>
	</IconStyle>

	</Style>
	<Style id="grn-pushpin">
	<IconStyle>
	<Icon>
	<href>http://maps.google.com/mapfiles/kml/pushpin/grn-pushpin.png</href>

	</Icon>
	</IconStyle>
	</Style>
	<Style id="yellowLineYellowPoly">
<LineStyle>	<LineStyle>
<color>7f00ff00</color>	<color>7f00ebff</color>
<width>4</width>	<width>4</width>
</LineStyle>	</LineStyle>
<PolyStyle>	<PolyStyle>
<color>7f00ffff</color>	<color>7f00ebff</color>
</PolyStyle>	</PolyStyle>
</Style>';	</Style>
	<Style id="blueLineBluePoly">
	<LineStyle>
	<color>7fff0000</color>
	<width>4</width>
	</LineStyle>
	<PolyStyle>
	<color>7fff0000</color>
	</PolyStyle>
	</Style>
	';
$route = getRoute($routeid);	$route = getRoute($routeid);
echo "\n<Placemark>\n";	echo "\n<Placemark>\n";
	$_REQUEST['time'] = "12:00";
	$trip = getRouteNextTrip($routeid, 0);
	$link = curPageURL() . "/../trip.php?routeid=" . htmlspecialchars($route["route_id"]. "&directionid=0&tripid=".$trip['trip_id']) ;
	echo "<name>" . $route['route_short_name'] . " Direction 0 </name>";
	echo '<atom:link rel="related" href="' . $link . '"/>';
	echo '<description><![CDATA[ <a href="' . $link . '">' . $route['route_short_name'] . " Direction 0</a>]]> </description>";
	echo "<styleUrl>#yellowLineYellowPoly</styleUrl>";

$link = curPageURL() . "/../trip.php?routeid=" . htmlspecialchars($route["route_id"]);
echo "<name>" . $route['route_short_name'] . "</name>";
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>";
$trip = getRouteNextTrip($routeid);
echo getTripShape($trip['trip_id']);	echo getTripShape($trip['trip_id']);
	echo "</Placemark>\n";
	$stops = Array();
	foreach (getTripStops($trip['trip_id']) as $stop) {
	$stop['style'] = "#ylw-pushpin";
	$stops[$stop['stop_id']] = $stop;
	}

echo "</Placemark>\n</Document></kml>\n";
	echo "\n<Placemark>\n";
	$trip = getRouteNextTrip($routeid, 1);
	$link = curPageURL() . "/../trip.php?routeid=" . htmlspecialchars($route["route_id"]. "&directionid=1&tripid=".$trip['trip_id']) ;
	echo "<name>" . $route['route_short_name'] . " Direction 1 </name>";
	echo '<atom:link rel="related" href="' . $link . '"/>';
	echo '<description><![CDATA[ <a href="' . $link . '">' . $route['route_short_name'] . " Direction 1</a>]]> </description>";
	echo "<styleUrl>#blueLineBluePoly</styleUrl>";

	echo getTripShape($trip['trip_id']);
	echo "</Placemark>\n";
	foreach (getTripStops($trip['trip_id']) as $stop) {
	if (isset($stops[$stop['stop_id']])) {
	$stop['style'] = "#grn-pushpin";
	} else {
	$stop['style'] = "#blue-pushpin";
	}
	$stops[$stop['stop_id']] = $stop;
	}
	foreach ($stops as $stop) {
	echo "\n<Placemark>\n";
	$link = curPageURL() . '/../stop.php?stopid=' . htmlspecialchars($stop['stop_id']);
	echo "<name>" . htmlspecialchars($stop['stop_name']) . "</name>";
	echo '<atom:link rel="related" href="' . $link . '"/>';
	echo '<description><![CDATA[ <a href="' . $link . '">' . htmlspecialchars($stop['stop_name']) . "</a>]]> </description>";
	echo "<styleUrl>" . $stop['style'] . "</styleUrl>";
	echo $stop['positionkml'];
	echo "</Placemark>\n";
	}

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

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

file:a/geo/trip.kml.php -> file:b/geo/trip.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');
	header('Content-Disposition: attachment; filename="trip.' . urlencode($tripid) . '.kml"');
	$debugOkay = Array(); // disable debugging output even on dev server
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="ylw-pushpin">
	<IconStyle>
	<Icon>
	<href>http://maps.google.com/mapfiles/kml/pushpin/ylw-pushpin.png</href>

	</Icon>
	</IconStyle>

	</Style>
	<Style id="blue-pushpin">
	<IconStyle>
	<Icon>
	<href>http://maps.google.com/mapfiles/kml/pushpin/blue-pushpin.png</href>

	</Icon>
	</IconStyle>

	</Style>
	<Style id="grn-pushpin">
	<IconStyle>
	<Icon>
	<href>http://maps.google.com/mapfiles/kml/pushpin/grn-pushpin.png</href>

	</Icon>
	</IconStyle>
	</Style>
<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>';
$trip = getTrip($tripid);	$trip = getTrip($tripid);
echo "\n<Placemark>\n";	echo "\n<Placemark>\n";
$link = curPageURL() . "/../trip.php?tripid=" . htmlspecialchars($$tripid);	$link = curPageURL() . "/../trip.php?tripid=" . htmlspecialchars($$tripid);
echo "<name>" . $tripid . "</name>";	echo "<name>" . $tripid . "</name>";
echo '<atom:link href="' . $link . '"/>';	echo '<atom:link rel="related" href="' . $link . '"/>';
echo '<description><![CDATA[ <a href="' . $link . '">' . $tripid . "</a>]]> </description>";	echo '<description><![CDATA[ <a href="' . $link . '">' . $tripid . "</a>]]> </description>";
echo "<styleUrl>#yellowLineGreenPoly</styleUrl>";	echo "<styleUrl>#yellowLineGreenPoly</styleUrl>";


echo getTripShape($tripid);	echo getTripShape($tripid);

echo "</Placemark>\n</Document></kml>\n";	echo "</Placemark>\n";
	foreach (getTripStopTimes($tripid) as $stop) {
	echo "\n<Placemark>\n";
	$link = curPageURL() . '/../trip.php?tripid=' . htmlspecialchars($tripid);
	echo "<name>" . $stop['arrival_time'] . " @ " . htmlspecialchars($stop['stop_name']) . "</name>";
	echo '<atom:link rel="related" href="' . $link . '"/>';
	echo '<description><![CDATA[ <a href="' . $link . '">' . htmlspecialchars($stop['stop_name']) . "</a>]]> </description>";
	echo "<styleUrl>#blue-pushpin</styleUrl>";
	echo "<Point><coordinates>" . $stop['stop_lon'] . "," . $stop['stop_lat'] . "</coordinates></Point>";

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

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

<?php	<?php
require $basePath.'lib/openid.php';	require $basePath.'lib/openid.php';
$openid = new LightOpenID($_SERVER['HTTP_HOST']);	$openid = new LightOpenID($_SERVER['HTTP_HOST']);

function login()	function login()
{	{
global $openid;	global $openid;
if(!$openid->mode) {	if(!$openid->mode) {
$openid->required = array('contact/email');	$openid->required = array('contact/email');
$openid->identity = 'https://www.google.com/accounts/o8/id';	$openid->identity = 'https://www.google.com/accounts/o8/id';
header('Location: ' . $openid->authUrl());	header('Location: ' . $openid->authUrl());
}	}
}	}


function auth()	function auth()

{	{
if ($_SESSION['authed'] == true) return true;	if ($_SESSION['authed'] == true) return true;
global $openid;	global $openid;

if($openid->mode) {	if($openid->mode) {
$attr = $openid->getAttributes();	$attr = $openid->getAttributes();
if ($attr["contact/email"] != "maxious@gmail.com") {	if ($attr["contact/email"] != "maxious@gmail.com") {
die("Access Denied");	die("Access Denied");
} else {	} else {
$_SESSION['authed'] = true;	$_SESSION['authed'] = true;
}	}
} else {	} else {
login();	login();
}	}
}	}
?>

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

file:a/include/common-geo.inc.php -> file:b/include/common-geo.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.
*/	*/
// SELECT array_to_string(array(SELECT REPLACE(name_2006, ',', '\,') as name FROM suburbs order by name), ',')	// SELECT array_to_string(array(SELECT REPLACE(name_2006, ',', '\,') as name FROM suburbs order by name), ',')
$suburbs = explode(",", "Acton,Ainslie,Amaroo,Aranda,Banks,Barton,Belconnen,Bonner,Bonython,Braddon,Bruce,Calwell,Campbell,Chapman,Charnwood,Chifley,Chisholm,City,Conder,Cook,Curtin,Deakin,Dickson,Downer,Duffy,Dunlop,Evatt,Fadden,Farrer,Fisher,Florey,Flynn,Forrest,Franklin,Fraser,Fyshwick,Garran,Gilmore,Giralang,Gordon,Gowrie,Greenway,Griffith,Gungahlin,Hackett,Hall,Harrison,Hawker,Higgins,Holder,Holt,Hughes,Hume,Isaacs,Isabella Plains,Kaleen,Kambah,Kingston,Latham,Lawson,Lyneham,Lyons,Macarthur,Macgregor,Macquarie,Mawson,McKellar,Melba,Mitchell,Monash,Narrabundah,Ngunnawal,Nicholls,Oaks Estate,O'Connor,O'Malley,Oxley,Page,Palmerston,Parkes,Pearce,Phillip,Pialligo,Red Hill,Reid,Richardson,Rivett,Russell,Scullin,Spence,Stirling,Symonston,Tharwa,Theodore,Torrens,Turner,Wanniassa,Waramanga,Watson,Weetangera,Weston,Yarralumla");	$suburbs = explode(",", "Acton,Ainslie,Amaroo,Aranda,Banks,Barton,Belconnen,Bonner,Bonython,Braddon,Bruce,Calwell,Campbell,Chapman,Charnwood,Chifley,Chisholm,City,Conder,Cook,Curtin,Deakin,Dickson,Downer,Duffy,Dunlop,Evatt,Fadden,Farrer,Fisher,Florey,Flynn,Forrest,Franklin,Fraser,Fyshwick,Garran,Gilmore,Giralang,Gordon,Gowrie,Greenway,Griffith,Gungahlin,Hackett,Hall,Harrison,Hawker,Higgins,Holder,Holt,Hughes,Hume,Isaacs,Isabella Plains,Kaleen,Kambah,Kingston,Latham,Lawson,Lyneham,Lyons,Macarthur,Macgregor,Macquarie,Mawson,McKellar,Melba,Mitchell,Monash,Narrabundah,Ngunnawal,Nicholls,Oaks Estate,O'Connor,O'Malley,Oxley,Page,Palmerston,Parkes,Pearce,Phillip,Pialligo,Red Hill,Reid,Richardson,Rivett,Russell,Scullin,Spence,Stirling,Symonston,Tharwa,Theodore,Torrens,Turner,Wanniassa,Waramanga,Watson,Weetangera,Weston,Yarralumla");

function staticmap($mapPoints, $collapsible = true, $twotone = false, $path = false, $numbered = false) {	function staticmap($mapPoints, $collapsible = true, $twotone = false, $path = false, $numbered = false) {

$markers = "";	$markers = "";
$height = 300;	$height = 300;
$width = $height;	$width = $height;
$index = 0;	$index = 0;
if (sizeof($mapPoints) < 1)	if (sizeof($mapPoints) < 1)
return "map error";	return "map error";
if (sizeof($mapPoints) === 1) {	if (sizeof($mapPoints) === 1) {
$markers = "markers={$mapPoints[0][0]},{$mapPoints[0][1]}";	$markers = "markers={$mapPoints[0][0]},{$mapPoints[0][1]}";
} else {	} else {
if (!$numbered) {	if (!$numbered) {
$markers = "markers=";	$markers = "markers=";
}	}
if ($path) {	if ($path) {
$markers.= "markers={$mapPoints[0][0]},{$mapPoints[0][1]}&path=";	$markers.= "markers={$mapPoints[0][0]},{$mapPoints[0][1]}&path=";
}	}
foreach ($mapPoints as $index => $mapPoint) {	foreach ($mapPoints as $index => $mapPoint) {
if ($twotone && $index == 0) {	if ($twotone && $index == 0) {
$markers = "markerd=color:red\|".$mapPoint[0] . "," . $mapPoint[1]."&markers=";	$markers = "markerd=color:red\|".$mapPoint[0] . "," . $mapPoint[1]."&markers=";
} else {	} else {
if ($numbered) {	if ($numbered) {
$label = ($index > 9 ? 9 : $index);	$label = ($index > 9 ? 9 : $index);
$markers.= "markers=label:$label\|" . $mapPoint[0] . "," . $mapPoint[1];	$markers.= "markers=label:$label\|" . $mapPoint[0] . "," . $mapPoint[1];
if ($index + 1 != sizeof($mapPoints)) {	if ($index + 1 != sizeof($mapPoints)) {
$markers.= "&";	$markers.= "&";
}	}
} else {	} else {
$markers.= $mapPoint[0] . "," . $mapPoint[1];	$markers.= $mapPoint[0] . "," . $mapPoint[1];
if ($index + 1 != sizeof($mapPoints)) {	if ($index + 1 != sizeof($mapPoints)) {
$markers.= "\|";	$markers.= "\|";
}	}
}	}
$index++;	$index++;
}	}
}	}
}	}
$output = "";	$output = "";
if ($collapsible)	if ($collapsible)
$output.= '<div class="map" data-role="collapsible" data-collapsed="true"><h3>Open Map...</h3>';	$output.= '<div class="map" data-role="collapsible" data-collapsed="true"><h3>Open Map...</h3>';
if (isIOSDevice()) $output.= '<img class="hiresmap" src="http://maps.googleapis.com/maps/api/staticmap?size=' . $width . 'x' . $height . '&' . $markers . '&scale=2&sensor=true" width=' . $width . ' height=' . $height . '>';	if (isIOSDevice()) $output.= '<img class="hiresmap" src="http://maps.googleapis.com/maps/api/staticmap?size=' . $width . 'x' . $height . '&' . $markers . '&scale=2&sensor=true" width=' . $width . ' height=' . $height . '>';
else $output.= '<img class="lowresmap" src="http://maps.googleapis.com/maps/api/staticmap?size=' . $width . 'x' . $height . '&' . $markers . '&scale=1&format=jpg&sensor=true" width=' . $width . ' height=' . $height . '>';	else $output.= '<img class="lowresmap" src="http://maps.googleapis.com/maps/api/staticmap?size=' . $width . 'x' . $height . '&' . $markers . '&scale=1&format=jpg&sensor=true" width=' . $width . ' height=' . $height . '>';

if ($collapsible)	if ($collapsible)
$output.= '</div>';	$output.= '</div>';
return $output;	return $output;
}	}

function distance($lat1, $lng1, $lat2, $lng2, $roundLargeValues = false) {	function distance($lat1, $lng1, $lat2, $lng2, $roundLargeValues = false) {
$pi80 = M_PI / 180;	$pi80 = M_PI / 180;
$lat1*= $pi80;	$lat1*= $pi80;
$lng1*= $pi80;	$lng1*= $pi80;
$lat2*= $pi80;	$lat2*= $pi80;
$lng2*= $pi80;	$lng2*= $pi80;
$r = 6372.797; // mean radius of Earth in km	$r = 6372.797; // mean radius of Earth in km
$dlat = $lat2 - $lat1;	$dlat = $lat2 - $lat1;
$dlng = $lng2 - $lng1;	$dlng = $lng2 - $lng1;
$a = sin($dlat / 2) * sin($dlat / 2) + cos($lat1) * cos($lat2) * sin($dlng / 2) * sin($dlng / 2);	$a = sin($dlat / 2) * sin($dlat / 2) + cos($lat1) * cos($lat2) * sin($dlng / 2) * sin($dlng / 2);
$c = 2 * atan2(sqrt($a), sqrt(1 - $a));	$c = 2 * atan2(sqrt($a), sqrt(1 - $a));
$km = $r * $c;	$km = $r * $c;
if ($roundLargeValues) {	if ($roundLargeValues) {
if ($km < 1)	if ($km < 1)
return floor($km * 1000);	return floor($km * 1000);
else	else
return round($km, 2) . "k";	return round($km, 2) . "k";
}	}
else	else
return floor($km * 1000);	return floor($km * 1000);
}	}

function decodePolylineToArray($encoded) {	function decodePolylineToArray($encoded) {
// source: http://latlongeeks.com/forum/viewtopic.php?f=4&t=5	// source: http://latlongeeks.com/forum/viewtopic.php?f=4&t=5
$length = strlen($encoded);	$length = strlen($encoded);
$index = 0;	$index = 0;
$points = array();	$points = array();
$lat = 0;	$lat = 0;
$lng = 0;	$lng = 0;
while ($index < $length) {	while ($index < $length) {
// Temporary variable to hold each ASCII byte.	// Temporary variable to hold each ASCII byte.
$b = 0;	$b = 0;
// The encoded polyline consists of a latitude value followed by a	// The encoded polyline consists of a latitude value followed by a
// longitude value. They should always come in pairs. Read the	// longitude value. They should always come in pairs. Read the
// latitude value first.	// latitude value first.
$shift = 0;	$shift = 0;
$result = 0;	$result = 0;
do {	do {
// The `ord(substr($encoded, $index++))` statement returns the ASCII	// The `ord(substr($encoded, $index++))` statement returns the ASCII
// code for the character at $index. Subtract 63 to get the original	// code for the character at $index. Subtract 63 to get the original
// value. (63 was added to ensure proper ASCII characters are displayed	// value. (63 was added to ensure proper ASCII characters are displayed
// in the encoded polyline string, which is `human` readable)	// in the encoded polyline string, which is `human` readable)
$b = ord(substr($encoded, $index++)) - 63;	$b = ord(substr($encoded, $index++)) - 63;
// AND the bits of the byte with 0x1f to get the original 5-bit `chunk.	// AND the bits of the byte with 0x1f to get the original 5-bit `chunk.
// Then left shift the bits by the required amount, which increases	// Then left shift the bits by the required amount, which increases
// by 5 bits each time.	// by 5 bits each time.
// OR the value into $results, which sums up the individual 5-bit chunks	// OR the value into $results, which sums up the individual 5-bit chunks
// into the original value. Since the 5-bit chunks were reversed in	// into the original value. Since the 5-bit chunks were reversed in
// order during encoding, reading them in this way ensures proper	// order during encoding, reading them in this way ensures proper
// summation.	// summation.
$result\|= ($b & 0x1f) << $shift;	$result\|= ($b & 0x1f) << $shift;
$shift+= 5;	$shift+= 5;
}	}
// Continue while the read byte is >= 0x20 since the last `chunk`	// Continue while the read byte is >= 0x20 since the last `chunk`
// was not OR'd with 0x20 during the conversion process. (Signals the end)	// was not OR'd with 0x20 during the conversion process. (Signals the end)
while ($b >= 0x20);	while ($b >= 0x20);
// Check if negative, and convert. (All negative values have the last bit	// Check if negative, and convert. (All negative values have the last bit
// set)	// set)
$dlat = (($result & 1) ? ~($result >> 1) : ($result >> 1));	$dlat = (($result & 1) ? ~($result >> 1) : ($result >> 1));
// Compute actual latitude since value is offset from previous value.	// Compute actual latitude since value is offset from previous value.
$lat+= $dlat;	$lat+= $dlat;
// The next values will correspond to the longitude for this point.	// The next values will correspond to the longitude for this point.
$shift = 0;	$shift = 0;
$result = 0;	$result = 0;
do {	do {
$b = ord(substr($encoded, $index++)) - 63;	$b = ord(substr($encoded, $index++)) - 63;
$result\|= ($b & 0x1f) << $shift;	$result\|= ($b & 0x1f) << $shift;
$shift+= 5;	$shift+= 5;
} while ($b >= 0x20);	} while ($b >= 0x20);
$dlng = (($result & 1) ? ~($result >> 1) : ($result >> 1));	$dlng = (($result & 1) ? ~($result >> 1) : ($result >> 1));
$lng+= $dlng;	$lng+= $dlng;
// The actual latitude and longitude values were multiplied by	// The actual latitude and longitude values were multiplied by
// 1e5 before encoding so that they could be converted to a 32-bit	// 1e5 before encoding so that they could be converted to a 32-bit
// integer representation. (With a decimal accuracy of 5 places)	// integer representation. (With a decimal accuracy of 5 places)
// Convert back to original values.	// Convert back to original values.
$points[] = array(	$points[] = array(
$lat * 1e-5,	$lat * 1e-5,
$lng * 1e-5	$lng * 1e-5
);	);
}	}
return $points;	return $points;
}	}

function geocode($query, $giveOptions) {	function geocode($query, $giveOptions) {
global $cloudmadeAPIkey;	global $cloudmadeAPIkey;
$url = "http://geocoding.cloudmade.com/$cloudmadeAPIkey/geocoding/v2/find.js?query=" . urlencode($query) . "&bbox=-35.5,149.00,-35.15,149.1930&return_location=true&bbox_only=true";	$url = "http://geocoding.cloudmade.com/$cloudmadeAPIkey/geocoding/v2/find.js?query=" . urlencode($query) . "&bbox=-35.5,149.00,-35.15,149.1930&return_location=true&bbox_only=true";
$contents = json_decode(getPage($url));	$contents = json_decode(getPage($url));
if ($giveOptions)	if ($giveOptions)
return $contents->features;	return $contents->features;
elseif (isset($contents->features[0]->centroid))	elseif (isset($contents->features[0]->centroid))
return $contents->features[0]->centroid->coordinates[0] . "," . $contents->features[0]->centroid->coordinates[1];	return $contents->features[0]->centroid->coordinates[0] . "," . $contents->features[0]->centroid->coordinates[1];
else	else
return "";	return "";
}	}

function reverseGeocode($lat, $lng) {	function reverseGeocode($lat, $lng) {
global $cloudmadeAPIkey;	global $cloudmadeAPIkey;
$url = "http://geocoding.cloudmade.com/$cloudmadeAPIkey/geocoding/v2/find.js?around=" . $lat . "," . $lng . "&distance=closest&object_type=road";	$url = "http://geocoding.cloudmade.com/$cloudmadeAPIkey/geocoding/v2/find.js?around=" . $lat . "," . $lng . "&distance=closest&object_type=road";
$contents = json_decode(getPage($url));	$contents = json_decode(getPage($url));
return $contents->features[0]->properties->name;	return $contents->features[0]->properties->name;
}	}

?>

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-request.inc.php -> file:b/include/common-request.inc.php

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

<?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.
*/	*/

// Copyright 2009 Google Inc. All Rights Reserved.	// Copyright 2009 Google Inc. All Rights Reserved.
$GA_ACCOUNT = "MO-22173039-1";	$GA_ACCOUNT = "MO-22173039-1";
$GA_PIXEL = "/lib/ga.php";	$GA_PIXEL = "/lib/ga.php";

function googleAnalyticsGetImageUrl() {	function googleAnalyticsGetImageUrl() {
global $GA_ACCOUNT, $GA_PIXEL;	global $GA_ACCOUNT, $GA_PIXEL;
//if (stristr($_SERVER['HTTP_USER_AGENT'], 'Googlebot') return "";	//if (stristr($_SERVER['HTTP_USER_AGENT'], 'Googlebot') return "";
$url = "";	$url = "";
$url.= $GA_PIXEL . "?";	$url.= $GA_PIXEL . "?";
$url.= "utmac=" . $GA_ACCOUNT;	$url.= "utmac=" . $GA_ACCOUNT;
$url.= "&utmn=" . rand(0, 0x7fffffff);	$url.= "&utmn=" . rand(0, 0x7fffffff);
$referer = (isset($_SERVER["HTTP_REFERER"]) ? $_SERVER["HTTP_REFERER"] : "");	$referer = (isset($_SERVER["HTTP_REFERER"]) ? $_SERVER["HTTP_REFERER"] : "");
$query = $_SERVER["QUERY_STRING"];	$query = $_SERVER["QUERY_STRING"];
$path = $_SERVER["REQUEST_URI"];	$path = $_SERVER["REQUEST_URI"];
if (empty($referer)) {	if (empty($referer)) {
$referer = "-";	$referer = "-";
}	}
$url.= "&utmr=" . urlencode($referer);	$url.= "&utmr=" . urlencode($referer);
if (!empty($path)) {	if (!empty($path)) {
$url.= "&utmp=" . urlencode($path);	$url.= "&utmp=" . urlencode($path);
}	}
$url.= "&guid=ON";	$url.= "&guid=ON";
return str_replace("&", "&", $url);	return str_replace("&", "&", $url);
}	}

function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false) {	function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false) {
global $basePath, $GTFSREnabled;	global $basePath, $GTFSREnabled;
echo '	echo '
<!DOCTYPE html>	<!DOCTYPE html>
<html lang="en">	<html lang="en">
<head>	<head>
<meta charset="UTF-8">	<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">	<meta name="viewport" content="width=device-width, initial-scale=1">
<title>' . $pageTitle . ' - Canberra Bus Timetable</title>	<title>' . $pageTitle . ' - Canberra Bus Timetable</title>
<meta name="google-site-verification" content="-53T5Qn4TB_de1NyfR_ZZkEVdUNcNFSaYKSFkWKx-sY" />	<meta name="google-site-verification" content="-53T5Qn4TB_de1NyfR_ZZkEVdUNcNFSaYKSFkWKx-sY" />
<link rel="dns-prefetch" href="//code.jquery.com">	<link rel="dns-prefetch" href="//code.jquery.com">
<link rel="dns-prefetch" href="//ajax.googleapis.com">	<link rel="dns-prefetch" href="//ajax.googleapis.com">
<link rel="stylesheet" href="' . $basePath . 'css/jquery-ui-1.8.12.custom.css" />';	<link rel="stylesheet" href="' . $basePath . 'css/jquery-ui-1.8.12.custom.css" />';
$jqmVersion = "1.0.1";	$jqmVersion = "1.0.1";
if (isDebugServer()) {	if (isDebugServer()) {
$jqmcss = $basePath . "css/jquery.mobile-$jqmVersion.css";	$jqmcss = $basePath . "css/jquery.mobile-$jqmVersion.css";
$jqjs = $basePath . "js/jquery-1.6.4.min.js";	$jqjs = $basePath . "js/jquery-1.6.4.min.js";
$jqmjs = $basePath . "js/jquery.mobile-$jqmVersion.js";	$jqmjs = $basePath . "js/jquery.mobile-$jqmVersion.js";

$jqmcss = $basePath . "css/jquery.mobile-b90eab4935.css";	$jqmcss = $basePath . "css/jquery.mobile-b90eab4935.css";
$jqmjs = $basePath . "js/jquery.mobile-b90eab4935.js";	$jqmjs = $basePath . "js/jquery.mobile-b90eab4935.js";
} else {	} else {
$jqmcss = "//code.jquery.com/mobile/$jqmVersion/jquery.mobile-$jqmVersion.min.css";	$jqmcss = "//code.jquery.com/mobile/$jqmVersion/jquery.mobile-$jqmVersion.min.css";
$jqjs = "//ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js";	$jqjs = "//ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js";
$jqmjs = "//code.jquery.com/mobile/$jqmVersion/jquery.mobile-$jqmVersion.min.js";	$jqmjs = "//code.jquery.com/mobile/$jqmVersion/jquery.mobile-$jqmVersion.min.js";

}	}
echo '<link rel="stylesheet" href="' . $jqmcss . '" />	echo '<link rel="stylesheet" href="' . $jqmcss . '" />
<script src="' . $jqjs . '"></script>	<script src="' . $jqjs . '"></script>
<script>$(document).bind("mobileinit", function(){	<script>$(document).bind("mobileinit", function(){
$.mobile.ajaxEnabled = false;	$.mobile.ajaxEnabled = false;
});	});
</script>	</script>
<script src="' . $jqmjs . '"></script>	<script src="' . $jqmjs . '"></script>

<script src="' . $basePath . 'js/jquery.ui.core.min.js"></script>	<script src="' . $basePath . 'js/jquery.ui.core.min.js"></script>
<script src="' . $basePath . 'js/jquery.ui.position.min.js"></script>	<script src="' . $basePath . 'js/jquery.ui.position.min.js"></script>
<script src="' . $basePath . 'js/jquery.ui.widget.min.js"></script>	<script src="' . $basePath . 'js/jquery.ui.widget.min.js"></script>
<script src="' . $basePath . 'js/jquery.ui.autocomplete.min.js"></script>	<script src="' . $basePath . 'js/jquery.ui.autocomplete.min.js"></script>
<script>	<script>
$(function() {	$(function() {
$( "#geolocate" ).autocomplete({	$( "#geolocate" ).autocomplete({
source: "lib/autocomplete.php",	source: "lib/autocomplete.php",
minLength: 2	minLength: 2
});	});
$( "#from" ).autocomplete({	$( "#from" ).autocomplete({
source: "lib/autocomplete.php",	source: "lib/autocomplete.php",
minLength: 2	minLength: 2
});	});
$( "#to" ).autocomplete({	$( "#to" ).autocomplete({
source: "lib/autocomplete.php",	source: "lib/autocomplete.php",
minLength: 2	minLength: 2
});	});
});	});
</script>';	</script>';
echo '<style type="text/css">';	echo '<style type="text/css">';
if (strstr($_SERVER['HTTP_USER_AGENT'], 'Android'))	if (strstr($_SERVER['HTTP_USER_AGENT'], 'Android'))
echo '.ui-shadow,.ui-btn-up-a,.ui-btn-hover-a,.ui-btn-down-a,.ui-body-b,.ui-btn-up-b,.ui-btn-hover-b,	echo '.ui-shadow,.ui-btn-up-a,.ui-btn-hover-a,.ui-btn-down-a,.ui-body-b,.ui-btn-up-b,.ui-btn-hover-b,
.ui-btn-down-b,.ui-bar-c,.ui-body-c,.ui-btn-up-c,.ui-btn-hover-c,.ui-btn-down-c,.ui-bar-c,.ui-body-d,	.ui-btn-down-b,.ui-bar-c,.ui-body-c,.ui-btn-up-c,.ui-btn-hover-c,.ui-btn-down-c,.ui-bar-c,.ui-body-d,
.ui-btn-up-d,.ui-btn-hover-d,.ui-btn-down-d,.ui-bar-d,.ui-body-e,.ui-btn-up-e,.ui-btn-hover-e,	.ui-btn-up-d,.ui-btn-hover-d,.ui-btn-down-d,.ui-bar-d,.ui-body-e,.ui-btn-up-e,.ui-btn-hover-e,
.ui-btn-down-e,.ui-bar-e,.ui-overlay-shadow,.ui-shadow,.ui-btn-active,.ui-body-a,.ui-bar-a {	.ui-btn-down-e,.ui-bar-e,.ui-overlay-shadow,.ui-shadow,.ui-btn-active,.ui-body-a,.ui-bar-a {
text-shadow: none;	text-shadow: none;
box-shadow: none;	box-shadow: none;
-webkit-box-shadow: none;	-webkit-box-shadow: none;
}';	}';
echo '</style>';	echo '</style>';
echo '<link rel="stylesheet" href="' . $basePath . 'css/local.css.php" />';	echo '<link rel="stylesheet" href="' . $basePath . 'css/local.css.php" />';
if (isIOSDevice()){	if (isIOSDevice()){
echo '<meta name="apple-mobile-web-app-capable" content="yes" />	echo '<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />	<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<link rel="apple-touch-startup-image" href="startup.png" />	<link rel="apple-touch-startup-image" href="startup.png" />
<link rel="apple-touch-icon" href="apple-touch-icon.png" />';	<link rel="apple-touch-icon" href="apple-touch-icon.png" />';
}	}
if ($geolocate) {	if ($geolocate) {
echo "<script>	echo "<script>

function success(position) {	function success(position) {
$('#error').val('Location now detected. Please wait for data to load.');	$('#error').val('Location now detected. Please wait for data to load.');
$('#geolocate').val(position.coords.latitude+','+position.coords.longitude);	$('#geolocate').val(position.coords.latitude+','+position.coords.longitude);
$.ajax({ async: false,	$.ajax({ async: false,
success: function(){	success: function(){
location.reload(true);	location.reload(true);
},	},
url: \"include/common.inc.php?geolocate=yes&lat=\"+position.coords.latitude+\"&lon=\"+position.coords.longitude });	url: \"include/common.inc.php?geolocate=yes&lat=\"+position.coords.latitude+\"&lon=\"+position.coords.longitude });
}	}
function error(msg) {	function error(msg) {
$('#error').val('Error: '+msg);	$('#error').val('Error: '+msg);
}	}

function geolocate() {	function geolocate() {
if (navigator.geolocation) {	if (navigator.geolocation) {
var options = {	var options = {
enableHighAccuracy: true,	enableHighAccuracy: true,
timeout: 60000,	timeout: 60000,
maximumAge: 10000	maximumAge: 10000
}	}
navigator.geolocation.getCurrentPosition(success, error, options);	navigator.geolocation.getCurrentPosition(success, error, options);
}	}
}	}
$(document).ready(function() {	$(document).ready(function() {
$('#here').click(function(event) { $('#geolocate').val(geolocate()); return false;});	$('#here').click(function(event) { $('#geolocate').val(geolocate()); return false;});
$('#here').show();	$('#here').show();
});	});
";	";
if (!isset($_SESSION['lat']) \|\| $_SESSION['lat'] == "")	if (!isset($_SESSION['lat']) \|\| $_SESSION['lat'] == "")
echo "geolocate();";	echo "geolocate();";
echo "</script> ";	echo "</script> ";
}	}
if (isAnalyticsOn())	if (isAnalyticsOn())
echo '	echo '
<script type="text/javascript">' . "	<script type="text/javascript">' . "

var _gaq = _gaq \|\| [];	var _gaq = _gaq \|\| [];
_gaq.push(['_setAccount', 'UA-22173039-1']);	_gaq.push(['_setAccount', 'UA-22173039-1']);
_gaq.push(['_trackPageview']);	_gaq.push(['_trackPageview']);
_gaq.push(['_trackPageLoadTime']);	_gaq.push(['_trackPageLoadTime']);
</script>";	</script>";
echo '</head>	echo '</head>
<body>	<body>
<div id="skip">	<div id="skip">
<a href="#maincontent">Skip to content</a>	<a href="#maincontent">Skip to content</a>
</div>	</div>
';	';
if ($opendiv) {	if ($opendiv) {
echo '<div data-role="page">	echo '<div data-role="page">
<div data-role="header" data-position="inline">	<div data-role="header" data-position="inline">
<a href="' . (isset($_SERVER["HTTP_REFERER"]) ? $_SERVER["HTTP_REFERER"] : "javascript:history.go(-1)") . '" data-icon="arrow-l" data-rel="back" class="ui-btn-left">Back</a>	<a href="' . (isset($_SERVER["HTTP_REFERER"]) ? $_SERVER["HTTP_REFERER"] : "javascript:history.go(-1)") . '" data-icon="arrow-l" data-rel="back" class="ui-btn-left">Back</a>
<h1>' . $pageTitle . '</h1>	<h1>' . $pageTitle . '</h1>
<a href="' . $basePath . '/index.php" data-icon="home" class="ui-btn-right">Home</a>	<a href="' . $basePath . '/index.php" data-icon="home" class="ui-btn-right">Home</a>
</div><!-- /header -->	</div><!-- /header -->
<a name="maincontent" id="maincontent"></a>	<a name="maincontent" id="maincontent"></a>
<div data-role="content"> ';	<div data-role="content"> ';
if ($GTFSREnabled) {	if ($GTFSREnabled) {
$overrides = getServiceOverride();	$overrides = getServiceOverride();
if (isset($overrides['service_id'])) {	if (isset($overrides['service_id'])) {
if ($overrides['service_id'] == "noservice") {	if ($overrides['service_id'] == "noservice") {
echo '<div id="servicewarning">Buses are <strong>not running today</strong> due to industrial action/public holiday. See <a	echo '<div id="servicewarning">Buses are <strong>not running today</strong> due to industrial action/public holiday. See <a
href="http://www.action.act.gov.au">http://www.action.act.gov.au</a> for details.</div>';	href="http://www.action.act.gov.au">http://www.action.act.gov.au</a> for details.</div>';
} else {	} else {
echo '<div id="servicewarning">Buses are running on an altered timetable today due to industrial action/public holiday. See <a href="http://www.action.act.gov.au">http://www.action.act.gov.au</a> for details.</div>';	echo '<div id="servicewarning">Buses are running on an altered timetable today due to industrial action/public holiday. See <a href="http://www.action.act.gov.au">http://www.action.act.gov.au</a> for details.</div>';
}	}
}	}
$serviceAlerts = getServiceAlertsAsArray("agency", "0");	$serviceAlerts = getServiceAlertsAsArray("agency", "0");
if (isset($serviceAlerts['entity']) && sizeof($serviceAlerts['entity']) > 0) {	if (isset($serviceAlerts['entity']) && sizeof($serviceAlerts['entity']) > 0) {
foreach ($serviceAlerts['entity'] as $entity) {	foreach ($serviceAlerts['entity'] as $entity) {
echo "<div id='servicewarning'>" . date("F j, g:i a", strtotime($entity['alert']['active_period'][0]['start'])) . " to " . date("F j, g:i a", strtotime($entity['alert']['active_period'][0]['end'])) . "{$entity['alert']['header_text']['translation'][0]['text']}<br>Warning: {$entity['alert']['description_text']['translation'][0]['text']}	echo "<div id='servicewarning'>" . date("F j, g:i a", strtotime($entity['alert']['active_period'][0]['start'])) . " to " . date("F j, g:i a", strtotime($entity['alert']['active_period'][0]['end'])) . "{$entity['alert']['header_text']['translation'][0]['text']}<br>Warning: {$entity['alert']['description_text']['translation'][0]['text']}
<br><a href='{$entity['alert']['url']['translation'][0]['text']}'>Source</a> </div>";	<br><a href='{$entity['alert']['url']['translation'][0]['text']}'>Source</a> </div>";
}	}
}	}
}	}
}	}
}	}

function include_footer() {	function include_footer() {
global $basePath;	global $basePath;
echo '<div id="footer"><a href="' . $basePath . 'about.php">About/Contact Us</a> <a href="' . $basePath . 'feedback.php">Feedback/Bug Report</a> <a href="' . $basePath . 'privacy.php">Privacy Policy</a>';	echo '<div id="footer"><a href="' . $basePath . 'about.php">About/Contact Us</a> <a href="' . $basePath . 'feedback.php">Feedback/Bug Report</a> <a href="' . $basePath . 'privacy.php">Privacy Policy</a>';
echo '</div>';	echo '</div>';
if (isAnalyticsOn()) {	if (isAnalyticsOn()) {
echo "<script> (function() {	echo "<script> (function() {
var ga = document.createElement('script'); ga.type =	var ga = document.createElement('script'); ga.type =
'text/javascript'; ga.async = true;	'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ?	ga.src = ('https:' == document.location.protocol ?
'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';	'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0];	var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);	s.parentNode.insertBefore(ga, s);
})();</script>";	})();</script>";
$googleAnalyticsImageUrl = googleAnalyticsGetImageUrl();	$googleAnalyticsImageUrl = googleAnalyticsGetImageUrl();
echo '<noscript><img src="' . $googleAnalyticsImageUrl . '" /></noscript>';	echo '<noscript><img src="' . $googleAnalyticsImageUrl . '" /></noscript>';
}	}
echo "\n</div></div></body></html>";	echo "\n</div></div></body></html>";
}	}
function timeSettings() {	function timeSettings() {
global $service_periods;	global $service_periods;
echo '<div id="settings" data-role="collapsible" data-collapsed="true">	echo '<div id="settings" data-role="collapsible" data-collapsed="true">
<h3>Change Time (' . (isset($_REQUEST['time']) ? $_REQUEST['time'] : "Current Time,") . ' ' . ucwords(service_period()) . ')...</h3>	<h3>Change Time (' . (isset($_REQUEST['time']) ? $_REQUEST['time'] : "Current Time,") . ' ' . ucwords(service_period()) . ')...</h3>
<form action="' . basename($_SERVER['PHP_SELF']) . '" method="GET">	<form action="' . basename($_SERVER['PHP_SELF']) . '" method="GET">
<input type="hidden" name="suburb" id="suburb" value="' . (isset($_REQUEST['suburb']) ? $_REQUEST['suburb'] : "") . '"/>	<input type="hidden" name="suburb" id="suburb" value="' . (isset($_REQUEST['suburb']) ? $_REQUEST['suburb'] : "") . '"/>

<input type="hidden" name="stopid" id="stopid" value="' . (isset($_REQUEST['stopid']) ? $_REQUEST['stopid'] : "") . '"/>	<input type="hidden" name="stopid" id="stopid" value="' . (isset($_REQUEST['stopid']) ? $_REQUEST['stopid'] : "") . '"/>
<input type="hidden" name="stopcode" id="stopcode" value="' . (isset($_REQUEST['stopcode']) ? $_REQUEST['stopcode'] : "") . '"/>	<input type="hidden" name="stopcode" id="stopcode" value="' . (isset($_REQUEST['stopcode']) ? $_REQUEST['stopcode'] : "") . '"/>
<div class="ui-body">	<div class="ui-body">
<div data-role="fieldcontain">	<div data-role="fieldcontain">
<label for="time"> Time: </label>	<label for="time"> Time: </label>
<input type="time" name="time" id="time" value="' . (isset($_REQUEST['time']) ? $_REQUEST['time'] : date("H:i")) . '"/>	<input type="time" name="time" id="time" value="' . (isset($_REQUEST['time']) ? $_REQUEST['time'] : date("H:i")) . '"/>
<a href="#" name="currentTime" id="currentTime" onClick="var d = new Date();' . "$('#time').val(d.getHours() +':'+ (d.getMinutes().toString().length == 1 ? '0'+ d.getMinutes(): d.getMinutes()));" . '">Current Time?</a>	<a href="#" name="currentTime" id="currentTime" onClick="var d = new Date();' . "$('#time').val(d.getHours() +':'+ (d.getMinutes().toString().length == 1 ? '0'+ d.getMinutes(): d.getMinutes()));" . '">Current Time?</a>
</div>	</div>
<div data-role="fieldcontain">	<div data-role="fieldcontain">
<label for="service_period"> Service Period: </label>	<label for="service_period"> Service Period: </label>
<select name="service_period" id="service_period">';	<select name="service_period" id="service_period">';
foreach ($service_periods as $service_period) {	foreach ($service_periods as $service_period) {
echo "<option value=\"$service_period\"" . (service_period() === $service_period ? " SELECTED" : "") . '>' . ucwords($service_period) . '</option>';	echo "<option value=\"$service_period\"" . (service_period() === $service_period ? " SELECTED" : "") . '>' . ucwords($service_period) . '</option>';
}	}
echo '</select>	echo '</select>
<a href="#" style="display:none" name="currentPeriod" id="currentPeriod">Current Period?</a>	<a href="#" style="display:none" name="currentPeriod" id="currentPeriod">Current Period?</a>
</div>	</div>

<input type="submit" value="Update"/>	<input type="submit" value="Update"/>
</div></form>	</div></form>
</div>';	</div>';
}	}
function placeSettings() {	function placeSettings() {

$geoerror = false;	$geoerror = false;
$geoerror = !isset($_SESSION['lat']) \|\| !isset($_SESSION['lat']) \|\| $_SESSION['lat'] == "" \|\| $_SESSION['lon'] == "";	$geoerror = !isset($_SESSION['lat']) \|\| !isset($_SESSION['lat']) \|\| $_SESSION['lat'] == "" \|\| $_SESSION['lon'] == "";

echo '<div id="error">';	echo '<div id="error">';
if ($geoerror) {	if ($geoerror) {
echo 'Sorry, but your location could not currently be detected.	echo 'Sorry, but your location could not currently be detected.
Please allow location permission, wait for your location to be detected,	Please allow location permission, wait for your location to be detected,
or enter an address/co-ordinates in the box below.';	or enter an address/co-ordinates in the box below.';
}	}
echo '</div>';	echo '</div>';
echo '<div id="settings" data-role="collapsible" data-collapsed="' . !$geoerror . '">	echo '<div id="settings" data-role="collapsible" data-collapsed="' . !$geoerror . '">
<h3>Change Location...</h3>	<h3>Change Location...</h3>
<form action="' . basename($_SERVER['PHP_SELF']) . "?" . $_SERVER['QUERY_STRING'] . '" method="post">	<form action="' . basename($_SERVER['PHP_SELF']) . "?" . $_SERVER['QUERY_STRING'] . '" method="post">
<div class="ui-body">	<div class="ui-body">
<div data-role="fieldcontain">	<div data-role="fieldcontain">
<label for="geolocate"> Current Location: </label>	<label for="geolocate"> Current Location: </label>
<input type="text" id="geolocate" name="geolocate" value="' . (isset($_SESSION['lat']) && isset($_SESSION['lon']) ? $_SESSION['lat'] . "," . $_SESSION['lon'] : "Enter co-ordinates or address here") . '"/> <a href="#" style="display:none" name="here" id="here">Here?</a>	<input type="text" id="geolocate" name="geolocate" value="' . (isset($_SESSION['lat']) && isset($_SESSION['lon']) ? $_SESSION['lat'] . "," . $_SESSION['lon'] : "Enter co-ordinates or address here") . '"/> <a href="#" style="display:none" name="here" id="here">Here?</a>
</div>	</div>

<input type="submit" value="Update"/>	<input type="submit" value="Update"/>
</div></form>	</div></form>
</div>';	</div>';
}	}

function trackEvent($category, $action, $label = "", $value = - 1) {	function trackEvent($category, $action, $label = "", $value = - 1) {
if (isAnalyticsOn()) {	if (isAnalyticsOn()) {
echo "\n<script> _gaq.push(['_trackEvent', '$category', '$action'" . ($label != "" ? ", '$label'" : "") . ($value != - 1 ? ", $value" : "") . "]);</script>";	echo "\n<script> _gaq.push(['_trackEvent', '$category', '$action'" . ($label != "" ? ", '$label'" : "") . ($value != - 1 ? ", $value" : "") . "]);</script>";
}	}
}	}

//stop list collapsing	//stop list collapsing
function stopCompare($stopName) {	function stopCompare($stopName) {
return substr(trim(preg_replace("/\(Platform.*/", "", $stopName)),0,9);	return substr(trim(preg_replace("/\(Platform.*/", "", $stopName)),0,9);
}	}
function stopGroupTitle($stopName,$stopdesc) {	function stopGroupTitle($stopName,$stopdesc) {
if (preg_match("/Dr \|Cct \|Cir \|Av \|St \|Cr \|Parade \|Way \|Bank /",$stopName)) {	if (preg_match("/Dr \|Cct \|Cir \|Av \|St \|Cr \|Parade \|Way \|Bank /",$stopName)) {
$descParts = explode("<br>",$stopdesc);	$descParts = explode("<br>",$stopdesc);
return trim(str_replace("Street: ","",$descParts[0]));	return trim(str_replace("Street: ","",$descParts[0]));
} else {	} else {
return trim(preg_replace("/\(Platform.*/", "",$stopName));	return trim(preg_replace("/\(Platform.*/", "",$stopName));
}	}
}	}

function viaPointNames($tripid, $stop_sequence = "") {	function viaPointNames($tripid, $stop_sequence = "") {
$viaPointNames = Array();	$viaPointNames = Array();
foreach (viaPoints($tripid, $stop_sequence) as $point) {	foreach (viaPoints($tripid, $stop_sequence) as $point) {
if (strstr($point['stop_name'], "Station")	if (strstr($point['stop_name'], "Station")
\|\| strstr($point['stop_name'], "Shops")	\|\| strstr($point['stop_name'], "Shops")
\|\| strstr($point['stop_name'], "CIT")	\|\| strstr($point['stop_name'], "CIT")
\|\| strstr($point['stop_name'], "School")	\|\| strstr($point['stop_name'], "School")
\|\| strstr($point['stop_name'], "University")	\|\| strstr($point['stop_name'], "University")
) {	) {
$viaPointNames[] = $point['stop_name'];	$viaPointNames[] = $point['stop_name'];
}	}
}	}
if (sizeof($viaPointNames) > 0) {	if (sizeof($viaPointNames) > 0) {
return r_implode(", ", $viaPointNames);	return r_implode(", ", $viaPointNames);
} else {	} else {
return "";	return "";
}	}
}	}
?>

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

file:a/include/common.inc.php -> file:b/include/common.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.
*/	*/

date_default_timezone_set('Australia/ACT');	date_default_timezone_set('Australia/ACT');
$debugOkay = Array(	$debugOkay = Array(
"session",	"session",
"json",	"json",
"phperror",	"phperror",
"awsotp",	"awsotp",
//"squallotp",	//"squallotp",
//"vanilleotp",	//"vanilleotp",
"database",	"database",
"other"	"other"
);	);
$GTFSREnabled = true;	$GTFSREnabled = true;
$cloudmadeAPIkey = "daa03470bb8740298d4b10e3f03d63e6";	$cloudmadeAPIkey = "daa03470bb8740298d4b10e3f03d63e6";
$googleMapsAPIkey = "ABQIAAAA95XYXN0cki3Yj_Sb71CFvBTPaLd08ONybQDjcH_VdYtHHLgZvRTw2INzI_m17_IoOUqH3RNNmlTk1Q";	$googleMapsAPIkey = "ABQIAAAA95XYXN0cki3Yj_Sb71CFvBTPaLd08ONybQDjcH_VdYtHHLgZvRTw2INzI_m17_IoOUqH3RNNmlTk1Q";
$otpAPIurl = 'http://localhost:8080/opentripplanner-api-webapp/';	$otpAPIurl = 'http://localhost:8080/opentripplanner-api-webapp/';
if (isDebug("awsotp") \|\| php_uname('n') == "maxious.xen.prgmr.com" \|\| strstr(php_uname('n'),"actbus")) {	if (isDebug("awsotp") \|\| php_uname('n') == "maxious.xen.prgmr.com" \|\| strstr(php_uname('n'),"actbus")) {
$otpAPIurl = 'http://bus-main.lambdacomplex.org:8080/opentripplanner-api-webapp/';	$otpAPIurl = 'http://bus-main.lambdacomplex.org:8080/opentripplanner-api-webapp/';
}	}
if (isDebug("dotcloudotp") \|\| php_uname('n') == "actbus-www") {	if (isDebug("dotcloudotp") \|\| php_uname('n') == "actbus-www") {
$otpAPIurl = 'http://otp.actbus.dotcloud.com/opentripplanner-api-webapp/';	$otpAPIurl = 'http://otp.actbus.dotcloud.com/opentripplanner-api-webapp/';
}	}
if (isDebug("squallotp")) {	if (isDebug("squallotp")) {
$otpAPIurl = 'http://10.0.1.108:5080/opentripplanner-api-webapp/';	$otpAPIurl = 'http://10.0.1.108:5080/opentripplanner-api-webapp/';
}	}
if (isDebug("vanilleotp")) {	if (isDebug("vanilleotp")) {
$otpAPIurl = 'http://10.0.1.135:8080/opentripplanner-api-webapp/';	$otpAPIurl = 'http://10.0.1.135:8080/opentripplanner-api-webapp/';
}	}
if (isDebug("phperror"))	if (isDebug("phperror"))
error_reporting(E_ALL ^ E_NOTICE);	error_reporting(E_ALL ^ E_NOTICE);
$basePath = "";	$basePath = "";
if (strstr($_SERVER['PHP_SELF'], "labs/")	if (strstr($_SERVER['PHP_SELF'], "labs/")
\|\| strstr($_SERVER['PHP_SELF'], "myway/")	\|\| strstr($_SERVER['PHP_SELF'], "myway/")
\|\| strstr($_SERVER['PHP_SELF'], "lib/")	\|\| strstr($_SERVER['PHP_SELF'], "lib/")
\|\| strstr($_SERVER['PHP_SELF'], "geo/")	\|\| strstr($_SERVER['PHP_SELF'], "geo/")
\|\| strstr($_SERVER['PHP_SELF'], "include/")	\|\| strstr($_SERVER['PHP_SELF'], "include/")
\|\| strstr($_SERVER['PHP_SELF'], "servicealerts/"))	\|\| strstr($_SERVER['PHP_SELF'], "servicealerts/"))
$basePath = "../";	$basePath = "../";

function isDebugServer() {	function isDebugServer() {

return php_sapi_name() == "cli" \|\| strstr(php_uname('n'),"actbus") \|\| isset($_SERVER['SERVER_NAME']) && ( $_SERVER['SERVER_NAME'] == "azusa" \|\| $_SERVER['SERVER_NAME'] == "vanille"	return php_sapi_name() == "cli" \|\| strstr(php_uname('n'),"actbus") \|\| isset($_SERVER['SERVER_NAME']) && ( $_SERVER['SERVER_NAME'] == "azusa" \|\| $_SERVER['SERVER_NAME'] == "vanille"
\|\| $_SERVER['SERVER_NAME'] == "localhost" \|\| $_SERVER['SERVER_NAME'] == "127.0.0.1" \|\| $_SERVER['SERVER_NAME'] == "192.168.1.8");	\|\| $_SERVER['SERVER_NAME'] == "localhost" \|\| $_SERVER['SERVER_NAME'] == "127.0.0.1" \|\| $_SERVER['SERVER_NAME'] == "192.168.1.8" \|\| $_SERVER['SERVER_NAME'] == "192.168.178.24");
}	}

include_once ("common-geo.inc.php");	include_once ("common-geo.inc.php");
include_once ("common-net.inc.php");	include_once ("common-net.inc.php");
include_once ("common-transit.inc.php");	include_once ("common-transit.inc.php");
if (!strstr($_SERVER['PHP_SELF'], "feedback")) {	if (!strstr($_SERVER['PHP_SELF'], "feedback")) {
include_once ("common-db.inc.php");	include_once ("common-db.inc.php");
}	}

include_once ("common-request.inc.php");	include_once ("common-request.inc.php");
include_once ("common-session.inc.php");	include_once ("common-session.inc.php");
include_once ("common-auth.inc.php");	include_once ("common-auth.inc.php");
include_once ("common-template.inc.php");	include_once ("common-template.inc.php");

function isAnalyticsOn() {	function isAnalyticsOn() {
$user_agent = $_SERVER['HTTP_USER_AGENT'];	$user_agent = $_SERVER['HTTP_USER_AGENT'];
return !isDebugServer() && !preg_match('/cloudkick/i', $user_agent) && !preg_match('/googlebot/i', $user_agent) &&	return !isDebugServer() && !preg_match('/cloudkick/i', $user_agent) && !preg_match('/googlebot/i', $user_agent) &&
!preg_match('/baidu/i', $user_agent);	!preg_match('/baidu/i', $user_agent);
}	}

function isDebug($debugReason = "other") {	function isDebug($debugReason = "other") {
global $debugOkay;	global $debugOkay;
return in_array($debugReason, $debugOkay, false) && isDebugServer();	return in_array($debugReason, $debugOkay, false) && isDebugServer();
}	}

function debug($msg, $debugReason = "other") {	function debug($msg, $debugReason = "other") {
if (isDebug($debugReason))	if (isDebug($debugReason))
echo "\n<!-- " . date(DATE_RFC822) . "\n $msg -->\n";	echo "\n<!-- " . date(DATE_RFC822) . "\n $msg -->\n";
}	}
function isIOSDevice() {	function isIOSDevice() {
return strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') \|\| strstr($_SERVER['HTTP_USER_AGENT'], 'iPod') \|\| strstr($_SERVER['HTTP_USER_AGENT'], 'iPad');	return strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') \|\| strstr($_SERVER['HTTP_USER_AGENT'], 'iPod') \|\| strstr($_SERVER['HTTP_USER_AGENT'], 'iPad');
}	}
function isJQueryMobileDevice() {	function isJQueryMobileDevice() {
// http://forum.jquery.com/topic/what-is-the-best-way-to-detect-all-useragents-which-can-handle-jquery-mobile#14737000002087897	// http://forum.jquery.com/topic/what-is-the-best-way-to-detect-all-useragents-which-can-handle-jquery-mobile#14737000002087897
$user_agent = $_SERVER['HTTP_USER_AGENT'];	$user_agent = $_SERVER['HTTP_USER_AGENT'];
return preg_match('/iphone/i', $user_agent) \|\| preg_match('/android/i', $user_agent) \|\| preg_match('/webos/i', $user_agent) \|\| preg_match('/ios/i', $user_agent) \|\| preg_match('/bada/i', $user_agent) \|\| preg_match('/maemo/i', $user_agent) \|\| preg_match('/meego/i', $user_agent) \|\| preg_match('/fennec/i', $user_agent) \|\| (preg_match('/symbian/i', $user_agent) && preg_match('/s60/i', $user_agent) && $browser['majorver'] >= 5) \|\| (preg_match('/symbian/i', $user_agent) && preg_match('/platform/i', $user_agent) && $browser['majorver'] >= 3) \|\| (preg_match('/blackberry/i', $user_agent) && $browser['majorver'] >= 5) \|\| (preg_match('/opera mobile/i', $user_agent) && $browser['majorver'] >= 10) \|\| (preg_match('/opera mini/i', $user_agent) && $browser['majorver'] >= 5);	return preg_match('/iphone/i', $user_agent) \|\| preg_match('/android/i', $user_agent) \|\| preg_match('/webos/i', $user_agent) \|\| preg_match('/ios/i', $user_agent) \|\| preg_match('/bada/i', $user_agent) \|\| preg_match('/maemo/i', $user_agent) \|\| preg_match('/meego/i', $user_agent) \|\| preg_match('/fennec/i', $user_agent) \|\| (preg_match('/symbian/i', $user_agent) && preg_match('/s60/i', $user_agent) && $browser['majorver'] >= 5) \|\| (preg_match('/symbian/i', $user_agent) && preg_match('/platform/i', $user_agent) && $browser['majorver'] >= 3) \|\| (preg_match('/blackberry/i', $user_agent) && $browser['majorver'] >= 5) \|\| (preg_match('/opera mobile/i', $user_agent) && $browser['majorver'] >= 10) \|\| (preg_match('/opera mini/i', $user_agent) && $browser['majorver'] >= 5);
}	}


function array_flatten($a, $f = array()) {	function array_flatten($a, $f = array()) {
if (!$a \|\| !is_array($a))	if (!$a \|\| !is_array($a))
return '';	return '';
foreach ($a as $k => $v) {	foreach ($a as $k => $v) {
if (is_array($v))	if (is_array($v))
$f = array_flatten($v, $f);	$f = array_flatten($v, $f);
else	else
$f[$k] = $v;	$f[$k] = $v;
}	}
return $f;	return $f;
}	}

function remove_spaces($string) {	function remove_spaces($string) {
return str_replace(' ', '', $string);	return str_replace(' ', '', $string);
}	}

function object2array($object) {	function object2array($object) {
if (is_object($object)) {	if (is_object($object)) {
foreach ($object as $key => $value) {	foreach ($object as $key => $value) {
$array[$key] = $value;	$array[$key] = $value;
}	}
} else {	} else {
$array = $object;	$array = $object;
}	}
return $array;	return $array;
}	}

function startsWith($haystack, $needle, $case = true) {	function startsWith($haystack, $needle, $case = true) {
if ($case) {	if ($case) {
return (strcmp(substr($haystack, 0, strlen($needle)), $needle) === 0);	return (strcmp(substr($haystack, 0, strlen($needle)), $needle) === 0);
}	}
return (strcasecmp(substr($haystack, 0, strlen($needle)), $needle) === 0);	return (strcasecmp(substr($haystack, 0, strlen($needle)), $needle) === 0);
}	}

function endsWith($haystack, $needle, $case = true) {	function endsWith($haystack, $needle, $case = true) {
if ($case) {	if ($case) {
return (strcmp(substr($haystack, strlen($haystack) - strlen($needle)), $needle) === 0);	return (strcmp(substr($haystack, strlen($haystack) - strlen($needle)), $needle) === 0);
}	}
return (strcasecmp(substr($haystack, strlen($haystack) - strlen($needle)), $needle) === 0);	return (strcasecmp(substr($haystack, strlen($haystack) - strlen($needle)), $needle) === 0);
}	}

function sksort(&$array, $subkey = "id", $sort_ascending = false) {	function sksort(&$array, $subkey = "id", $sort_ascending = false) {
if (count($array))	if (count($array))
$temp_array[key($array)] = array_shift($array);	$temp_array[key($array)] = array_shift($array);
foreach ($array as $key => $val) {	foreach ($array as $key => $val) {
$offset = 0;	$offset = 0;
$found = false;	$found = false;
foreach ($temp_array as $tmp_key => $tmp_val) {	foreach ($temp_array as $tmp_key => $tmp_val) {
if (!$found and strtolower($val[$subkey]) > strtolower($tmp_val[$subkey])) {	if (!$found and strtolower($val[$subkey]) > strtolower($tmp_val[$subkey])) {
$temp_array = array_merge((array) array_slice($temp_array, 0, $offset), array(	$temp_array = array_merge((array) array_slice($temp_array, 0, $offset), array(
$key => $val	$key => $val
), array_slice($temp_array, $offset));	), array_slice($temp_array, $offset));
$found = true;	$found = true;
}	}
$offset++;	$offset++;
}	}
if (!$found)	if (!$found)
$temp_array = array_merge($temp_array, array(	$temp_array = array_merge($temp_array, array(
$key => $val	$key => $val
));	));
}	}
if ($sort_ascending)	if ($sort_ascending)
$array = array_reverse($temp_array);	$array = array_reverse($temp_array);
else	else
$array = $temp_array;	$array = $temp_array;
}	}

function sktimesort(&$array, $subkey = "id", $sort_ascending = false) {	function sktimesort(&$array, $subkey = "id", $sort_ascending = false) {
if (count($array))	if (count($array))
$temp_array[key($array)] = array_shift($array);	$temp_array[key($array)] = array_shift($array);
foreach ($array as $key => $val) {	foreach ($array as $key => $val) {
$offset = 0;	$offset = 0;
$found = false;	$found = false;
foreach ($temp_array as $tmp_key => $tmp_val) {	foreach ($temp_array as $tmp_key => $tmp_val) {
if (!$found and strtotime($val[$subkey]) > strtotime($tmp_val[$subkey])) {	if (!$found and strtotime($val[$subkey]) > strtotime($tmp_val[$subkey])) {
$temp_array = array_merge((array) array_slice($temp_array, 0, $offset), array(	$temp_array = array_merge((array) array_slice($temp_array, 0, $offset), array(
$key => $val	$key => $val
), array_slice($temp_array, $offset));	), array_slice($temp_array, $offset));
$found = true;	$found = true;
}	}
$offset++;	$offset++;
}	}
if (!$found)	if (!$found)
$temp_array = array_merge($temp_array, array(	$temp_array = array_merge($temp_array, array(
$key => $val	$key => $val
));	));
}	}
if ($sort_ascending && isset($temp_array))	if ($sort_ascending && isset($temp_array))
$array = array_reverse($temp_array);	$array = array_reverse($temp_array);
else	else
$array = $temp_array;	$array = $temp_array;
}	}

function r_implode($glue, $pieces) {	function r_implode($glue, $pieces) {
foreach ($pieces as $r_pieces) {	foreach ($pieces as $r_pieces) {
if (is_array($r_pieces)) {	if (is_array($r_pieces)) {
$retVal[] = r_implode($glue, $r_pieces);	$retVal[] = r_implode($glue, $r_pieces);
} else {	} else {
$retVal[] = $r_pieces;	$retVal[] = $r_pieces;
}	}
}	}
return implode($glue, $retVal);	return implode($glue, $retVal);
}	}


?>

file:a/include/db/route-dao.inc.php -> file:b/include/db/route-dao.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 getRoute($routeID) {	function getRoute($routeID) {
global $conn;	global $conn;
$query = "Select * from routes where route_id = :routeID LIMIT 1";	$query = "Select * from routes where route_id = :routeID LIMIT 1";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":routeID", $routeID);	$query->bindParam(":routeID", $routeID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetch(PDO :: FETCH_ASSOC);	return $query->fetch(PDO :: FETCH_ASSOC);
}	}

function getRoutesByShortName($routeShortName) {	function getRoutesByShortName($routeShortName) {
global $conn;	global $conn;
$query = "Select distinct route_id, route_short_name from routes where route_short_name = :routeShortName";	$query = "Select distinct route_id, route_short_name from routes where route_short_name = :routeShortName";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":routeShortName", $routeShortName);	$query->bindParam(":routeShortName", $routeShortName);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getRouteHeadsigns($routeID) {	function getRouteHeadsigns($routeID) {
global $conn;	global $conn;
$query = "select stops.stop_name, trip_headsign, direction_id,max(service_id) as service_id, count(*)	$query = "select stops.stop_name, trip_headsign, direction_id,max(service_id) as service_id, count(*)
from routes join trips on trips.route_id = routes.route_id	from routes join trips on trips.route_id = routes.route_id
join stop_times on stop_times.trip_id = trips.trip_id join stops on	join stop_times on stop_times.trip_id = trips.trip_id join stops on
stop_times.stop_id = stops.stop_id where trips.route_id = :routeID	stop_times.stop_id = stops.stop_id where trips.route_id = :routeID
and stop_times.stop_sequence = 1 group by stops.stop_name, trip_headsign, direction_id having count(*) > 2";	and stop_times.stop_sequence = 1 group by stops.stop_name, trip_headsign, direction_id having count(*) > 2";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":routeID", $routeID);	$query->bindParam(":routeID", $routeID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}
function getRouteDescription($routeID, $directionID) {	function getRouteDescription($routeID, $directionID) {
$trip = getRouteNextTrip($routeID, $directionID);	$trip = getRouteNextTrip($routeID, $directionID);
$start = getTripStartingPoint($trip['trip_id']);	$start = getTripStartingPoint($trip['trip_id']);
$end = getTripDestination($trip['trip_id']);	$end = getTripDestination($trip['trip_id']);
return "From ".$start['stop_name']." to ".$end['stop_name'];	return "From ".$start['stop_name']." to ".$end['stop_name'];
}	}
function getRouteByFullName($routeFullName) {	function getRouteByFullName($routeFullName) {
global $conn;	global $conn;
$query = "Select * from routes where route_short_name\|\|route_long_name = :routeFullName LIMIT 1";	$query = "Select * from routes where route_short_name\|\|route_long_name = :routeFullName LIMIT 1";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":routeFullName", $routeFullName);	$query->bindParam(":routeFullName", $routeFullName);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetch(PDO :: FETCH_ASSOC);	return $query->fetch(PDO :: FETCH_ASSOC);
}	}

function getRoutes() {	function getRoutes() {
global $conn;	global $conn;
$query = "Select * from routes order by route_short_name;";	$query = "Select * from routes order by route_short_name;";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getRoutesByNumberSeries($routeNumberSeries = "") {	function getRoutesByNumberSeries($routeNumberSeries = "") {
global $conn;	global $conn;
if (strlen($routeNumberSeries) == 1) {	if (strlen($routeNumberSeries) == 1) {
return getRoutesByNumber($routeNumberSeries);	return getRoutesByNumber($routeNumberSeries);
}	}
$seriesMin = substr($routeNumberSeries, 0, -1) . "0";	$seriesMin = substr($routeNumberSeries, 0, -1) . "0";
$seriesMax = substr($routeNumberSeries, 0, -1) . "9";	$seriesMax = substr($routeNumberSeries, 0, -1) . "9";
$query = "Select distinct routes.route_id,routes.route_short_name,routes.route_long_name,service_id from routes join trips on trips.route_id =	$query = "Select distinct routes.route_id,routes.route_short_name,routes.route_long_name,service_id from routes join trips on trips.route_id =
routes.route_id join stop_times on stop_times.trip_id = trips.trip_id where to_number(route_short_name, 'FM999') between :seriesMin and :seriesMax OR route_short_name LIKE :routeNumberSeries order by route_short_name;";	routes.route_id join stop_times on stop_times.trip_id = trips.trip_id where to_number(route_short_name, 'FM999') between :seriesMin and :seriesMax OR route_short_name LIKE :routeNumberSeries order by route_short_name;";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":seriesMin", $seriesMin);	$query->bindParam(":seriesMin", $seriesMin);
$query->bindParam(":seriesMax", $seriesMax);	$query->bindParam(":seriesMax", $seriesMax);
$routeNumberSeries = "% " . substr($routeNumberSeries, 0, -1) . "%";	$routeNumberSeries = "% " . substr($routeNumberSeries, 0, -1) . "%";
$query->bindParam(":routeNumberSeries", $routeNumberSeries);	$query->bindParam(":routeNumberSeries", $routeNumberSeries);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getRouteNextTrip($routeID, $directionID) {	function getRouteNextTrip($routeID, $directionID) {
global $conn;	global $conn;

$query = "select routes.route_id,direction_id,trips.trip_id,trip_headsign,departure_time from routes join trips on trips.route_id = routes.route_id	$query = "select routes.route_id,direction_id,trips.trip_id,trip_headsign,departure_time from routes join trips on trips.route_id = routes.route_id
join stop_times on stop_times.trip_id = trips.trip_id where arrival_time between :currentTime and :futureTime	join stop_times on stop_times.trip_id = trips.trip_id where arrival_time between :currentTime and :futureTime
and routes.route_id = :routeID and trips.direction_id = :directionID order by	and routes.route_id = :routeID and trips.direction_id = :directionID order by
arrival_time limit 1";	arrival_time limit 1";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":currentTime", current_time());	$query->bindParam(":currentTime", current_time());
$futureTime = current_time(strtotime(current_time() ." +2h"));	$futureTime = current_time(strtotime(current_time() ." +2h"));
if (date("h",strtotime(current_time()) > 22)) $futureTime = "23:59:59";	if (date("h",strtotime(current_time()) > 22)) $futureTime = "23:59:59";
$query->bindParam(":futureTime", $futureTime);	$query->bindParam(":futureTime", $futureTime);
$query->bindParam(":routeID", $routeID);	$query->bindParam(":routeID", $routeID);
$query->bindParam(":directionID", $directionID);	$query->bindParam(":directionID", $directionID);
$query->execute();	$query->execute();
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
$r = $query->fetch(PDO :: FETCH_ASSOC);	$r = $query->fetch(PDO :: FETCH_ASSOC);
return $r;	return $r;
}	}

function getRouteFirstTrip($routeID,$directionID) {	function getRouteFirstTrip($routeID,$directionID) {
global $conn;	global $conn;

$query = "select * from routes join trips on trips.route_id = routes.route_id	$query = "select * from routes join trips on trips.route_id = routes.route_id
join stop_times on stop_times.trip_id = trips.trip_id where routes.route_id = :routeID	join stop_times on stop_times.trip_id = trips.trip_id where routes.route_id = :routeID
and trips.direction_id = :directionID order by	and trips.direction_id = :directionID order by
arrival_time DESC limit 1";	arrival_time DESC limit 1";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":routeID", $routeID);	$query->bindParam(":routeID", $routeID);

$query->bindParam(":directionID", $directionID);	$query->bindParam(":directionID", $directionID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}

$r = $query->fetch(PDO :: FETCH_ASSOC);	$r = $query->fetch(PDO :: FETCH_ASSOC);
return $r;	return $r;
}	}

function getRouteAtStop($routeID, $directionID, $stop_id) {	function getRouteAtStop($routeID, $directionID, $stop_id) {
$nextTrip = getRouteNextTrip($routeID, $directionID);	$nextTrip = getRouteNextTrip($routeID, $directionID);
if ($nextTrip['trip_id']) {	if ($nextTrip['trip_id']) {
foreach (getTripStopTimes($nextTrip['trip_id']) as $tripStop) {	foreach (getTripStopTimes($nextTrip['trip_id']) as $tripStop) {
if ($tripStop['stop_id'] == $stop_id)	if ($tripStop['stop_id'] == $stop_id)
return $tripStop;	return $tripStop;
}	}
}	}
return Array();	return Array();
}	}

function getRouteTrips($routeID, $directionID = "", $service_period = "") {	function getRouteTrips($routeID, $directionID = "", $service_period = "") {
global $conn;	global $conn;
if ($service_period == "")	if ($service_period == "")
$service_period = service_period();	$service_period = service_period();
$service_ids = service_ids($service_period);	$service_ids = service_ids($service_period);
$sidA = $service_ids[0];	$sidA = $service_ids[0];
$sidB = $service_ids[1];	$sidB = $service_ids[1];
$directionSQL = "";	$directionSQL = "";
if ($directionID != "")	if ($directionID != "")
$directionSQL = " and direction_id = :directionID ";	$directionSQL = " and direction_id = :directionID ";
$query = "select routes.route_id,trips.trip_id,service_id,arrival_time, stop_id, stop_sequence from routes join trips on trips.route_id = routes.route_id	$query = "select routes.route_id,trips.trip_id,service_id,arrival_time, stop_id, stop_sequence from routes join trips on trips.route_id = routes.route_id
join stop_times on stop_times.trip_id = trips.trip_id where (service_id=:service_periodA OR service_id=:service_periodB)	join stop_times on stop_times.trip_id = trips.trip_id where (service_id=:service_periodA OR service_id=:service_periodB)
AND (routes.route_id = :routeID) " . $directionSQL . " and stop_sequence = '1' order by	AND (routes.route_id = :routeID) " . $directionSQL . " and stop_sequence = '1' order by
arrival_time ";	arrival_time ";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":routeID", $routeID);	$query->bindParam(":routeID", $routeID);
$query->bindParam(":service_periodA", $sidA);	$query->bindParam(":service_periodA", $sidA);
$query->bindParam(":service_periodB", $sidB);	$query->bindParam(":service_periodB", $sidB);
if ($directionSQL != "")	if ($directionSQL != "")
$query->bindParam(":directionID", $directionID);	$query->bindParam(":directionID", $directionID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getRoutesByDestination($destination = "", $service_period = "") {	function getRoutesByDestination($destination = "", $service_period = "") {
global $conn;	global $conn;
if ($service_period == "")	if ($service_period == "")
$service_period = service_period();	$service_period = service_period();
$service_ids = service_ids($service_period);	$service_ids = service_ids($service_period);
$sidA = $service_ids[0];	$sidA = $service_ids[0];
$sidB = $service_ids[1];	$sidB = $service_ids[1];
if ($destination != "") {	if ($destination != "") {
/* $query = "SELECT DISTINCT trips.route_id,route_short_name,route_long_name, service_id	/* $query = "SELECT DISTINCT trips.route_id,route_short_name,route_long_name, service_id
FROM stop_times join trips on trips.trip_id =	FROM stop_times join trips on trips.trip_id =
stop_times.trip_id join routes on trips.route_id = routes.route_id	stop_times.trip_id join routes on trips.route_id = routes.route_id
WHERE route_long_name = :destination AND (service_id=:service_periodA OR service_id=:service_periodB)	WHERE route_long_name = :destination AND (service_id=:service_periodA OR service_id=:service_periodB)
order by route_short_name";*/	order by route_short_name";*/
$query = "select route_id, direction_id, stop_name, b.trip_id, b.stop_sequence from (select route_id, direction_id, max(stop_sequence) as stop_sequence, max(a.trip_id) as trip_id from stop_times inner join (SELECT route_id, direction_id, max(trip_id) as trip_id	$query = "select route_id, direction_id, stop_name, b.trip_id, b.stop_sequence from (select route_id, direction_id, max(stop_sequence) as stop_sequence, max(a.trip_id) as trip_id from stop_times inner join (SELECT route_id, direction_id, max(trip_id) as trip_id
from trips group by route_id,direction_id) as a on stop_times.trip_id = a.trip_id group by route_id, direction_id) as b inner join stop_times on b.trip_id = stop_times.trip_id inner join stops on stop_times.stop_id = stops.stop_id where stop_times.stop_sequence = b.stop_sequence and stop_name = :destination order by route_id;";	from trips group by route_id,direction_id) as a on stop_times.trip_id = a.trip_id group by route_id, direction_id) as b inner join stop_times on b.trip_id = stop_times.trip_id inner join stops on stop_times.stop_id = stops.stop_id where stop_times.stop_sequence = b.stop_sequence and stop_name = :destination order by route_id;";
} else {	} else {
$query = "select stop_name from (select route_id, direction_id, max(stop_sequence) as stop_sequence, max(a.trip_id) as trip_id from stop_times inner join (SELECT route_id, direction_id, max(trip_id) as trip_id	$query = "select stop_name from (select route_id, direction_id, max(stop_sequence) as stop_sequence, max(a.trip_id) as trip_id from stop_times inner join (SELECT route_id, direction_id, max(trip_id) as trip_id
from trips group by route_id,direction_id) as a on stop_times.trip_id = a.trip_id group by route_id, direction_id) as b inner join stop_times on b.trip_id = stop_times.trip_id inner join stops on stop_times.stop_id = stops.stop_id where stop_times.stop_sequence = b.stop_sequence group by stop_name order by stop_name;";	from trips group by route_id,direction_id) as a on stop_times.trip_id = a.trip_id group by route_id, direction_id) as b inner join stop_times on b.trip_id = stop_times.trip_id inner join stops on stop_times.stop_id = stops.stop_id where stop_times.stop_sequence = b.stop_sequence group by stop_name order by stop_name;";
}	}
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);

//$query->bindParam(":service_periodA", $sidA);	//$query->bindParam(":service_periodA", $sidA);
//$query->bindParam(":service_periodB", $sidB);	//$query->bindParam(":service_periodB", $sidB);
if ($destination != "")	if ($destination != "")
$query->bindParam(":destination", $destination);	$query->bindParam(":destination", $destination);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getRoutesBySuburb($suburb, $service_period = "") {	function getRoutesBySuburb($suburb, $service_period = "") {
if ($service_period == "")	if ($service_period == "")
$service_period = service_period();	$service_period = service_period();
$service_ids = service_ids($service_period);	$service_ids = service_ids($service_period);
$sidA = $service_ids[0];	$sidA = $service_ids[0];
$sidB = $service_ids[1];	$sidB = $service_ids[1];

global $conn;	global $conn;
$query = "SELECT DISTINCT service_id,trips.route_id,route_short_name,route_long_name	$query = "SELECT DISTINCT service_id,trips.route_id,route_short_name,route_long_name
FROM stop_times join trips on trips.trip_id = stop_times.trip_id	FROM stop_times join trips on trips.trip_id = stop_times.trip_id
join routes on trips.route_id = routes.route_id	join routes on trips.route_id = routes.route_id
join stops on stops.stop_id = stop_times.stop_id	join stops on stops.stop_id = stop_times.stop_id
WHERE stop_desc LIKE :suburb AND (service_id=:service_periodA OR service_id=:service_periodB)	WHERE stop_desc LIKE :suburb AND (service_id=:service_periodA OR service_id=:service_periodB)
ORDER BY route_short_name";	ORDER BY route_short_name";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":service_periodA", $sidA);	$query->bindParam(":service_periodA", $sidA);
$query->bindParam(":service_periodB", $sidB);	$query->bindParam(":service_periodB", $sidB);
$suburb = "%Suburb: %" . $suburb . "%";	$suburb = "%Suburb: %" . $suburb . "%";
$query->bindParam(":suburb", $suburb);	$query->bindParam(":suburb", $suburb);
$query->execute();	$query->execute();

databaseError($conn->errorInfo());	databaseError($conn->errorInfo());

return $query->fetchAll();	return $query->fetchAll();
}	}

function getRoutesNearby($lat, $lng, $limit = "", $distance = 500) {	function getRoutesNearby($lat, $lng, $limit = "", $distance = 500) {
// if ($service_period == "")	// if ($service_period == "")
$service_period = service_period();	$service_period = service_period();
$service_ids = service_ids($service_period);	$service_ids = service_ids($service_period);
$sidA = $service_ids[0];	$sidA = $service_ids[0];
$sidB = $service_ids[1];	$sidB = $service_ids[1];
$limitSQL = "";	$limitSQL = "";
if ($limit != "")	if ($limit != "")
$limitSQL = " LIMIT :limit ";	$limitSQL = " LIMIT :limit ";
global $conn;	global $conn;
$query = "SELECT service_id,trips.route_id,trips.direction_id,route_short_name,route_long_name,min(stops.stop_id) as stop_id,	$query = "SELECT service_id,trips.route_id,trips.direction_id,route_short_name,route_long_name,min(stops.stop_id) as stop_id,
min(ST_Distance(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), FALSE)) as distance	min(ST_Distance(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), FALSE)) as distance
FROM stop_times	FROM stop_times
join trips on trips.trip_id = stop_times.trip_id	join trips on trips.trip_id = stop_times.trip_id
join routes on trips.route_id = routes.route_id	join routes on trips.route_id = routes.route_id
join stops on stops.stop_id = stop_times.stop_id	join stops on stops.stop_id = stop_times.stop_id
WHERE (service_id=:service_periodA OR service_id=:service_periodB)	WHERE (service_id=:service_periodA OR service_id=:service_periodB)
AND ST_DWithin(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), :distance, FALSE)	AND ST_DWithin(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), :distance, FALSE)
group by service_id,trips.route_id,trips.direction_id,route_short_name,route_long_name	group by service_id,trips.route_id,trips.direction_id,route_short_name,route_long_name
order by distance $limitSQL";	order by distance $limitSQL";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":service_periodA", $sidA);	$query->bindParam(":service_periodA", $sidA);
$query->bindParam(":service_periodB", $sidB);	$query->bindParam(":service_periodB", $sidB);
$query->bindParam(":distance", $distance);	$query->bindParam(":distance", $distance);
if ($limit != "")	if ($limit != "")
$query->bindParam(":limit", $limit);	$query->bindParam(":limit", $limit);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

?>

file:a/include/db/servicealert-dao.inc.php -> file:b/include/db/servicealert-dao.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 getServiceOverride($date = "") {	function getServiceOverride($date = "") {
global $conn;	global $conn;
$query = "Select * from calendar_dates where date = :date and exception_type = '1' LIMIT 1";	$query = "Select * from calendar_dates where date = :date and exception_type = '1' LIMIT 1";
// debug($query,"database");	// debug($query,"database");
$query = $conn->prepare($query); // Create a prepared statement	$query = $conn->prepare($query); // Create a prepared statement
$query->bindParam(":date", date("Ymd", ($date != "" ? $date : time())));	$query->bindParam(":date", date("Ymd", ($date != "" ? $date : time())));
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetch(PDO :: FETCH_ASSOC);	return $query->fetch(PDO :: FETCH_ASSOC);
}	}

function getServiceAlert($alertID) {	function getServiceAlert($alertID) {
global $conn;	global $conn;
$query = "SELECT id,extract('epoch' from start) as start, extract('epoch' from \"end\") as \"end\",cause,effect,header,description,url from servicealerts_alerts where id = :servicealert_id";	$query = "SELECT id,extract('epoch' from start) as start, extract('epoch' from \"end\") as \"end\",cause,effect,header,description,url from servicealerts_alerts where id = :servicealert_id";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":servicealert_id", $alertID);	$query->bindParam(":servicealert_id", $alertID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetch(PDO :: FETCH_ASSOC);	return $query->fetch(PDO :: FETCH_ASSOC);
}	}

function updateServiceAlert($alertID, $start, $end, $header, $description, $url) {	function updateServiceAlert($alertID, $start, $end, $header, $description, $url) {
global $conn;	global $conn;
$query = 'update servicealerts_alerts set start=:start, "end"=:end, header=:header, description=:description, url=:url where id = :servicealert_id';	$query = 'update servicealerts_alerts set start=:start, "end"=:end, header=:header, description=:description, url=:url where id = :servicealert_id';
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":servicealert_id", $alertID);	$query->bindParam(":servicealert_id", $alertID);
$query->bindParam(":start", $start);	$query->bindParam(":start", $start);
$query->bindParam(":end", $end);	$query->bindParam(":end", $end);
$query->bindParam(":header", $header);	$query->bindParam(":header", $header);
$query->bindParam(":description", $description);	$query->bindParam(":description", $description);
$query->bindParam(":url", $url);	$query->bindParam(":url", $url);
$query->execute();	$query->execute();

print_r($conn->errorInfo());	print_r($conn->errorInfo());
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetch(PDO :: FETCH_ASSOC);	return $query->fetch(PDO :: FETCH_ASSOC);
}	}

function addServiceAlert($start, $end, $header, $description, $url) {	function addServiceAlert($start, $end, $header, $description, $url) {
global $conn;	global $conn;
$query = 'INSERT INTO servicealerts_alerts (start, "end", header, description, url) VALUES (:start, :end, :header, :description, :url) ';	$query = 'INSERT INTO servicealerts_alerts (start, "end", header, description, url) VALUES (:start, :end, :header, :description, :url) ';
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":start", $start);	$query->bindParam(":start", $start);
$query->bindParam(":end", $end);	$query->bindParam(":end", $end);
$query->bindParam(":header", $header);	$query->bindParam(":header", $header);
$query->bindParam(":description", $description);	$query->bindParam(":description", $description);
$query->bindParam(":url", $url);	$query->bindParam(":url", $url);
$query->execute();	$query->execute();

print_r($conn->errorInfo());	print_r($conn->errorInfo());
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetch(PDO :: FETCH_ASSOC);	return $query->fetch(PDO :: FETCH_ASSOC);
}	}

function getCurrentAlerts() {	function getCurrentAlerts() {
global $conn;	global $conn;
$query = "SELECT id,extract('epoch' from start) as start, extract('epoch' from \"end\") as \"end\",cause,effect,header,description,url from servicealerts_alerts where NOW() > start and NOW() < \"end\"";	$query = "SELECT id,extract('epoch' from start) as start, extract('epoch' from \"end\") as \"end\",cause,effect,header,description,url from servicealerts_alerts where NOW() > start and NOW() < \"end\"";
// debug($query, "database");	// debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getFutureAlerts() {	function getFutureAlerts() {
global $conn;	global $conn;
$query = "SELECT id,extract('epoch' from start) as start, extract('epoch' from \"end\") as \"end\",cause,effect,header,description,url from servicealerts_alerts where NOW() > start or NOW() < \"end\"";	$query = "SELECT id,extract('epoch' from start) as start, extract('epoch' from \"end\") as \"end\",cause,effect,header,description,url from servicealerts_alerts where NOW() > start or NOW() < \"end\"";
// debug($query, "database");	// debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getInformedAlerts($id, $filter_class, $filter_id) {	function getInformedAlerts($id, $filter_class, $filter_id) {

global $conn;	global $conn;
$query = "SELECT * from servicealerts_informed where servicealert_id = :servicealert_id";	$query = "SELECT * from servicealerts_informed where servicealert_id = :servicealert_id";

if ($filter_class != "") {	if ($filter_class != "") {
$query .= " AND informed_class = :informed_class ";	$query .= " AND informed_class = :informed_class ";
}	}
if ($filter_id != "") {	if ($filter_id != "") {
$query .= " AND informed_id = :informed_id ";	$query .= " AND informed_id = :informed_id ";
}	}
// debug($query, "database");	// debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
if ($filter_class != "") {	if ($filter_class != "") {
$query->bindParam(":informed_class", $filter_class);	$query->bindParam(":informed_class", $filter_class);
}	}
if ($filter_id != "") {	if ($filter_id != "") {
$query->bindParam(":informed_id", $filter_id);	$query->bindParam(":informed_id", $filter_id);
}	}
$query->bindParam(":servicealert_id", $id);	$query->bindParam(":servicealert_id", $id);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function deleteInformedAlert($serviceAlertID, $class, $id) {	function deleteInformedAlert($serviceAlertID, $class, $id) {
global $conn;	global $conn;
$query = 'DELETE from servicealerts_informed where servicealert_id = :servicealert_id and informed_class = :informed_class AND informed_id = :informed_id';	$query = 'DELETE from servicealerts_informed where servicealert_id = :servicealert_id and informed_class = :informed_class AND informed_id = :informed_id';
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":servicealert_id", $serviceAlertID);	$query->bindParam(":servicealert_id", $serviceAlertID);
$query->bindParam(":informed_class", $class);	$query->bindParam(":informed_class", $class);
$query->bindParam(":informed_id", $id);	$query->bindParam(":informed_id", $id);
$query->execute();	$query->execute();
print_r($conn->errorInfo());	print_r($conn->errorInfo());
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return null;	return null;
}	}

function addInformedAlert($serviceAlertID, $class, $id, $action) {	function addInformedAlert($serviceAlertID, $class, $id, $action) {
global $conn;	global $conn;
$query = 'INSERT INTO servicealerts_informed (servicealert_id , informed_class , informed_id) VALUES(:servicealert_id ,:informed_class, :informed_id)';	$query = 'INSERT INTO servicealerts_informed (servicealert_id , informed_class , informed_id) VALUES(:servicealert_id ,:informed_class, :informed_id)';
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":servicealert_id", $serviceAlertID);	$query->bindParam(":servicealert_id", $serviceAlertID);
$query->bindParam(":informed_class", $class);	$query->bindParam(":informed_class", $class);
$query->bindParam(":informed_id", $id);	$query->bindParam(":informed_id", $id);
$query->execute();	$query->execute();

print_r($conn->errorInfo());	print_r($conn->errorInfo());
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return null;	return null;
}	}

?>

file:a/include/db/stop-dao.inc.php -> file:b/include/db/stop-dao.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 getStop($stopID) {	function getStop($stopID) {
global $conn;	global $conn;
$query = "Select * from stops where stop_id = :stopID LIMIT 1";	$query = "Select * from stops where stop_id = :stopID LIMIT 1";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":stopID", $stopID);	$query->bindParam(":stopID", $stopID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetch(PDO :: FETCH_ASSOC);	return $query->fetch(PDO :: FETCH_ASSOC);
}	}

function getStops($firstLetter = "", $startsWith = "") {	function getStops($firstLetter = "", $startsWith = "") {
global $conn;	global $conn;
$conditions = Array();	$conditions = Array();
if ($firstLetter != "")	if ($firstLetter != "")
$conditions[] = "substr(stop_name,1,1) = :firstLetter";	$conditions[] = "substr(stop_name,1,1) = :firstLetter";
if ($startsWith != "")	if ($startsWith != "")
$conditions[] = "stop_name like :startsWith";	$conditions[] = "stop_name like :startsWith";
$query = "Select * from stops";	$query = "Select * from stops";
if (sizeof($conditions) > 0) {	if (sizeof($conditions) > 0) {
if (sizeof($conditions) > 1) {	if (sizeof($conditions) > 1) {
$query .= " Where " . implode(" AND ", $conditions) . " ";	$query .= " Where " . implode(" AND ", $conditions) . " ";
} else {	} else {
$query .= " Where " . $conditions[0] . " ";	$query .= " Where " . $conditions[0] . " ";
}	}
}	}
$query .= " order by stop_name;";	$query .= " order by stop_name;";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
if ($firstLetter != "")	if ($firstLetter != "")
$query->bindParam(":firstLetter", $firstLetter);	$query->bindParam(":firstLetter", $firstLetter);

if ($startsWith != "") {	if ($startsWith != "") {
$startsWith = $startsWith . "%";	$startsWith = $startsWith . "%";
$query->bindParam(":startsWith", $startsWith);	$query->bindParam(":startsWith", $startsWith);
}	}
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getNearbyStops($lat, $lng, $limit = "", $distance = 1000) {	function getNearbyStops($lat, $lng, $limit = "", $distance = 1000) {
if ($lat == null \|\| $lng == null)	if ($lat == null \|\| $lng == null)
return Array();	return Array();
if ($limit != "")	if ($limit != "")
$limitSQL = " LIMIT :limit ";	$limitSQL = " LIMIT :limit ";
global $conn;	global $conn;
$query = "Select *, ST_Distance(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), FALSE) as distance	$query = "Select *, ST_Distance(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), FALSE) as distance
from stops WHERE ST_DWithin(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), :distance, FALSE)	from stops WHERE ST_DWithin(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), :distance, FALSE)
order by distance $limitSQL;";	order by distance $limitSQL;";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":distance", $distance);	$query->bindParam(":distance", $distance);
$query->bindParam(":limit", $limit);	$query->bindParam(":limit", $limit);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getStopsByName($name) {	function getStopsByName($name) {
global $conn;	global $conn;
$query = "Select * from stops where stop_name LIKE :name;";	$query = "Select * from stops where stop_name LIKE :name;";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$name = "%" . $name . ";%";	$name = "%" . $name . ";%";
$query->bindParam(":name", $name);	$query->bindParam(":name", $name);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getStopsBySuburb($suburb) {	function getStopsBySuburb($suburb) {
global $conn;	global $conn;
$query = "Select * from stops where stop_desc LIKE :suburb order by stop_name;";	$query = "Select * from stops where stop_desc LIKE :suburb order by stop_name;";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$suburb = "%<br>Suburb: %" . $suburb . "%";	$suburb = "%<br>Suburb: %" . $suburb . "%";
$query->bindParam(":suburb", $suburb);	$query->bindParam(":suburb", $suburb);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getStopsByStopCode($stop_code, $startsWith = "") {	function getStopsByStopCode($stop_code, $startsWith = "") {
global $conn;	global $conn;
$query = "Select * from stops where (stop_code = :stop_code OR stop_code LIKE :stop_code2)";	$query = "Select * from stops where (stop_code = :stop_code OR stop_code LIKE :stop_code2)";
if ($startsWith != "")	if ($startsWith != "")
$query .= " AND stop_name like :startsWith";	$query .= " AND stop_name like :startsWith";

debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);

$query->bindParam(":stop_code", $stop_code);	$query->bindParam(":stop_code", $stop_code);
$stop_code2 = $stop_code . "%";	$stop_code2 = $stop_code . "%";
$query->bindParam(":stop_code2", $stop_code2);	$query->bindParam(":stop_code2", $stop_code2);
if ($startsWith != "") {	if ($startsWith != "") {
$startsWith = $startsWith . "%";	$startsWith = $startsWith . "%";
$query->bindParam(":startsWith", $startsWith);	$query->bindParam(":startsWith", $startsWith);
}	}
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getStopRoutes($stopID, $service_period) {	function getStopRoutes($stopID, $service_period) {
if ($service_period == "") {	if ($service_period == "") {
$service_period = service_period();	$service_period = service_period();
}	}
$service_ids = service_ids($service_period);	$service_ids = service_ids($service_period);
$sidA = $service_ids[0];	$sidA = $service_ids[0];
$sidB = $service_ids[1];	$sidB = $service_ids[1];
global $conn;	global $conn;
$query = "SELECT distinct service_id,trips.route_id,route_short_name,route_long_name	$query = "SELECT distinct service_id,trips.route_id,route_short_name,route_long_name
FROM stop_times join trips on trips.trip_id =	FROM stop_times join trips on trips.trip_id =
stop_times.trip_id join routes on trips.route_id = routes.route_id WHERE stop_id = :stopID	stop_times.trip_id join routes on trips.route_id = routes.route_id WHERE stop_id = :stopID
AND (service_id=:service_periodA OR service_id=:service_periodB)";	AND (service_id=:service_periodA OR service_id=:service_periodB)";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":service_periodA", $sidA);	$query->bindParam(":service_periodA", $sidA);
$query->bindParam(":service_periodB", $sidB);	$query->bindParam(":service_periodB", $sidB);
$query->bindParam(":stopID", $stopID);	$query->bindParam(":stopID", $stopID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getStopTrips($stopID, $service_period = "", $afterTime = "", $limit = "", $route_short_name = "") {	function getStopTrips($stopID, $service_period = "", $afterTime = "", $limit = "", $route_short_name = "") {
if ($service_period == "") {	if ($service_period == "") {
$service_period = service_period();	$service_period = service_period();
}	}
$service_ids = service_ids($service_period);	$service_ids = service_ids($service_period);
$sidA = $service_ids[0];	$sidA = $service_ids[0];
$sidB = $service_ids[1];	$sidB = $service_ids[1];
$limitSQL = "";	$limitSQL = "";
if ($limit != "")	if ($limit != "")
$limitSQL .= " LIMIT :limit ";	$limitSQL .= " LIMIT :limit ";

global $conn;	global $conn;
if ($afterTime != "") {	if ($afterTime != "") {
$query = " SELECT stop_times.trip_id,stop_times.arrival_time,stop_times.stop_id,stop_sequence,service_id,trips.route_id,trips.direction_id,trips.trip_headsign,route_short_name,route_long_name,end_times.arrival_time as end_time	$query = " SELECT stop_times.trip_id,stop_times.arrival_time,stop_times.stop_id,stop_sequence,service_id,trips.route_id,trips.direction_id,trips.trip_headsign,route_short_name,route_long_name,end_times.arrival_time as end_time
FROM stop_times	FROM stop_times
join trips on trips.trip_id =	join trips on trips.trip_id =
stop_times.trip_id	stop_times.trip_id
join routes on trips.route_id = routes.route_id , (SELECT trip_id,max(arrival_time) as arrival_time from stop_times	join routes on trips.route_id = routes.route_id , (SELECT trip_id,max(arrival_time) as arrival_time from stop_times
WHERE stop_times.arrival_time IS NOT NULL group by trip_id) as end_times	WHERE stop_times.arrival_time IS NOT NULL group by trip_id) as end_times
WHERE stop_times.stop_id = :stopID	WHERE stop_times.stop_id = :stopID
AND stop_times.trip_id = end_times.trip_id	AND stop_times.trip_id = end_times.trip_id
AND (service_id=:service_periodA OR service_id=:service_periodB) " . ($route_short_name != "" ? " AND route_short_name = :route_short_name " : "") . "	AND (service_id=:service_periodA OR service_id=:service_periodB) " . ($route_short_name != "" ? " AND route_short_name = :route_short_name " : "") . "
AND end_times.arrival_time > :afterTime	AND end_times.arrival_time > :afterTime
ORDER BY end_time $limitSQL";	ORDER BY end_time $limitSQL";
} else {	} else {
$query = "SELECT stop_times.trip_id,arrival_time,stop_times.stop_id,stop_sequence,service_id,trips.route_id,route_short_name,route_long_name	$query = "SELECT stop_times.trip_id,arrival_time,stop_times.stop_id,stop_sequence,service_id,trips.route_id,route_short_name,route_long_name
FROM stop_times	FROM stop_times
join trips on trips.trip_id =	join trips on trips.trip_id =
stop_times.trip_id	stop_times.trip_id
join routes on trips.route_id = routes.route_id	join routes on trips.route_id = routes.route_id
WHERE stop_times.stop_id = :stopID	WHERE stop_times.stop_id = :stopID
AND (service_id=:service_periodA OR service_id=:service_periodB) " . ($route_short_name != "" ? " AND route_short_name = :route_short_name " : "") . "	AND (service_id=:service_periodA OR service_id=:service_periodB) " . ($route_short_name != "" ? " AND route_short_name = :route_short_name " : "") . "
ORDER BY arrival_time $limitSQL";	ORDER BY arrival_time $limitSQL";
}	}
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":service_periodA", $sidA);	$query->bindParam(":service_periodA", $sidA);
$query->bindParam(":service_periodB", $sidB);	$query->bindParam(":service_periodB", $sidB);
$query->bindParam(":stopID", $stopID);	$query->bindParam(":stopID", $stopID);
if ($limit != "")	if ($limit != "")
$query->bindParam(":limit", $limit);	$query->bindParam(":limit", $limit);
if ($afterTime != "")	if ($afterTime != "")
$query->bindParam(":afterTime", $afterTime);	$query->bindParam(":afterTime", $afterTime);
if ($route_short_name != "")	if ($route_short_name != "")
$query->bindParam(":route_short_name", $route_short_name);	$query->bindParam(":route_short_name", $route_short_name);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getStopTripsWithTimes($stopID, $time = "", $service_period = "", $time_range = "", $limit = "") {	function getStopTripsWithTimes($stopID, $time = "", $service_period = "", $time_range = "", $limit = "") {
if ($service_period == "")	if ($service_period == "")
$service_period = service_period();	$service_period = service_period();
if ($time_range == "")	if ($time_range == "")
$time_range = (24 * 60 * 60);	$time_range = (24 * 60 * 60);
if ($time == "")	if ($time == "")
$time = current_time();	$time = current_time();
if ($limit == "")	if ($limit == "")
$limit = 10;	$limit = 10;
$trips = getStopTrips($stopID, $service_period, $time);	$trips = getStopTrips($stopID, $service_period, $time);
$timedTrips = Array();	$timedTrips = Array();
if ($trips && sizeof($trips) > 0) {	if ($trips && sizeof($trips) > 0) {
foreach ($trips as $trip) {	foreach ($trips as $trip) {
if ($trip['arrival_time'] != "") {	if ($trip['arrival_time'] != "") {
if (strtotime($trip['arrival_time']) > strtotime($time) and strtotime($trip['arrival_time']) < (strtotime($time) + $time_range)) {	if (strtotime($trip['arrival_time']) > strtotime($time) and strtotime($trip['arrival_time']) < (strtotime($time) + $time_range)) {
$timedTrips[] = $trip;	$timedTrips[] = $trip;
}	}
} else {	} else {
$timedTrip = getTripAtStop($trip['trip_id'], $trip['stop_sequence']);	$timedTrip = getTripAtStop($trip['trip_id'], $trip['stop_sequence']);
if ($timedTrip['arrival_time'] > $time and strtotime($timedTrip['arrival_time']) < (strtotime($time) + $time_range)) {	if ($timedTrip['arrival_time'] > $time and strtotime($timedTrip['arrival_time']) < (strtotime($time) + $time_range)) {
$timedTrips[] = $timedTrip;	$timedTrips[] = $timedTrip;
}	}
}	}
if (sizeof($timedTrips) > $limit)	if (sizeof($timedTrips) > $limit)
break;	break;
}	}
sktimesort($timedTrips, "arrival_time", true);	sktimesort($timedTrips, "arrival_time", true);
}	}
return $timedTrips;	return $timedTrips;
}	}

?>

file:a/include/db/trip-dao.inc.php -> file:b/include/db/trip-dao.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 getTrip($tripID) {	function getTrip($tripID) {
global $conn;	global $conn;
$query = "Select * from trips	$query = "Select * from trips
join routes on trips.route_id = routes.route_id	join routes on trips.route_id = routes.route_id
where trip_id = :tripID	where trip_id = :tripID
LIMIT 1";	LIMIT 1";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":tripID", $tripID);	$query->bindParam(":tripID", $tripID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());

return Array();	return Array();
}	}
return $query->fetch(PDO :: FETCH_ASSOC);	return $query->fetch(PDO :: FETCH_ASSOC);
}	}
function getTripStops($tripID) {	function getTripStops($tripID) {
global $conn;	global $conn;
$query = "SELECT stop_id, stop_name, ST_AsKML(position) as positionkml,	$query = "SELECT stops.stop_id, stop_name, ST_AsKML(position) as positionkml,
stop_sequence, trips.trip_id	stop_sequence, trips.trip_id
FROM stop_times	FROM stop_times
join trips on trips.trip_id = stop_times.trip_id	join trips on trips.trip_id = stop_times.trip_id
join stops on stops.stop_id = stop_times.stop_id	join stops on stops.stop_id = stop_times.stop_id
WHERE trips.trip_id = :tripID ORDER BY stop_sequence";	WHERE trips.trip_id = :tripID ORDER BY stop_sequence";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":tripID", $tripID);	$query->bindParam(":tripID", $tripID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchColumn(0);	return $query->fetchAll();
}	}
function getTripShape($tripID) {	function getTripShape($tripID) {
// todo, use shapes table if shape_id specified	// todo, use shapes table if shape_id specified
global $conn;	global $conn;
$query = "SELECT ST_AsKML(ST_MakeLine(geometry(a.shape_pt))) as the_route	$query = "SELECT ST_AsKML(ST_MakeLine(geometry(a.shape_pt))) as the_route
FROM (SELECT shapes.shape_id,shape_pt from shapes	FROM (SELECT shapes.shape_id,shape_pt from shapes
inner join trips on shapes.shape_id = trips.shape_id	inner join trips on shapes.shape_id = trips.shape_id
WHERE trips.trip_id = :tripID ORDER BY shape_pt_sequence) as a group by a.shape_id";	WHERE trips.trip_id = :tripID ORDER BY shape_pt_sequence) as a group by a.shape_id";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":tripID", $tripID);	$query->bindParam(":tripID", $tripID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchColumn(0);	return $query->fetchColumn(0);
}	}

function getTripStopTimes($tripID) {	function getTripStopTimes($tripID) {
global $conn;	global $conn;
$query = "SELECT stop_times.trip_id,trip_headsign,arrival_time,stop_times.stop_id	$query = "SELECT stop_times.trip_id,trip_headsign,arrival_time,stop_times.stop_id
,stop_lat,stop_lon,stop_name,stop_desc,stop_code,	,stop_lat,stop_lon,stop_name,stop_desc,stop_code,
stop_sequence,service_id,trips.route_id,route_short_name,route_long_name	stop_sequence,service_id,trips.route_id,route_short_name,route_long_name
FROM stop_times	FROM stop_times
join trips on trips.trip_id = stop_times.trip_id	join trips on trips.trip_id = stop_times.trip_id
join routes on trips.route_id = routes.route_id	join routes on trips.route_id = routes.route_id
join stops on stops.stop_id = stop_times.stop_id	join stops on stops.stop_id = stop_times.stop_id
WHERE trips.trip_id = :tripID ORDER BY stop_sequence";	WHERE trips.trip_id = :tripID ORDER BY stop_sequence";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":tripID", $tripID);	$query->bindParam(":tripID", $tripID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
$stopTimes = $query->fetchAll();	$stopTimes = $query->fetchAll();
return $stopTimes;	return $stopTimes;
}	}

function getTripAtStop($tripID, $stop_sequence) {	function getTripAtStop($tripID, $stop_sequence) {
global $conn;	global $conn;
foreach (getTripStopTimes($tripID) as $tripStop) {	foreach (getTripStopTimes($tripID) as $tripStop) {
if ($tripStop['stop_sequence'] == $stop_sequence)	if ($tripStop['stop_sequence'] == $stop_sequence)
return $tripStop;	return $tripStop;
}	}
return Array();	return Array();
}	}

function getTripStartTime($tripID) {	function getTripStartTime($tripID) {
global $conn;	global $conn;
$query = "Select * from stop_times	$query = "Select * from stop_times
where trip_id = :tripID	where trip_id = :tripID
AND arrival_time IS NOT NULL	AND arrival_time IS NOT NULL
AND stop_sequence = '1'";	AND stop_sequence = '1'";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":tripID", $tripID);	$query->bindParam(":tripID", $tripID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
$r = $query->fetch(PDO :: FETCH_ASSOC);	$r = $query->fetch(PDO :: FETCH_ASSOC);
return $r['arrival_time'];	return $r['arrival_time'];
}	}

function getTripEndTime($tripID) {	function getTripEndTime($tripID) {
global $conn;	global $conn;
$query = "SELECT trip_id,max(arrival_time) as arrival_time from stop_times	$query = "SELECT trip_id,max(arrival_time) as arrival_time from stop_times
WHERE stop_times.arrival_time IS NOT NULL and trip_id = :tripID group by trip_id";	WHERE stop_times.arrival_time IS NOT NULL and trip_id = :tripID group by trip_id";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":tripID", $tripID);	$query->bindParam(":tripID", $tripID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
$r = $query->fetch(PDO :: FETCH_ASSOC);	$r = $query->fetch(PDO :: FETCH_ASSOC);
return $r['arrival_time'];	return $r['arrival_time'];
}	}
function getTripStartingPoint($tripID) {	function getTripStartingPoint($tripID) {
global $conn;	global $conn;
$query = "SELECT stops.stop_id, stops.stop_name, stops.stop_desc	$query = "SELECT stops.stop_id, stops.stop_name, stops.stop_desc
from stop_times inner join stops on stop_times.stop_id = stops.stop_id	from stop_times inner join stops on stop_times.stop_id = stops.stop_id
WHERE trip_id = :tripID and stop_sequence = '1' limit 1";	WHERE trip_id = :tripID and stop_sequence = '1' limit 1";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":tripID", $tripID);	$query->bindParam(":tripID", $tripID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
$r = $query->fetch(PDO :: FETCH_ASSOC);	$r = $query->fetch(PDO :: FETCH_ASSOC);
return $r;	return $r;
}	}

function getTripDestination($tripID) {	function getTripDestination($tripID) {
global $conn;	global $conn;
$query = "SELECT stops.stop_id, stops.stop_name, stops.stop_desc	$query = "SELECT stops.stop_id, stops.stop_name, stops.stop_desc
from stop_times inner join stops on stop_times.stop_id = stops.stop_id	from stop_times inner join stops on stop_times.stop_id = stops.stop_id
WHERE trip_id = :tripID order by stop_sequence desc limit 1";	WHERE trip_id = :tripID order by stop_sequence desc limit 1";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":tripID", $tripID);	$query->bindParam(":tripID", $tripID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
$r = $query->fetch(PDO :: FETCH_ASSOC);	$r = $query->fetch(PDO :: FETCH_ASSOC);
return $r;	return $r;
}	}

function getActiveTrips($time) {	function getActiveTrips($time) {
global $conn;	global $conn;
if ($time == "")	if ($time == "")
$time = current_time();	$time = current_time();
$query = "Select distinct stop_times.trip_id, start_times.arrival_time as start_time, end_times.arrival_time as end_time from stop_times, (SELECT trip_id,arrival_time from stop_times WHERE stop_times.arrival_time IS NOT NULL	$query = "Select distinct stop_times.trip_id, start_times.arrival_time as start_time, end_times.arrival_time as end_time from stop_times, (SELECT trip_id,arrival_time from stop_times WHERE stop_times.arrival_time IS NOT NULL
AND stop_sequence = '1') as start_times, (SELECT trip_id,max(arrival_time) as arrival_time from stop_times WHERE stop_times.arrival_time IS NOT NULL group by trip_id) as end_times	AND stop_sequence = '1') as start_times, (SELECT trip_id,max(arrival_time) as arrival_time from stop_times WHERE stop_times.arrival_time IS NOT NULL group by trip_id) as end_times
WHERE start_times.trip_id = end_times.trip_id AND stop_times.trip_id = end_times.trip_id AND :time > start_times.arrival_time AND :time < end_times.arrival_time";	WHERE start_times.trip_id = end_times.trip_id AND stop_times.trip_id = end_times.trip_id AND :time > start_times.arrival_time AND :time < end_times.arrival_time";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":time", $time);	$query->bindParam(":time", $time);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function viaPoints($tripID, $stop_sequence = "") {	function viaPoints($tripID, $stop_sequence = "") {
global $conn;	global $conn;
$query = "SELECT stops.stop_id, stop_name, arrival_time	$query = "SELECT stops.stop_id, stop_name, arrival_time
FROM stop_times join stops on stops.stop_id = stop_times.stop_id	FROM stop_times join stops on stops.stop_id = stop_times.stop_id
WHERE stop_times.trip_id = :tripID	WHERE stop_times.trip_id = :tripID
" . ($stop_sequence != "" ? " AND stop_sequence > :stop_sequence " : "") . " ORDER BY stop_sequence";	" . ($stop_sequence != "" ? " AND stop_sequence > :stop_sequence " : "") . " ORDER BY stop_sequence";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
if ($stop_sequence != "")	if ($stop_sequence != "")
$query->bindParam(":stop_sequence", $stop_sequence);	$query->bindParam(":stop_sequence", $stop_sequence);
$query->bindParam(":tripID", $tripID);	$query->bindParam(":tripID", $tripID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}


?>

file:a/labs/busstopdensity.tile.php -> file:b/labs/busstopdensity.tile.php

<?php	<?php
include ('../include/common.inc.php');	include ('../include/common.inc.php');
$debugOkay = Array();	$debugOkay = Array(); // disable debugging output even on dev server

/*	/*
*DISCLAIMER	*DISCLAIMER
* http://blog.gmapify.fr/create-beautiful-tiled-heat-maps-with-php-and-gd	* http://blog.gmapify.fr/create-beautiful-tiled-heat-maps-with-php-and-gd
THIS SOFTWARE IS PROVIDED BY THE AUTHOR 'AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	THIS SOFTWARE IS PROVIDED BY THE AUTHOR 'AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*	*
* @author: Olivier G. <olbibigo_AT_gmail_DOT_com>	* @author: Olivier G. <olbibigo_AT_gmail_DOT_com>
* @version: 1.0	* @version: 1.0
* @history:	* @history:
* 1.0 creation	* 1.0 creation
*/	*/
set_time_limit(120);//2mn	set_time_limit(120);//2mn
ini_set('memory_limit', '256M');	ini_set('memory_limit', '256M');
error_reporting(E_ALL ^ E_DEPRECATED);	error_reporting(E_ALL ^ E_DEPRECATED);
require_once ($labsPath . 'lib/GoogleMapUtility.php');	require_once ($labsPath . 'lib/GoogleMapUtility.php');
require_once ($labsPath . 'lib/HeatMap.php');	require_once ($labsPath . 'lib/HeatMap.php');

//Root folder to store generated tiles	//Root folder to store generated tiles
define('TILE_DIR', 'tiles/');	define('TILE_DIR', 'tiles/');
//Covered geographic areas	//Covered geographic areas
define('MIN_LAT', -35.48);	define('MIN_LAT', -35.48);
define('MAX_LAT', -35.15);	define('MAX_LAT', -35.15);
define('MIN_LNG', 148.98);	define('MIN_LNG', 148.98);
define('MAX_LNG', 149.25);	define('MAX_LNG', 149.25);
define('TILE_SIZE_FACTOR', 0.5);	define('TILE_SIZE_FACTOR', 0.5);
define('SPOT_RADIUS', 30);	define('SPOT_RADIUS', 30);
define('SPOT_DIMMING_LEVEL', 50);	define('SPOT_DIMMING_LEVEL', 50);

//Input parameters	//Input parameters
if(isset($_GET['x']))	if(isset($_GET['x']))
$X = (int)$_GET['x'];	$X = (int)$_GET['x'];
else	else
exit("x missing");	exit("x missing");
if(isset($_GET['y']))	if(isset($_GET['y']))
$Y = (int)$_GET['y'];	$Y = (int)$_GET['y'];
else	else
exit("y missing");	exit("y missing");
if(isset($_GET['zoom']))	if(isset($_GET['zoom']))
$zoom = (int)$_GET['zoom'];	$zoom = (int)$_GET['zoom'];
else	else
exit("zoom missing");	exit("zoom missing");
if ($zoom < 12) { //enforce minimum zoom	if ($zoom < 12) { //enforce minimum zoom
header('Content-type: image/png');	header('Content-type: image/png');
echo file_get_contents(TILE_DIR.'empty.png');	echo file_get_contents(TILE_DIR.'empty.png');
}	}
$dir = TILE_DIR.$zoom;	$dir = TILE_DIR.$zoom;
$tilename = $dir.'/'.$X.'_'.$Y.'.png';	$tilename = $dir.'/'.$X.'_'.$Y.'.png';
//HTTP headers (data type and caching rule)	//HTTP headers (data type and caching rule)
header("Cache-Control: must-revalidate");	header("Cache-Control: must-revalidate");
header("Expires: " . gmdate("D, d M Y H:i:s", time() + 86400) . " GMT");	header("Expires: " . gmdate("D, d M Y H:i:s", time() + 86400) . " GMT");
if(!file_exists($tilename)){	if(!file_exists($tilename)){
$rect = GoogleMapUtility::getTileRect($X, $Y, $zoom);	$rect = GoogleMapUtility::getTileRect($X, $Y, $zoom);
//A tile can contain part of a spot with center in an adjacent tile (overlaps).	//A tile can contain part of a spot with center in an adjacent tile (overlaps).
//Knowing the spot radius (in pixels) and zoom level, a smart way to process tiles would be to compute the box (in decimal degrees) containing only spots that can be drawn on current tile. We choose a simpler solution by increeasing geo bounds by 2*TILE_SIZE_FACTOR whatever the zoom level and spot radius.	//Knowing the spot radius (in pixels) and zoom level, a smart way to process tiles would be to compute the box (in decimal degrees) containing only spots that can be drawn on current tile. We choose a simpler solution by increeasing geo bounds by 2*TILE_SIZE_FACTOR whatever the zoom level and spot radius.
$extend_X = $rect->width * TILE_SIZE_FACTOR;//in decimal degrees	$extend_X = $rect->width * TILE_SIZE_FACTOR;//in decimal degrees
$extend_Y = $rect->height * TILE_SIZE_FACTOR;//in decimal degrees	$extend_Y = $rect->height * TILE_SIZE_FACTOR;//in decimal degrees
$swlat = $rect->y - $extend_Y;	$swlat = $rect->y - $extend_Y;
$swlng = $rect->x - $extend_X;	$swlng = $rect->x - $extend_X;
$nelat = $swlat + $rect->height + 2 * $extend_Y;	$nelat = $swlat + $rect->height + 2 * $extend_Y;
$nelng = $swlng + $rect->width + 2 * $extend_X;	$nelng = $swlng + $rect->width + 2 * $extend_X;

if( ($nelat <= MIN_LAT) \|\| ($swlat >= MAX_LAT) \|\| ($nelng <= MIN_LNG) \|\| ($swlng >= MAX_LNG)){	if( ($nelat <= MIN_LAT) \|\| ($swlat >= MAX_LAT) \|\| ($nelng <= MIN_LNG) \|\| ($swlng >= MAX_LNG)){
//No geodata so return generic empty tile	//No geodata so return generic empty tile
echo file_get_contents(TILE_DIR.'empty.png');	echo file_get_contents(TILE_DIR.'empty.png');
exit();	exit();
}	}

//Get McDonald's spots	//Get McDonald's spots
$spots = fGetPOI('Select * from stops where	$spots = fGetPOI('Select * from stops where
(stop_lon > '.$swlng.' AND stop_lon < '.$nelng.')	(stop_lon > '.$swlng.' AND stop_lon < '.$nelng.')
AND (stop_lat < '.$nelat.' AND stop_lat > '.$swlat.')', $im, $X, $Y, $zoom, SPOT_RADIUS);	AND (stop_lat < '.$nelat.' AND stop_lat > '.$swlat.')', $im, $X, $Y, $zoom, SPOT_RADIUS);


if(empty($spots)){	if(empty($spots)){
//No geodata so return generic empty tile	//No geodata so return generic empty tile
header('Content-type: image/png');	header('Content-type: image/png');
echo file_get_contents(TILE_DIR.'empty.png');	echo file_get_contents(TILE_DIR.'empty.png');
}else{	}else{
if(!file_exists($dir)){	if(!file_exists($dir)){
mkdir($dir, 0705);	mkdir($dir, 0705);
}	}
//All the magics is in HeatMap class :)	//All the magics is in HeatMap class :)
$im = HeatMap::createImage($spots, GoogleMapUtility::TILE_SIZE, GoogleMapUtility::TILE_SIZE, heatMap::$WITH_ALPHA, SPOT_RADIUS, SPOT_DIMMING_LEVEL, HeatMap::$GRADIENT_FIRE);	$im = HeatMap::createImage($spots, GoogleMapUtility::TILE_SIZE, GoogleMapUtility::TILE_SIZE, heatMap::$WITH_ALPHA, SPOT_RADIUS, SPOT_DIMMING_LEVEL, HeatMap::$GRADIENT_FIRE);
//Store tile for reuse and output it	//Store tile for reuse and output it
header('content-type:image/png;');	header('content-type:image/png;');
imagepng($im, $tilename);	imagepng($im, $tilename);
echo file_get_contents($tilename);	echo file_get_contents($tilename);
imagedestroy($im);	imagedestroy($im);
unset($im);	unset($im);
}	}
}else{	}else{
//Output stored tile	//Output stored tile
header('content-type:image/png;');	header('content-type:image/png;');
echo file_get_contents($tilename);	echo file_get_contents($tilename);
}	}
/////////////	/////////////
//Functions//	//Functions//
/////////////	/////////////
function fGetPOI($query, &$im, $X, $Y, $zoom, $offset){	function fGetPOI($query, &$im, $X, $Y, $zoom, $offset){
global $conn;	global $conn;
$nbPOIInsideTile = 0;	$nbPOIInsideTile = 0;

$spots = Array();	$spots = Array();
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
foreach( $query->fetchAll() as $row){	foreach( $query->fetchAll() as $row){
$point = GoogleMapUtility::getOffsetPixelCoords($row['stop_lat'], $row['stop_lon'], $zoom, $X, $Y);	$point = GoogleMapUtility::getOffsetPixelCoords($row['stop_lat'], $row['stop_lon'], $zoom, $X, $Y);
//Count result only in the tile	//Count result only in the tile
if( ($point->x > -$offset) && ($point->x < (GoogleMapUtility::TILE_SIZE+$offset)) && ($point->y > -$offset) && ($point->y < (GoogleMapUtility::TILE_SIZE+$offset))){	if( ($point->x > -$offset) && ($point->x < (GoogleMapUtility::TILE_SIZE+$offset)) && ($point->y > -$offset) && ($point->y < (GoogleMapUtility::TILE_SIZE+$offset))){
$spots[] = new HeatMapPoint($point->x, $point->y);	$spots[] = new HeatMapPoint($point->x, $point->y);
}	}

}//while	}//while
return $spots;	return $spots;
}//fAddPOI	}//fAddPOI
?>	?>

file:a/labs/stopBrowser.kml.php -> file:b/labs/stopBrowser.kml.php

file:a/trip.php -> file:b/trip.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.
*/	*/
include ('include/common.inc.php');	include ('include/common.inc.php');
$routetrips = Array();	$routetrips = Array();
if (isset($routeid) && !isset($tripid)) {	if (isset($routeid) && !isset($tripid)) {
$trip = getRouteNextTrip($routeid,$directionid);	$trip = getRouteNextTrip($routeid,$directionid);

if (!($trip)) {	if (!($trip)) {
$trip = getRouteFirstTrip($routeid,$directionid);	$trip = getRouteFirstTrip($routeid,$directionid);
}	}
$tripid = $trip['trip_id'];	$tripid = $trip['trip_id'];
} else {	} else {
$trip = getTrip($tripid);	$trip = getTrip($tripid);
$routeid = $trip['route_id'];	$routeid = $trip['route_id'];
}	}
$directionid = $trip['direction_id'];	$directionid = $trip['direction_id'];
$service_period = strtolower($trip["service_id"]);	$service_period = strtolower($trip["service_id"]);
$destination = getTripDestination($trip['trip_id']);	$destination = getTripDestination($trip['trip_id']);
include_header("Stops on " . $trip['route_short_name'] . ' ' . $destination['stop_name'], "trip");	include_header("Stops on " . $trip['route_short_name'] . ' ' . $destination['stop_name'], "trip");
trackEvent("Route/Trip View", "View Route", $trip['route_short_name'] . ' ' . $destination['stop_name'], $routeid);	trackEvent("Route/Trip View", "View Route", $trip['route_short_name'] . ' ' . $destination['stop_name'], $routeid);
echo '<span class="content-secondary">';	echo '<span class="content-secondary">';
echo '<a href="' . $trip['route_url'] . '">View Original Timetable/Map</a> ';	echo '<a href="' . $trip['route_url'] . '">View Original Timetable/Map</a> ';
echo '<a href="geo/trip.kml.php?tripid='.$tripid.'">View Trip in Google Earth</a> ';	echo '<a href="geo/trip.kml.php?tripid='.$tripid.'">View Trip in Google Earth</a> ';
echo '<a href="geo/route.kml.php?routeid='.$tripid.'">View Route in Google Earth</a>';	echo '<a href="geo/route.kml.php?routeid='.$routeid.'">View Route in Google Earth</a>';
echo '<h2>Via:</h2> <small>' . viaPointNames($tripid) . '</small>';	echo '<h2>Via:</h2> <small>' . viaPointNames($tripid) . '</small>';
echo '<h2>Other Trips:</h2> ';	echo '<h2>Other Trips:</h2> ';
$routeTrips = getRouteTrips($routeid, $trip['direction_id'], $service_period);	$routeTrips = getRouteTrips($routeid, $trip['direction_id'], $service_period);
foreach ($routeTrips as $key => $othertrip) {	foreach ($routeTrips as $key => $othertrip) {
// if ($othertrip['trip_id'] != $tripid) {	// if ($othertrip['trip_id'] != $tripid) {
echo '<a href="trip.php?tripid=' . $othertrip['trip_id'] . "&routeid=" . $routeid . '">' . str_replace(" ", ":00", str_replace(":00", " ", $othertrip['arrival_time'])) . '</a> ';	echo '<a href="trip.php?tripid=' . $othertrip['trip_id'] . "&routeid=" . $routeid . '">' . str_replace(" ", ":00", str_replace(":00", " ", $othertrip['arrival_time'])) . '</a> ';
// } else {	// } else {
// skip this trip but look forward/back	// skip this trip but look forward/back
if ($key - 1 > 0)	if ($key - 1 > 0)
$prevTrip = $routeTrips[$key - 1]['trip_id'];	$prevTrip = $routeTrips[$key - 1]['trip_id'];
if ($key + 1 < sizeof($routeTrips))	if ($key + 1 < sizeof($routeTrips))
$nextTrip = $routeTrips[$key + 1]['trip_id'];	$nextTrip = $routeTrips[$key + 1]['trip_id'];
// }	// }
}	}
flush();	flush();
@ob_flush();	@ob_flush();
echo '<h2>Other directions/timing periods:</h2> ';	echo '<h2>Other directions/timing periods:</h2> ';
$otherDir = 0;	$otherDir = 0;

foreach (getRouteHeadsigns($routeid) as $headsign) {	foreach (getRouteHeadsigns($routeid) as $headsign) {
if ($headsign['direction_id'] != $directionid \|\| strtolower($headsign['service_id']) != $service_period) {	if ($headsign['direction_id'] != $directionid \|\| strtolower($headsign['service_id']) != $service_period) {

echo '<a href="trip.php?routeid=' . $routeid . '&directionid=' . $headsign['direction_id'] . '&service_period=' . $headsign['service_id'] . '"> Starting at ' . $headsign['stop_name'] . ' (' . $headsign['service_id'] . ')</a> ';	echo '<a href="trip.php?routeid=' . $routeid . '&directionid=' . $headsign['direction_id'] . '&service_period=' . $headsign['service_id'] . '"> Starting at ' . $headsign['stop_name'] . ' (' . $headsign['service_id'] . ')</a> ';
$otherDir++;	$otherDir++;
}	}
}	}

if ($otherDir == 0) {	if ($otherDir == 0) {
echo "None";	echo "None";
}	}
echo '</span><span class="content-primary">';	echo '</span><span class="content-primary">';
flush();	flush();
@ob_flush();	@ob_flush();
echo "<div class='ui-header' style='overflow: visible; height: 1.5em'>";	echo "<div class='ui-header' style='overflow: visible; height: 1.5em'>";
if ($nextTrip)	if ($nextTrip)
echo '<a href="trip.php?tripid=' . $nextTrip . "&routeid=" . $routeid . '" data-icon="arrow-r" class="ui-btn-right">Next Trip</a>';	echo '<a href="trip.php?tripid=' . $nextTrip . "&routeid=" . $routeid . '" data-icon="arrow-r" class="ui-btn-right">Next Trip</a>';
if ($prevTrip)	if ($prevTrip)
echo '<a href="trip.php?tripid=' . $prevTrip . "&routeid=" . $routeid . '" data-icon="arrow-l" class="ui-btn-left">Previous Trip</a>';	echo '<a href="trip.php?tripid=' . $prevTrip . "&routeid=" . $routeid . '" data-icon="arrow-l" class="ui-btn-left">Previous Trip</a>';
echo "</div>";	echo "</div>";
echo ' <ul data-role="listview" data-inset="true">';	echo ' <ul data-role="listview" data-inset="true">';
$stopsGrouped = Array();	$stopsGrouped = Array();
$tripStopTimes = getTripStopTimes($tripid);	$tripStopTimes = getTripStopTimes($tripid);
echo '<li data-role="list-divider">' . $tripStopTimes[0]['arrival_time'] . ' to ' . $tripStopTimes[sizeof($tripStopTimes) - 1]['arrival_time'] . ' towards ' . $destination['stop_name'] . ' (' . ucwords(strtolower($tripStopTimes[0]['service_id'])) . ')</li>';	echo '<li data-role="list-divider">' . $tripStopTimes[0]['arrival_time'] . ' to ' . $tripStopTimes[sizeof($tripStopTimes) - 1]['arrival_time'] . ' towards ' . $destination['stop_name'] . ' (' . ucwords(strtolower($tripStopTimes[0]['service_id'])) . ')</li>';
foreach ($tripStopTimes as $key => $tripStopTime) {	foreach ($tripStopTimes as $key => $tripStopTime) {
if ($key + 1 > sizeof($tripStopTimes) \|\| stopCompare($tripStopTimes[$key]["stop_name"]) != stopCompare($tripStopTimes[$key + 1]["stop_name"])) {	if ($key + 1 > sizeof($tripStopTimes) \|\| stopCompare($tripStopTimes[$key]["stop_name"]) != stopCompare($tripStopTimes[$key + 1]["stop_name"])) {
echo '<li>';	echo '<li>';

if (sizeof($stopsGrouped) > 0) {	if (sizeof($stopsGrouped) > 0) {
// print and empty grouped stops	// print and empty grouped stops
// subsequent duplicates	// subsequent duplicates
$stopsGrouped["stop_ids"][] = $tripStopTime['stop_id'];	$stopsGrouped["stop_ids"][] = $tripStopTime['stop_id'];
$stopsGrouped["endTime"] = $tripStopTime['arrival_time'];	$stopsGrouped["endTime"] = $tripStopTime['arrival_time'];
echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">';	echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">';
echo '<p class="ui-li-aside">' . $stopsGrouped['startTime'] . ' to ' . $stopsGrouped['endTime'];	echo '<p class="ui-li-aside">' . $stopsGrouped['startTime'] . ' to ' . $stopsGrouped['endTime'];
if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {	if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
echo '<br>' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';	echo '<br>' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
}	}
echo '</p>';	echo '</p>';
echo stopGroupTitle($tripStopTime['stop_name'], $tripStopTime['stop_desc']) . '<br><small>' . sizeof($stopsGrouped["stop_ids"]) . ' stops</small>';	echo stopGroupTitle($tripStopTime['stop_name'], $tripStopTime['stop_desc']) . '<br><small>' . sizeof($stopsGrouped["stop_ids"]) . ' stops</small>';

echo '</a></li>';	echo '</a></li>';
flush();	flush();
@ob_flush();	@ob_flush();
$stopsGrouped = Array();	$stopsGrouped = Array();
} else {	} else {
// just a normal stop	// just a normal stop
echo '<a href="stop.php?stopid=' . $tripStopTime['stop_id'] . (startsWith($tripStopTime['stop_code'], "Wj") ? '&stopcode=' . $tripStopTime['stop_code'] : "") . '">';	echo '<a href="stop.php?stopid=' . $tripStopTime['stop_id'] . (startsWith($tripStopTime['stop_code'], "Wj") ? '&stopcode=' . $tripStopTime['stop_code'] : "") . '">';
echo '<p class="ui-li-aside">' . $tripStopTime['arrival_time'];	echo '<p class="ui-li-aside">' . $tripStopTime['arrival_time'];
if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {	if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
echo '<br>' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';	echo '<br>' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
}	}
echo '</p>';	echo '</p>';
echo $tripStopTime['stop_name'];	echo $tripStopTime['stop_name'];
echo '</a></li>';	echo '</a></li>';
flush();	flush();
@ob_flush();	@ob_flush();
}	}
} else {	} else {
// this is a duplicated line item	// this is a duplicated line item
if ($key - 1 <= 0 \|\| stopCompare($tripStopTimes[$key]['stop_name']) != stopCompare($tripStopTimes[$key - 1]['stop_name'])) {	if ($key - 1 <= 0 \|\| stopCompare($tripStopTimes[$key]['stop_name']) != stopCompare($tripStopTimes[$key - 1]['stop_name'])) {
// first duplicate	// first duplicate
$stopsGrouped = Array(	$stopsGrouped = Array(
"name" => trim(preg_replace("/\(Platform.*/", "", $stop['stop_name'])),	"name" => trim(preg_replace("/\(Platform.*/", "", $stop['stop_name'])),
"startTime" => $tripStopTime['arrival_time'],	"startTime" => $tripStopTime['arrival_time'],
"stop_ids" => Array(	"stop_ids" => Array(
$tripStopTime['stop_id']	$tripStopTime['stop_id']
)	)
);	);
} else {	} else {
// subsequent duplicates	// subsequent duplicates
$stopsGrouped["stop_ids"][] = $tripStopTime['stop_id'];	$stopsGrouped["stop_ids"][] = $tripStopTime['stop_id'];
$stopsGrouped["endTime"] = $tripStopTime['arrival_time'];	$stopsGrouped["endTime"] = $tripStopTime['arrival_time'];
}	}
}	}
}	}
echo '</ul>';	echo '</ul>';
echo '</span>';	echo '</span>';
include_footer();	include_footer();
?>	?>

<?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');
	header('Content-Disposition: attachment; filename="stops.kml"');
	$debugOkay = Array(); // disable debugging output even on dev server
//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://www.opengis.net/kml/2.2', '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 = baseURL() . 'stop.php?stopid=' . $stop['stop_id'] . " <br>";	$description = '<a href="'.curPageURL() . '/../stop.php?stopid=' . $stop['stop_id'] . '">View stop page</a><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.
*/	*/
$service_periods = Array(	$service_periods = Array(
'sunday',	'sunday',
'saturday',	'saturday',
'weekday'	'weekday'
);	);

function service_period($date = "") {	function service_period($date = "") {

if (isset($_REQUEST['service_period'])) {	if (isset($_REQUEST['service_period'])) {
return $_REQUEST['service_period'];	return $_REQUEST['service_period'];
}	}

$override = getServiceOverride($date);	$override = getServiceOverride($date);
if (isset($override['service_id'])) {	if (isset($override['service_id'])) {
return strtolower($override['service_id']);	return strtolower($override['service_id']);
}	}
$date = ($date != "" ? $date : time());	$date = ($date != "" ? $date : time());
$dow = date('w', $date);	$dow = date('w', $date);

switch ($dow) {	switch ($dow) {
case 0:	case 0:
return 'sunday';	return 'sunday';
case 6:	case 6: