--- a/stop.php +++ b/stop.php @@ -1,17 +1,35 @@ $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) . ' '; - } - $stopPositions[$key] = Array( - $sub_stop["stop_lat"], - $sub_stop["stop_lon"] - ); - $trips = getStopTrips($sub_stop["stop_id"]); - $tripSequence = ""; - foreach ($trips as $trip) { - $tripSequence.= "{$trip['trip_id']},"; - $tripStopNumbers[$trip['trip_id']][] = $key; - } - if (!in_array($tripSequence, $fetchedTripSequences)) { - // only fetch new trip sequences - $fetchedTripSequences[] = $tripSequence; - $trips = getStopTripsWithTimes($sub_stop["stop_id"]); - foreach ($trips as $trip) { - if (!isset($allStopsTrips[$trip["trip_id"]])) $allStopsTrips[$trip["trip_id"]] = $trip; - } - } - //else { - // echo "skipped sequence $tripSequence"; - //} - } -} -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 '
Via: ' . $viaPoints . '';
- if (sizeof($tripStopNumbers) > 0) {
- echo '
Boarding At: ';
- foreach ($tripStopNumbers[$trip['trip_id']] as $key) {
- echo $stopNames[$key] . ' ';
- }
- echo '';
- }
- echo '
' . $trip['arrival_time'] . '
'; - echo '";
+ $viaPoints = viaPointNames($trip['trip_id'], $trip['stop_sequence']);
+if (isset($labs)) {
+ echo '
ETA: ' . $tripETA[$trip['trip_id']] . '';
+ }
+ if ($viaPoints != "")
+ 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 '