--- a/stop.php
+++ b/stop.php
@@ -16,8 +16,9 @@
limitations under the License.
*/
include ('include/common.inc.php');
-if ($stopid)
+if (isset($stopid)) {
$stop = getStop($stopid);
+}
/* if ($stopcode != "" && $stop[5] != $stopcode) {
$url = $APIurl . "/json/stopcodesearch?q=" . $stopcode;
$stopsearch = json_decode(getPage($url));
@@ -43,16 +44,12 @@
}
$stop = $stops[0];
$stopid = $stops[0]["stop_id"];
- $stopLinks.= "Individual stop pages: ";
+ $stopLinks.= "Individual stop pages:
";
foreach ($stops as $key => $sub_stop) {
- // $stopNames[$key] = $sub_stop[1] . ' Stop #' . ($key + 1);
- if (strpos($stop["stop_name"], "Station")) {
- $stopNames[$key] = 'Platform ' . ($key + 1);
- $stopLinks.= '' . $sub_stop["stop_name"] . ' ';
- } else {
- $stopNames[$key] = '#' . ($key + 1);
- $stopLinks.= '' . $sub_stop["stop_name"] . ' Stop #' . ($key + 1) . ' ';
- }
+
+ $stopNames[$key] = $sub_stop["stop_name"];
+ $stopLinks.= '' . $sub_stop["stop_name"] . ' ';
+
$stopPositions[$key] = Array(
$sub_stop["stop_lat"],
$sub_stop["stop_lon"]
@@ -77,15 +74,19 @@
//}
}
}
-include_header($stop['stop_name'], "stop");
-
+if (sizeof($stops) > 0) {
+ $stopDescParts = explode("
", $stop['stop_desc']);
+ include_header(trim(str_replace("Street: ", "", $stopDescParts[0])), "stop");
+} else {
+ include_header($stop['stop_name'], "stop");
+}
/* $serviceAlerts = json_decode(getPage(curPageURL() . "/servicealerts_api.php?filter_class=stop&filter_id=".$stopid) , true);
foreach($serviceAlerts['entities'] as $serviceAlert) {
echo '
";
- $viaPoints = viaPointNames($trip['trip_id'], $trip['stop_sequence']);
- if ($viaPoints != "")
- echo ' ";
+ $viaPoints = viaPointNames($trip['trip_id'], $trip['stop_sequence']);
+if (isset($labs)) {
+ echo '
Via: ' . $viaPoints . '';
- if (sizeof($tripStopNumbers) > 0) {
- echo '
Boarding At: ';
- foreach ($tripStopNumbers[$trip['trip_id']] as $key) {
- echo $stopNames[$key] . ' ';
+ $tripETA[$trip['trip_id']] = date("H:i",strtotime($trip['arrival_time']." - ".(floor($ETAparams['lol']['stddev']))." seconds"))." to ".
+ date("H:i",strtotime($trip['arrival_time']." + ".(floor($ETAparams['lol']['stddev']))." seconds"));
+ }
+ //print_r($tripETA);
+}
+ foreach ($trips as $trip) {
+ if (
+ isset($filterHasStop) && (getTripHasStop($trip['trip_id'], $filterHasStop) == 1)
+ || (isset($filterIncludeRoutes) && in_array($trip["route_short_name"], $filterIncludeRoutes))
+ || (!isset($filterIncludeRoutes) && !isset($filterHasStop))
+ ) {
+ echo '' . $trip['route_short_name'] . " towards " . $destination['stop_name'] . "
ETA: ' . $tripETA[$trip['trip_id']] . '';
}
- echo '
Via: ' . $viaPoints . '';
+ if (sizeof($tripStopNumbers) > 0) {
+ echo '
Boarding At: ';
+ if (sizeof($tripStopNumbers[$trip['trip_id']]) == sizeof($stopids)) {
+ echo "All Stops";
+ } else {
+ foreach ($tripStopNumbers[$trip['trip_id']] as $key) {
+ echo $stopNames[$key] . ', ';
+ }
+ }
+ echo '';
+ }
+ echo '
' . $trip['arrival_time'] . '
'; + echo '' . $trip['arrival_time'] . '
'; - echo ''; - flush(); - @ob_flush(); } } echo '