diff --git a/ajax.php b/ajax.php
index 0540de8cbfc56b689a6eb20a1b082c21ed19e52d..88ac5805c0ebd23bfb098c4cf7406ee7baba8901 100644
--- a/ajax.php
+++ b/ajax.php
@@ -8,7 +8,7 @@ require_once('functions.php');
if (!isset($_GET['command'])) die();
-$agency = "rutgers";
+$agency = $cfg['agency']['shortname'];
if ($_GET['command'] == "vehicleLocations") {
// return a JSON array of vehicles and their locations.
@@ -16,7 +16,7 @@ if ($_GET['command'] == "vehicleLocations") {
$db = dbc();
// MAX age of a bus location to return
- $maxAge = 120;
+ $maxAge = $cfg['agency']['staleBusTime'];
$time = 0;
if (isset($_GET['t'])) $time = $db->real_escape_string((int)$_GET['t']);
@@ -27,6 +27,7 @@ if ($_GET['command'] == "vehicleLocations") {
FROM `vehicleLocations`
LEFT JOIN `routes` ON `vehicleLocations`.`routeTag` = `routes`.`tag`
WHERE `time` > '{$time}'
+ AND `vehicleLocations`.`agency` = '{$agency}'
V_LOC;
$result = dbq($db, $sql);
@@ -39,6 +40,7 @@ V_LOC;
`predictions`.`vehicle`, `stops`.`title`, `predictions`.`epochTime`
FROM `predictions`
LEFT JOIN `stops` ON `predictions`.`stopTag` = `stops`.`tag`
+ WHERE `predictions`.`agency` = '{$agency}'
ORDER BY `epochTime` ASC
V_LOC;
$result = dbq($db, $sql);
@@ -69,12 +71,12 @@ V_LOC;
$db = dbc();
- $sql = "SELECT `tag`, `title` FROM `routes`";
+ $sql = "SELECT `tag`, `title` FROM `routes` WHERE `agency` = '{$agency}' AND `tag` NOT IN ('".implode($cfg['agency']['hideRoutes'], "','")."')";
$result = dbq($db, $sql);
$routes = array();
while($row = $result->fetch_assoc()) $routes[$row['tag']] = $row;
- $sql = "SELECT `tag`, `title`, `lat`, `lon`, `stopId` FROM `stops`";
+ $sql = "SELECT `tag`, `title`, `lat`, `lon`, `stopId` FROM `stops` WHERE `agency` = '{$agency}'";
$result = dbq($db, $sql);
$stops = array();
while($row = $result->fetch_assoc()) {
@@ -82,11 +84,11 @@ V_LOC;
$stops[$row['tag']]['routes'] = array();
}
- $sql = "SELECT `route`, `stop` FROM `route_stops`";
+ $sql = "SELECT `route`, `stop` FROM `route_stops` WHERE `agency` = '{$agency}' AND `route` NOT IN ('".implode($cfg['agency']['hideRoutes'], "','")."')";
$result = dbq($db, $sql);
while($row = $result->fetch_assoc()) $stops[$row['stop']]['routes'][$row['route']] = array();
- $sql = "SELECT `routes`.`tag`, `routes`.`title`, `stopTag`, `epochTime`, `vehicle` FROM `predictions` LEFT JOIN `routes` ON `predictions`.`routeTag` = `routes`.`tag` WHERE `routes`.`agency` = '{$agency}'";
+ $sql = "SELECT `routes`.`tag`, `routes`.`title`, `stopTag`, `epochTime`, `vehicle` FROM `predictions` LEFT JOIN `routes` ON `predictions`.`routeTag` = `routes`.`tag` WHERE `routes`.`agency` = '{$agency}' AND `tag` NOT IN ('".implode($cfg['agency']['hideRoutes'], "','")."')";
$result = dbq($db, $sql);
while($row = $result->fetch_assoc()) $stops[$row['stopTag']]['routes'][$row['tag']][] = array("epochTime" => $row['epochTime'], "vehicle" => $row['vehicle']);
diff --git a/cron/getRouteConfig.php b/cron/getRouteConfig.php
index ab4426e62e6fd43ec00a4382739efa6398112201..fb2d83792cd57e7bc53f978793dc313e0a710cb1 100644
--- a/cron/getRouteConfig.php
+++ b/cron/getRouteConfig.php
@@ -1,7 +1,7 @@
<?php
/*
- Pull down NextBus data
- API Doc: http://www.nextbus.com/xmlFeedDocs/NextBusXMLFeed.pdf
+ Pull down NextBus data
+ API Doc: http://www.nextbus.com/xmlFeedDocs/NextBusXMLFeed.pdf
*/
$agency = "rutgers";
@@ -23,54 +23,54 @@ if (!isset($getRouteConfig_waitSeconds)) $getRouteConfig_waitSeconds = 1;
$lastFetched = 0;
$result = dbq($db, "SELECT `time` FROM `lastChecked` WHERE `selector` = 'routeConfig' LIMIT 1");
if ($result->num_rows == 1) {
- $arr = $result->fetch_array();
- $lastFetched = $arr[0];
+ $arr = $result->fetch_array();
+ $lastFetched = $arr[0];
}
// ask for new data, if needed
if ($lastFetched + $getRouteConfig_waitSeconds < time()) {
- if (@$source = file_get_contents($url)) {
- if ($thisXML = simplexml_load_string($source)) {
-
- dbq($db, "LOCK TABLES `routes` WRITE, `stops` WRITE, `route_stops` WRITE, `lastChecked` WRITE");
-
- dbq($db, "DELETE FROM `routes` WHERE `agency` = '{$agency}'");
- dbq($db, "DELETE FROM `stops` WHERE `agency` = '{$agency}'");
- dbq($db, "DELETE FROM `route_stops` WHERE `agency` = '{$agency}'");
-
- foreach ($thisXML->route as $route) {
- foreach ($route as $key => $val) $route[$key] = $db->real_escape_string($val);
- $q = "INSERT INTO `routes` ";
- $q .= "(`agency`, `tag`,`title`) ";
- $q .= "VALUES ('{$agency}','{$route['tag']}','{$route['title']}')";
- $q .= "ON DUPLICATE KEY UPDATE `tag`='{$route['tag']}', `title`='{$route['title']}'";
- dbq($db, $q);
- foreach ($route->stop as $stop) {
- foreach ($stop as $key => $val) $stop[$key] = $db->real_escape_string($val);
-
- $q = "INSERT INTO `stops` ";
- $q .= "(`agency`, `tag`,`title`,`lat`,`lon`,`stopId`) ";
- $q .= "VALUES ('{$agency}','{$stop['tag']}','{$stop['title']}','{$stop['lat']}','{$stop['lon']}','{$stop['stopId']}')";
- $q .= "ON DUPLICATE KEY UPDATE `title`='{$stop['title']}', `lat`='{$stop['lat']}', `lon`='{$stop['lon']}', `stopId`='{$stop['stopId']}'";
- dbq($db, $q);
-
- $q = "INSERT INTO `route_stops` ";
- $q .= "(`agency`, `route`, `stop`) ";
- $q .= "VALUES ('{$agency}','{$route['tag']}', '{$stop['tag']}')";
- $q .= "ON DUPLICATE KEY UPDATE `stop` = '{$stop['tag']}'";
- dbq($db, $q);
- }
- }
-
- dbq($db, "UNLOCK TABLES;");
-
- // update lastChecked.
- $tSec = time();
- dbq($db, "INSERT INTO `lastChecked` (`selector`, `time`) VALUES ('routeConfig', '" . $tSec . "') ON DUPLICATE KEY UPDATE `time` = VALUES(`time`)");
-
- } else $warning = "Could not parse NextBus data as XML";
- } else $warning = "Could not fetch NextBus data";
+ if (@$source = file_get_contents($url)) {
+ if ($thisXML = simplexml_load_string($source)) {
+
+ dbq($db, "LOCK TABLES `routes` WRITE, `stops` WRITE, `route_stops` WRITE, `lastChecked` WRITE");
+
+ dbq($db, "DELETE FROM `routes` WHERE `agency` = '{$agency}'");
+ dbq($db, "DELETE FROM `stops` WHERE `agency` = '{$agency}'");
+ dbq($db, "DELETE FROM `route_stops` WHERE `agency` = '{$agency}'");
+
+ foreach ($thisXML->route as $route) {
+ foreach ($route as $key => $val) $route[$key] = $db->real_escape_string($val);
+ $q = "INSERT INTO `routes` ";
+ $q .= "(`agency`, `tag`,`title`) ";
+ $q .= "VALUES ('{$agency}','{$route['tag']}','{$route['title']}')";
+ $q .= "ON DUPLICATE KEY UPDATE `tag`='{$route['tag']}', `title`='{$route['title']}'";
+ dbq($db, $q);
+ foreach ($route->stop as $stop) {
+ foreach ($stop as $key => $val) $stop[$key] = $db->real_escape_string($val);
+
+ $q = "INSERT INTO `stops` ";
+ $q .= "(`agency`, `tag`,`title`,`lat`,`lon`,`stopId`) ";
+ $q .= "VALUES ('{$agency}','{$stop['tag']}','{$stop['title']}','{$stop['lat']}','{$stop['lon']}','{$stop['stopId']}')";
+ $q .= "ON DUPLICATE KEY UPDATE `title`='{$stop['title']}', `lat`='{$stop['lat']}', `lon`='{$stop['lon']}', `stopId`='{$stop['stopId']}'";
+ dbq($db, $q);
+
+ $q = "INSERT INTO `route_stops` ";
+ $q .= "(`agency`, `route`, `stop`) ";
+ $q .= "VALUES ('{$agency}','{$route['tag']}', '{$stop['tag']}')";
+ $q .= "ON DUPLICATE KEY UPDATE `stop` = '{$stop['tag']}'";
+ dbq($db, $q);
+ }
+ }
+
+ dbq($db, "UNLOCK TABLES;");
+
+ // update lastChecked.
+ $tSec = time();
+ dbq($db, "INSERT INTO `lastChecked` (`selector`, `time`) VALUES ('routeConfig', '" . $tSec . "') ON DUPLICATE KEY UPDATE `time` = VALUES(`time`)");
+
+ } else $warning = "Could not parse NextBus data as XML";
+ } else $warning = "Could not fetch NextBus data";
}
$db->close();
-?>
\ No newline at end of file
+?>
diff --git a/index.php b/index.php
index 742f4a8b9c5b6d1938b2e7188306044f790fd678..98e33b9fb2cf07731e3510445f1db8e8a7498eb1 100644
--- a/index.php
+++ b/index.php
@@ -17,7 +17,7 @@ require_once('config.php');
<link href="css/embed.css" rel="stylesheet" />
<?php endif; ?>
<script>
- window.agency = <?php echo json_encode($cfg['agency']['name']); ?>;
+ window.agency = <?php echo json_encode($cfg['agency']['shortname']); ?>;
window.busIconUrl = <?php echo json_encode($cfg['agency']['busIconUrl'], JSON_UNESCAPED_SLASHES); ?>;
</script>
<script src="js/fastclick.js"></script>
diff --git a/js/script.js b/js/script.js
index 512112003b7b19544f196afaafdf579810d21981..d1e9e8714ac4059a17b144de1208bc19ccc69ea4 100644
--- a/js/script.js
+++ b/js/script.js
@@ -185,7 +185,7 @@ function getVehicles(agency, gv_callback) {
});
}
-function updateMapBusStops(routesIn,stops,maxPredictions) {
+function updateMapBusStops(routesIn,stops) {
if (window.map != undefined && stops != undefined) {
for (i in stops) {
if (stops[i]['lat'] != undefined && stops[i]['lon'] != undefined) {