Fix minor code standards issues
--- a/include/common-template.inc.php
+++ b/include/common-template.inc.php
@@ -184,20 +184,20 @@
}
$serviceAlerts = Array();
$globalAlerts = getServiceAlertsAsArray("agency", "0");
- if ($globalAlerts != nullarray) {
+ if ($globalAlerts != null) {
// echo "getting alerts due to network wide";
$serviceAlerts = array_merge($serviceAlerts, $globalAlerts);
}
if (isset($stopid)) {
$stopAlerts = getServiceAlertsAsArray("stop", $stopid);
- if ($stopAlerts != nullarray) {
+ if ($stopAlerts != null) {
// echo "getting alerts due to stop $stopid";
$serviceAlerts = array_merge($serviceAlerts, $stopAlerts);
}
}
if (isset($routeid)) {
$routeAlerts = getServiceAlertsAsArray("route", $routeid);
- if ($routeAlerts != nullarray) {
+ if ($routeAlerts != null) {
// echo "getting alerts due to route $routeid";
$serviceAlerts = array_merge($serviceAlerts, $routeAlerts);
}
@@ -229,7 +229,7 @@
s.parentNode.insertBefore(ga, s);
})();</script>";
$googleAnalyticsImageUrl = googleAnalyticsGetImageUrl();
- echo '<noscript><img src="' . $googleAnalyticsImageUrl . '" /></noscript>';
+ echo '<noscript><img src="' . $googleAnalyticsImageUrl . '" alt=""/></noscript>';
}
echo "\n</div></div></body></html>";
}
--- a/include/common-transit.inc.php
+++ b/include/common-transit.inc.php
@@ -172,7 +172,8 @@
if (sizeof($informedEntities) > 0) {
$affectsFilteredEntities = true;
- $informed_count++;
+ foreach ($informedEntities as $informedEntity) {
+ $informed_count++;
$informed = Array();
$es = new transit_realtime\EntitySelector();
if ($informedEntity['informed_class'] == "agency") {
@@ -190,6 +191,7 @@
$es->setTrip($td);
}
$alert->addInformedEntity($es);
+}
}
if ($current_alert['cause'] != "") {
$alert->setCause(constant("transit_realtime\Alert\Cause::" . $current_alert['cause']));
@@ -216,7 +218,7 @@
if ($current_alert['description'] != "") {
$tsDescriptionText = new transit_realtime\TranslatedString();
$tDescriptionText = new transit_realtime\TranslatedString\Translation();
- $tDescriptionText->setText($current_alert['description']);
+ $tDescriptionText->setText(trim($current_alert['description']));
$tDescriptionText->setLanguage("en");
$tsDescriptionText->addTranslation($tDescriptionText);
$alert->setDescriptionText($tsDescriptionText);
@@ -243,7 +245,7 @@
return $codec->encode($alerts);
} else {
- return nullarray;
+ return null;
}
}
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -51,8 +51,9 @@
|| strstr($_SERVER['PHP_SELF'], "lib/")
|| strstr($_SERVER['PHP_SELF'], "geo/")
|| strstr($_SERVER['PHP_SELF'], "include/")
- || strstr($_SERVER['PHP_SELF'], "servicealerts/"))
+ || strstr($_SERVER['PHP_SELF'], "rtpis/")) {
$basePath = "../";
+}
function isDebugServer() {
--- a/include/db/route-dao.inc.php
+++ b/include/db/route-dao.inc.php
@@ -59,7 +59,12 @@
databaseError($conn->errorInfo());
return Array();
}
- return $query->fetchAll();
+ $results = $query->fetchAll();
+ if (is_array($results)) {
+ return $results;
+ } else {
+ return Array($results);
+ }
}
function getRouteDescription($routeID, $directionID) {
$trip = getRouteNextTrip($routeID, $directionID);
@@ -120,7 +125,7 @@
function getRouteNextTrip($routeID, $directionID) {
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,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 arrival_time between :currentTime and :futureTime
and routes.route_id = :routeID and trips.direction_id = :directionID order by
arrival_time limit 1";
--- a/routeList.php
+++ b/routeList.php
@@ -50,17 +50,17 @@
echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';
foreach ($routes as $route) {
$time = getRouteAtStop($route['route_id'], $route['direction_id'], $route['stop_id']);
- $start = getTripStartingPoint($time['trip_id']);
- $end = getTripDestination($time['trip_id']);
+ $start = getTripStartingPoint($time['trip_id']);
+ $end = getTripDestination($time['trip_id']);
//print_r($route);
echo '<li> <a href="trip.php?routeid=' . $route['route_id'] . '&directionid=' . $route['direction_id'] . '"><h3>' . $route['route_short_name'] . "</h3>
- <p>" . $time['trip_headsign'] . (strstr($time['trip_headsign'], "bound") === false ? "bound" : "") . " from ".$start['stop_name']." to ".$end['stop_name'] . " (" . ucwords($time['service_id']) . ")</p>";
+ <p>" . $time['trip_headsign'] . (strstr($time['trip_headsign'], "bound") === false ? "bound" : "") . " from " . $start['stop_name'] . " to " . $end['stop_name'] . " (" . ucwords($time['service_id']) . ")</p>";
$stop = getStop($route['stop_id']);
-echo "<p>Board at ".$stop['stop_name']."</p>";
+ echo "<p>Board at " . $stop['stop_name'] . "</p>";
echo '<span class="ui-li-count">' . ($time['arrival_time'] ? $time['arrival_time'] : "No more trips today") . "<br>" . floor($route['distance']) . 'm away</span>';
-
- echo" </a></li>\n";
+
+ echo" </a></li>\n";
}
}
@@ -92,7 +92,8 @@
} else if (isset($nearby)) {
$routes = Array();
include_header("Routes Nearby", "routeList", true, true);
- if (isset($_SESSION['lat'])) trackEvent("Route Lists", "Routes Nearby", $_SESSION['lat'] . "," . $_SESSION['lon']);
+ if (isset($_SESSION['lat']))
+ trackEvent("Route Lists", "Routes Nearby", $_SESSION['lat'] . "," . $_SESSION['lon']);
navbar();
placeSettings();
if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") {
@@ -132,7 +133,7 @@
$seriesRange[$seriesNum]['max'] = $routeNumber;
$seriesRange[$seriesNum]['min'] = $routeNumber;
}
- $routeSeries[$seriesNum][$seriesNum . "-" . $row[1] . "-" . $row[0]] = $row;
+ $routeSeries[$seriesNum][] = null;
}
}
ksort($routeSeries);
@@ -157,7 +158,8 @@
displayRoutes(getRoutesByDestination($routeDestination));
} else {
foreach (getRoutesByDestination() as $destination) {
- echo '<li><a href="' . curPageURL() . '/routeList.php?routeDestination=' . urlencode($destination['stop_name']) . '">' . $destination['stop_name'] . "... </a></li>\n";
+ echo '<li><a href="' . curPageURL() . '/routeList.php?routeDestination='
+ . urlencode($destination['stop_name']) . '">' . $destination['stop_name'] . "... </a></li>\n";
}
}
}
--- a/rtpis/gtfs-realtime.php
+++ b/rtpis/gtfs-realtime.php
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-include ('include/common.inc.php');
+include ('../include/common.inc.php');
function accept_header($header = false) {
// http://jrgns.net/parse_http_accept_header
$toret = null;
@@ -36,9 +36,23 @@
}
return $toret;
}
+function usage() {
+echo "Usage notes: Must specify format json/protobuf and gtfs-realtime feedtype alerts/updates. If callback is specified, will provide jsonp. Can filter with parmaters filter_class route/stop and filter_id with the id specified in GTFS.";
+die();
+}
+
+$filter_class = (isset($_REQUEST['filter_class']) ? $_REQUEST['filter_class'] : "");
+$filter_id = (isset($_REQUEST['filter_id']) ? $_REQUEST['filter_id']:"");
+
$json_types = Array("application/json","application/x-javascript","text/javascript","text/x-javascript","text/x-json");
if ($_REQUEST['json']) {
- $return = getServiceAlertsAsJSON($_REQUEST['filter_class'], $_REQUEST['filter_id']);
+if ($_REQUEST['alerts']) {
+ $return = getServiceAlertsAsJSON($filter_class,$filter_id);
+} else if ($_REQUEST['updates']) {
+ $return = getTripUpdatesAsJSON($filter_class,$filter_id);
+} else {
+ usage();
+}
header('Content-Type: application/json; charset=utf8');
// header('Access-Control-Allow-Origin: http://bus.lambdacomplex.org/');
header('Access-Control-Max-Age: 3628800');
@@ -47,7 +61,25 @@
$json = '(' . $return . ');'; //must wrap in parens and end with semicolon
//print_r($_GET['callback'] . $json); //callback is prepended for json-p
}
- else
+ else {
echo $return;
+ }
+} else if ($_REQUEST['protobuf']) {
+if ($_REQUEST['alerts']) {
+ $return = getServiceAlertsAsBinary($filter_class,$filter_id);
+} else if ($_REQUEST['updates']) {
+ $return = getTripUpdatesAsBinary($filter_class,$filter_id);
+} else {
+ usage();
+}
+ header('Content-Type: application/x-protobuf');
+header('Content-Disposition: attachment; filename="'.(isset($_REQUEST['updates'])?"updates.":"alerts.").date("c").'.protobuf"');
+// header('Access-Control-Allow-Origin: http://bus.lambdacomplex.org/');
+ header('Access-Control-Max-Age: 3628800');
+ header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE');
+ echo $return;
+} else {
+usage();
}
?>
+
--- a/rtpis/servicealert_editor.php
+++ b/rtpis/servicealert_editor.php
@@ -116,8 +116,7 @@
</div>
<div data-role="fieldcontain">
<label for="description">Description</label>
- <textarea name="description">
- <?php echo $alert['description']; ?></textarea>
+ <textarea name="description"><?php echo $alert['description']; ?></textarea>
</div>
<div data-role="fieldcontain">
<label for="url">URL</label>
@@ -185,3 +184,4 @@
}
include_footer();
?>
+
--- a/rtpis/siri.php
+++ b/rtpis/siri.php
@@ -1,8 +1,80 @@
<?php
/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright 2010,2011 Alexander Sadleir
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
*/
+include ('include/common.inc.php');
+function accept_header($header = false) {
+ // http://jrgns.net/parse_http_accept_header
+ $toret = null;
+ $header = $header ? $header : (array_key_exists('HTTP_ACCEPT', $_SERVER) ? $_SERVER['HTTP_ACCEPT']: false);
+ if ($header) {
+ $types = explode(',', $header);
+ $types = array_map('trim', $types);
+ foreach ($types as $one_type) {
+ $one_type = explode(';', $one_type);
+ $type = array_shift($one_type);
+ if ($type) {
+ list($precedence, $tokens) = self::accept_header_options($one_type);
+ list($main_type, $sub_type) = array_map('trim', explode('/', $type));
+ $toret[] = array('main_type' => $main_type, 'sub_type' => $sub_type, 'precedence' => (float)$precedence, 'tokens' => $tokens);
+ }
+ }
+ usort($toret, array('Parser', 'compare_media_ranges'));
+ }
+ return $toret;
+}
+function usage() {
+echo "Usage notes: Must specify format json/xml. If callback is specified, will provide jsonp. Can filter with parmaters filter_class route/stop and filter_id with the id specified in GTFS."
+die();
+}
+$json_types = Array("application/json","application/x-javascript","text/javascript","text/x-javascript","text/x-json");
+if ($_REQUEST['json']) {
+if ($_REQUEST['alerts']) {
+ $return = getServiceAlertsAsJSON($_REQUEST['filter_class'], $_REQUEST['filter_id']);
+} else if ($_REQUEST['updates']) {
+ $return = getTripUpdatesAsJSON($_REQUEST['filter_class'], $_REQUEST['filter_id']);
+} else {
+ usage();
+}
+ header('Content-Type: application/json; charset=utf8');
+// header('Access-Control-Allow-Origin: http://bus.lambdacomplex.org/');
+ header('Access-Control-Max-Age: 3628800');
+ header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE');
+ if (isset($_GET['callback'])) {
+ $json = '(' . $return . ');'; //must wrap in parens and end with semicolon
+ //print_r($_GET['callback'] . $json); //callback is prepended for json-p
+ }
+ else {
+ echo $return;
+ }
+} else if ($_REQUEST['xml']) {
+if ($_REQUEST['alerts']) {
+ $return = getServiceAlertsAsBinary($_REQUEST['filter_class'], $_REQUEST['filter_id']);
+} else if ($_REQUEST['updates']) {
+ $return = getTripUpdatesAsBinary($_REQUEST['filter_class'], $_REQUEST['filter_id']);
+} else {
+ usage();
+}
+ header('Content-Type: application/json; charset=utf8');
+// header('Access-Control-Allow-Origin: http://bus.lambdacomplex.org/');
+ header('Access-Control-Max-Age: 3628800');
+ header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE');
+ echo $return;
+} else {
+usage();
+}
?>
--- a/trip.php
+++ b/trip.php
@@ -32,7 +32,7 @@
$service_period = strtolower($trip["service_id"]);
$destination = getTripDestination($trip['trip_id']);
include_header("Route " . $trip['route_id'] . ' to ' . $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_id'] . ' ' . $destination['stop_name'], $routeid);
echo '<span class="content-secondary">';
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> ';
@@ -71,10 +71,12 @@
flush();
@ob_flush();
echo "<div class='ui-header' style='overflow: visible; height: 1.5em'>";
-if ($nextTrip)
+if (isset($nextTrip)) {
echo '<a href="trip.php?tripid=' . $nextTrip . "&routeid=" . $routeid . '" data-icon="arrow-r" class="ui-btn-right">Next Trip</a>';
-if ($prevTrip)
+}
+if (isset($prevTrip)) {
echo '<a href="trip.php?tripid=' . $prevTrip . "&routeid=" . $routeid . '" data-icon="arrow-l" class="ui-btn-left">Previous Trip</a>';
+}
echo "</div>";
echo ' <ul data-role="listview" data-inset="true">';
$stopsGrouped = Array();
@@ -119,7 +121,6 @@
if ($key - 1 <= 0 || stopCompare($tripStopTimes[$key]['stop_name']) != stopCompare($tripStopTimes[$key - 1]['stop_name'])) {
// first duplicate
$stopsGrouped = Array(
- "name" => trim(preg_replace("/\(Platform.*/", "", $stop['stop_name'])),
"startTime" => $tripStopTime['arrival_time'],
"stop_ids" => Array(
$tripStopTime['stop_id']