gitphp 0.2.9.1 :: busui.git/commitdiff

Improve myway timeliness based on new GTFS feed accuracy

5 files changed: (show all)
include/common-transit.inc.php
include/db/stop-dao.inc.php
myway/myway_timeliness_calculate.php
myway/myway_timeliness_route.json.php
myway/myway_timeliness_stop.php

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

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 = "") {	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 = "";
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,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,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)	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)	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 != "")
	$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/myway/myway_timeliness_calculate.php -> file:b/myway/myway_timeliness_calculate.php

file:a/myway/myway_timeliness_route.json.php -> file:b/myway/myway_timeliness_route.json.php

file:a/myway/myway_timeliness_stop.php -> file:b/myway/myway_timeliness_stop.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');
include_header("MyWay Deltas", "mywayDelta");	include_header("MyWay Deltas", "mywayDelta");
?>	?>

<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../js/flot/excanvas.min.js"></script><![endif]-->	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../js/flot/excanvas.min.js"></script><![endif]-->

<script language="javascript" type="text/javascript" src="../js/flot/jquery.flot.js"></script>	<script language="javascript" type="text/javascript" src="../js/flot/jquery.flot.js"></script>
<form method="get" action="">	<form method="get" action="">
<select id="stopid" name="stopid">	<select id="stopid" name="stopid">
<?php	<?php
$query = "select distinct myway_stop from myway_timingdeltas where myway_stop != '' order by myway_stop";	$query = "select distinct myway_stop from myway_timingdeltas where myway_stop != '' order by myway_stop";
$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 $stop) {	foreach ($query->fetchAll() as $stop) {
echo "<option value=\"{$stop['myway_stop']}\">{$stop['myway_stop']}</option>";	echo "<option value=\"{$stop['myway_stop']}\">{$stop['myway_stop']}</option>";
};	};
?> </select> <center><div id="placeholder" style="width:900px;height:550px"></div></center>	?> </select> <center><div id="placeholder" style="width:900px;height:550px"></div></center>
<script type="text/javascript">	<script type="text/javascript">
$(function () {	$(function () {
var d = new Date();	var d = new Date();
d.setUTCMinutes(0);	d.setUTCMinutes(0);
d.setUTCHours(0);	d.setUTCHours(0);
var midnight = d.getTime();	var midnight = d.getTime();

var placeholder = $("#placeholder");	var placeholder = $("#placeholder");
var data = [];	var data = [];
var options = {	var options = {
xaxis: {	xaxis: {
mode: "time",	mode: "time"
min: midnight + (10006060*8),
max: midnight + (10006060*23.5)
},	},
yaxis: {	yaxis: {
tickFormatter: yformatter	tickFormatter: yformatter
},	},
grid: { hoverable: true, clickable: true, labelMargin: 32 },	grid: { hoverable: true, clickable: true, labelMargin: 32 },
series: {	series: {
lines: { show: false },	lines: { show: false },
points: { show: true }	points: { show: true }
}	}
};	};

var plot = $.plot(placeholder, data, options);	var plot = $.plot(placeholder, data, options);
var o;	var o;
o = plot.pointOffset({ x: midnight+ (96060*1000), y: -1.2});	o = plot.pointOffset({ x: midnight+ (96060*1000), y: -1.2});
placeholder.append('<div style="position:absolute;left:' + (o.left + 4) + 'px;top:' + o.top + 'px;color:#666;font-size:smaller">9am</div>');	placeholder.append('<div style="position:absolute;left:' + (o.left + 4) + 'px;top:' + o.top + 'px;color:#666;font-size:smaller">9am</div>');
o = plot.pointOffset({ x: midnight+ (166060*1000), y: -1.2});	o = plot.pointOffset({ x: midnight+ (166060*1000), y: -1.2});
placeholder.append('<div style="position:absolute;left:' + (o.left + 4) + 'px;top:' + o.top + 'px;color:#666;font-size:smaller">4pm</div>');	placeholder.append('<div style="position:absolute;left:' + (o.left + 4) + 'px;top:' + o.top + 'px;color:#666;font-size:smaller">4pm</div>');
// fetch one series, adding to what we got	// fetch one series, adding to what we got
var alreadyFetched = {};	var alreadyFetched = {};

$("#stopid").change(function () {	$("#stopid").change(function () {
var select = $(this);	var select = $(this);

// find the URL in the link right next to us	// find the URL in the link right next to us
// var dataurl = button.siblings('a').attr('href');	// var dataurl = button.siblings('a').attr('href');
var dataurl = "myway_timeliness_stop.json.php?stopid=" + select.val();	var dataurl = "myway_timeliness_stop.json.php?stopid=" + select.val();
// then fetch the data with jQuery	// then fetch the data with jQuery
function onDataReceived(series) {	function onDataReceived(series) {
// extract the first coordinate pair so you can see that	// extract the first coordinate pair so you can see that
// data is now an ordinary Javascript object	// data is now an ordinary Javascript object
var firstcoordinate = '(' + series.data[0][0] + ', ' + series.data[0][1] + ')';	var firstcoordinate = '(' + series.data[0][0] + ', ' + series.data[0][1] + ')';


// let's add it to our current data	// let's add it to our current data
if (!alreadyFetched[series.label]) {	if (!alreadyFetched[series.label]) {
alreadyFetched[series.label] = true;	alreadyFetched[series.label] = true;
data.push(series);	data.push(series);
}	}

// and plot all we got	// and plot all we got
$.plot(placeholder, data, options);	$.plot(placeholder, data, options);
}	}

$.ajax({	$.ajax({
url: dataurl,	url: dataurl,
method: 'GET',	method: 'GET',
dataType: 'json',	dataType: 'json',
success: onDataReceived	success: onDataReceived
});	});
});	});

});	});
function yformatter(v) {	function yformatter(v) {
if (Math.floor(v/60) < -9) return "";	if (Math.floor(v/60) < -9) return "";
return Math.abs(Math.floor(v/60)) + " min " + (v == 0 ? "" : (v >0 ? "early":"late"))	return Math.abs(Math.floor(v/60)) + " min " + (v == 0 ? "" : (v >0 ? "early":"late"))
}	}
function showTooltip(x, y, contents) {	function showTooltip(x, y, contents) {
$('<div id="tooltip">' + contents + '</div>').css( {	$('<div id="tooltip">' + contents + '</div>').css( {
position: 'absolute',	position: 'absolute',
display: 'none',	display: 'none',
top: y + 5,	top: y + 5,
left: x + 5,	left: x + 5,
border: '1px solid #fdd',	border: '1px solid #fdd',
padding: '2px',	padding: '2px',
'background-color': '#fee',	'background-color': '#fee',
opacity: 0.80	opacity: 0.80
}).appendTo("body").fadeIn(200);	}).appendTo("body").fadeIn(200);
}	}

