--- a/stop.php
+++ b/stop.php
@@ -2,9 +2,8 @@
include ('include/common.inc.php');
$stopid = filter_var($_REQUEST['stopid'], FILTER_SANITIZE_NUMBER_INT);
$stopcode = filter_var($_REQUEST['stopcode'], FILTER_SANITIZE_STRING);
-$url = $APIurl . "/json/stop?stop_id=" . $stopid;
-$stop = json_decode(getPage($url));
-if ($stopcode != "" && $stop[5] != $stopcode) {
+if ($stopid) $stop = getStop($stopid);
+/*if ($stopcode != "" && $stop[5] != $stopcode) {
$url = $APIurl . "/json/stopcodesearch?q=" . $stopcode;
$stopsearch = json_decode(getPage($url));
$stopid = $stopsearch[0][0];
@@ -14,7 +13,7 @@
if (!startsWith($stop[5], "Wj") && strpos($stop[1], "Platform") === false) {
// expand out to all platforms
-}
+}*/
$stops = Array();
$stopPositions = Array();
$stopNames = Array();
@@ -25,93 +24,92 @@
if (isset($_REQUEST['stopids'])) {
$stopids = explode(",", filter_var($_REQUEST['stopids'], FILTER_SANITIZE_STRING));
foreach ($stopids as $sub_stopid) {
- $url = $APIurl . "/json/stop?stop_id=" . $sub_stopid;
- $stop = json_decode(getPage($url));
- $stops[] = $stop;
+ $stops[] = getStop($sub_stopid);
}
$stop = $stops[0];
- $stopid = $stops[0][0];
+ $stopid = $stops[0]["stop_id"];
$stopLinks.= "Individual stop pages: ";
foreach ($stops as $key => $sub_stop) {
- // $stopNames[$key] = $sub_stop[1] . ' Stop #' . ($key + 1);
- if (strpos($stop[1],
- "Station")) {
- $stopNames[$key] = 'Platform ' . ($key + 1);
- $stopLinks.= '' . $sub_stop[1] . ' ';
- } else {
- $stopNames[$key] = '#' . ($key + 1);
- $stopLinks.= '' . $sub_stop[1] . ' Stop #' . ($key + 1) . ' ';
- }
+ // $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[2],
- $sub_stop[3]
+ $sub_stop["stop_lat"],
+ $sub_stop["stop_lon"]
);
-
- $url = $APIurl . "/json/stopalltrips?stop=" . $sub_stop[0]; $trips = json_decode(getPage($url));
- $tripSequence = "";
+ $trips = getStopTrips($sub_stop["stop_id"]);
+ $tripSequence = "";
foreach ($trips as $trip) {
- $tripSequence .= "$trip[0],";
- $tripStopNumbers[$trip[0]][] = $key;
+ $tripSequence.= "{$trip['trip_id']},";
+ $tripStopNumbers[$trip['trip_id']][] = $key;
}
-
- if (!in_array($tripSequence,$fetchedTripSequences)) {
- // only fetch new trip sequences
- $fetchedTripSequences[] = $tripSequence;
- $url = $APIurl . "/json/stoptrips?stop=" . $sub_stop[0] . "&time=" . midnight_seconds() . "&service_period=" . service_period();
- $trips = json_decode(getPage($url));
- foreach ($trips as $trip) {
- if (!isset($allStopsTrips[$trip[1][0]])) $allStopsTrips[$trip[1][0]] = $trip;
- }
- } else {
- echo "skipped sequence $tripSequence";
- }
+ 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[1], "stop");
+include_header($stop['stop_name'], "stop");
timePlaceSettings();
echo '
';
echo $stopLinks;
if (sizeof($stops) > 0) {
- trackEvent("View Stops","View Combined Stops", $stop[1], $stop[0]);
-
+ trackEvent("View Stops", "View Combined Stops", $stop["stop_name"], $stop["stop_id"]);
echo '
' . staticmap($stopPositions) . '
';
}
else {
- trackEvent("View Stops","View Single Stop", $stop[1], $stop[0]);
+ trackEvent("View Stops", "View Single Stop", $stop["stop_name"], $stop["stop_id"]);
echo '
' . staticmap(Array(
0 => Array(
- $stop[2],
- $stop[3]
+ $stop["stop_lat"],
+ $stop["stop_lon"]
)
)) . '
';
}
echo '
';
include_footer();
?>