gitphp 0.2.9.1 :: busui.git/commitdiff

Fix trip/route view now that routeids are back to route numbers

6 files changed: (show all)
include/common-request.inc.php
include/common-session.inc.php
include/db/route-dao.inc.php
index.php
routeList.php
trip.php

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/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) {	function getRouteDescription($routeID) {
$trip = getRouteNextTrip($routeID);	$trip = getRouteNextTrip($routeID);
$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 getRoutesByNumber($routeNumber = "", $directionID = "",$service_period = "") {
global $conn;
if ($routeNumber != "") {
$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 route_short_name = :routeNumber OR route_short_name LIKE :routeNumber2 order by route_short_name;";
} else {
$query = "SELECT DISTINCT route_short_name from routes order by route_short_name";
}
debug($query, "database");
$query = $conn->prepare($query);
if ($routeNumber != "") {
$query->bindParam(":routeNumber", $routeNumber);
$routeNumber2 = "% " . $routeNumber;
$query->bindParam(":routeNumber2", $routeNumber2);
}
$query->execute();
if (!$query) {
databaseError($conn->errorInfo());
return Array();
}
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) {	function getRouteNextTrip($routeID, $directionID) {
global $conn;	global $conn;

$query = "select routes.route_id,direction_id,trips.trip_id,departure_time from routes join trips on trips.route_id = routes.route_id	$query = "select routes.route_id,direction_id,trips.trip_id,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 > :currentTime and routes.route_id = :routeID order by	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
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());
	$query->bindParam(":futureTime", current_time(strtotime(current_time() ." +2h")));
$query->bindParam(":routeID", $routeID);	$query->bindParam(":routeID", $routeID);
	$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;
// past last trip of the day special case	}
if (sizeof($r) < 16) {
$query = "select * from routes join trips on trips.route_id = routes.route_id	function getRouteFirstTrip($routeID,$directionID) {
join stop_times on stop_times.trip_id = trips.trip_id where routes.route_id = :routeID order by	global $conn;

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

<?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.
*/	*/
if (isset($_REQUEST['firstLetter'])) {	if (isset($_REQUEST['firstLetter'])) {
$firstLetter = filter_var($_REQUEST['firstLetter'], FILTER_SANITIZE_STRING);	$firstLetter = filter_var($_REQUEST['firstLetter'], FILTER_SANITIZE_STRING);
}	}
if (isset($_REQUEST['bysuburbs'])) {	if (isset($_REQUEST['bysuburbs'])) {
$bysuburbs = true;	$bysuburbs = true;
}	}
if (isset($_REQUEST['bynumber'])) {	if (isset($_REQUEST['bynumber'])) {
$bynumber = true;	$bynumber = true;
}	}
if (isset($_REQUEST['allstops'])) {	if (isset($_REQUEST['allstops'])) {
$allstops = true;	$allstops = true;
}	}
if (isset($_REQUEST['nearby'])) {	if (isset($_REQUEST['nearby'])) {
$nearby = true;	$nearby = true;
}	}
if (isset($_REQUEST['suburb'])) {	if (isset($_REQUEST['suburb'])) {
$suburb = $_REQUEST['suburb'];	$suburb = $_REQUEST['suburb'];
}	}
if (isset($_REQUEST['pageKey'])) {	if (isset($_REQUEST['pageKey'])) {
$pageKey = filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT);	$pageKey = filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT);
}	}
if (isset($_REQUEST['lat'])) {	if (isset($_REQUEST['lat'])) {
$lat = filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);	$lat = filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);

<?php	<?php

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

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

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

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