var previousPoint = null;	var previousPoint = null;
$("#placeholder").bind("plothover", function (event, pos, item) {	$("#placeholder").bind("plothover", function (event, pos, item) {
$("#x").text(pos.x.toFixed(2));	$("#x").text(pos.x.toFixed(2));
$("#y").text(pos.y.toFixed(2));	$("#y").text(pos.y.toFixed(2));

if (item) {	if (item) {
if (previousPoint != item.dataIndex) {	if (previousPoint != item.dataIndex) {
previousPoint = item.dataIndex;	previousPoint = item.dataIndex;

$("#tooltip").remove();	$("#tooltip").remove();
var x = item.datapoint[0].toFixed(2),	var x = item.datapoint[0].toFixed(2),
y = item.datapoint[1].toFixed(2);	y = item.datapoint[1].toFixed(2);

var d = new Date();	var d = new Date();
d.setTime(x);	d.setTime(x);
var time = d.getUTCHours() +':'+ (d.getUTCMinutes().toString().length == 1 ? '0'+ d.getMinutes(): d.getUTCMinutes())	var time = d.getUTCHours() +':'+ (d.getUTCMinutes().toString().length == 1 ? '0'+ d.getMinutes(): d.getUTCMinutes())


showTooltip(item.pageX, item.pageY,	showTooltip(item.pageX, item.pageY,
item.series.label + " at "+ time +" = " + Math.abs(new Number(y/60).toFixed(2))+" minutes "+(y >0 ? "early":"late"));	item.series.label + " at "+ time +" = " + Math.abs(new Number(y/60).toFixed(2))+" minutes "+(y >0 ? "early":"late"));
}	}
}	}
else {	else {
$("#tooltip").remove();	$("#tooltip").remove();
previousPoint = null;	previousPoint = null;
}	}
});	});

</script>	</script>

<?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($_SESSION['service_period']))	if (isset($_SESSION['service_period']))
return $_SESSION['service_period'];	return $_SESSION['service_period'];
$override = getServiceOverride($date);	$override = getServiceOverride($date);
if ($override['service_id']) {	if ($override['service_id']) {
return $override['service_id'];	$idParts = explode("-",$override['service_id']);
	return strtolower($idParts[2]);
}	}

switch (date('w', ($date != "" ? $date : time()))) {	switch (date('w', ($date != "" ? $date : time()))) {
case 0:	case 0:
return 'sunday';	return 'sunday';
case 6:	case 6:
return 'saturday';	return 'saturday';
default:	default:
return 'weekday';	return 'weekday';

<?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');
include_header("MyWay Delta Calculate", "mywayDeltaCalc");	include_header("MyWay Delta Calculate", "mywayDeltaCalc");
flush();	flush();
ob_flush();	ob_flush();

function abssort($a, $b) {	function abssort($a, $b) {
if ($a['timeDiff'] == $b['timeDiff']) {	if ($a['timeDiff'] == $b['timeDiff']) {
return 0;	return 0;
}	}
return (abs($a['timeDiff']) < abs($b['timeDiff'])) ? -1 : 1;	return (abs($a['timeDiff']) < abs($b['timeDiff'])) ? -1 : 1;
}	}

//collect all observation not in delta	//collect all observation not in delta
$query = "select * from myway_observations INNER JOIN myway_stops	$query = "select * from myway_observations INNER JOIN myway_stops
ON myway_observations.myway_stop=myway_stops.myway_stop	ON myway_observations.myway_stop=myway_stops.myway_stop INNER JOIN myway_routes
	ON myway_observations.myway_route=myway_routes.myway_route
WHERE observation_id NOT IN	WHERE observation_id NOT IN
(	(
SELECT observation_id	SELECT observation_id
FROM myway_timingdeltas	FROM myway_timingdeltas
)";	)";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);