Nearby routes and routes by suburb
--- a/common-template.inc.php
+++ b/common-template.inc.php
@@ -122,7 +122,7 @@
or enter an address/co-ordinates in the box below.</div>';
}
echo '<div data-role="collapsible" data-collapsed="' . !$geoerror . '">
- <h3>Change Time/Place...</h3>
+ <h3>Change Time/Place (' . (isset($_SESSION['time']) ? $_SESSION['time'] : "Current Time,") . ' '.ucwords(service_period()).')...</h3>
<form action="" method="post">
<div class="ui-body">
<div data-role="fieldcontain">
--- a/common.inc.php
+++ b/common.inc.php
@@ -150,5 +150,33 @@
{
return str_replace(")", "</small>", str_replace("(", "<br><small>", $input));
}
+
+function sksort(&$array, $subkey="id", $sort_ascending=false) {
+
+ if (count($array))
+ $temp_array[key($array)] = array_shift($array);
+
+ foreach($array as $key => $val){
+ $offset = 0;
+ $found = false;
+ foreach($temp_array as $tmp_key => $tmp_val)
+ {
+ if(!$found and strtolower($val[$subkey]) > strtolower($tmp_val[$subkey]))
+ {
+ $temp_array = array_merge( (array)array_slice($temp_array,0,$offset),
+ array($key => $val),
+ array_slice($temp_array,$offset)
+ );
+ $found = true;
+ }
+ $offset++;
+ }
+ if(!$found) $temp_array = array_merge($temp_array, array($key => $val));
+ }
+
+ if ($sort_ascending) $array = array_reverse($temp_array);
+
+ else $array = $temp_array;
+}
?>
--- a/layar_api.php
+++ b/layar_api.php
@@ -9,7 +9,6 @@
$page_end = $max_page + filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT);
$lat = filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
$lon = filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
-if (isset($_REQUEST['radius'])) $radius = filter_var($_REQUEST['radius'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
$url = $APIurl . "/json/neareststops?lat=$lat&lon=$lon&limit=50";
$contents = json_decode(getPage($url));
debug(print_r($contents, true));
@@ -24,24 +23,22 @@
$hotspot['lat'] = floor($row[2] * 1000000);
$hotspot['lon'] = floor($row[3] * 1000000);
$hotspot['distance'] = distance($row[2], $row[3], $_REQUEST['lat'], $_REQUEST['lon']);
- if (!isset($_REQUEST['radius']) || $hotspot['distance'] < $radius) {
- $hotspot['actions'] = Array(
- Array(
- "label" => 'View more trips/information',
- 'uri' => 'http://bus.lambdacomplex.org/' . 'stop.php?stopid=' . $row[0]
- )
- );
- $url = $APIurl . "/json/stoptrips?stop=" . $row[0] . "&time=" . midnight_seconds() . "&service_period=" . service_period() . "&limit=4&time_range=" . str(90 * 60);
- $trips = json_decode(getPage($url));
- debug(print_r($trips, true));
- foreach ($trips as $key => $row) {
- if ($key < 3) {
- $hotspot['line' . strval($key + 2) ] = $row[1][1] . ' @ ' . midnight_seconds_to_time($row[0]);
- }
+ $hotspot['actions'] = Array(
+ Array(
+ "label" => 'View more trips/information',
+ 'uri' => 'http://bus.lambdacomplex.org/' . 'stop.php?stopid=' . $row[0]
+ )
+ );
+ $url = $APIurl . "/json/stoptrips?stop=" . $row[0] . "&time=" . midnight_seconds() . "&service_period=" . service_period() . "&limit=4&time_range=" . strval(90 * 60);
+ $trips = json_decode(getPage($url));
+ debug(print_r($trips, true));
+ foreach ($trips as $key => $row) {
+ if ($key < 3) {
+ $hotspot['line' . strval($key + 2) ] = $row[1][1] . ' @ ' . midnight_seconds_to_time($row[0]);
}
- if (sizeof($trips) == 0) $hotspot['line2'] = 'No trips in the near future.';
- $output['hotspots'][] = $hotspot;
}
+ if (sizeof($trips) == 0) $hotspot['line2'] = 'No trips in the near future.';
+ $output['hotspots'][] = $hotspot;
}
}
if (sizeof($hotspot) > 0) {
--- a/routeList.php
+++ b/routeList.php
@@ -1,7 +1,8 @@
<?php
include ('common.inc.php');
-include_header("Routes", "routeList");
-echo '
+function navbar()
+{
+ echo '
<div data-role="navbar">
<ul>
<li><a href="routeList.php">By Final Destination...</a></li>
@@ -11,16 +12,55 @@
</ul>
</div>
';
-echo ' <ul data-role="listview" data-inset="true">';
-$url = $APIurl . "/json/routes";
-$contents = json_decode(getPage($url));
-function printRoutes($routes)
-{
+}
+if ($_REQUEST['bysuburb']) {
+ include_header("Routes by Suburb", "routeList");
+ navbar();
+ echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';
+ foreach ($suburbs as $suburb) {
+ if (!isset($_REQUEST['firstLetter'])) {
+ foreach (range('A', 'Z') as $letter) {
+ echo "<li><a href=\"routeList.php?firstLetter=$letter&bysuburb=yes\">$letter...</a></li>\n";
+ }
+ }
+ else if (startsWith($suburb, $_REQUEST['firstLetter'])) {
+ echo '<li><a href="routeList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>';
+ }
+ }
+ echo '</ul>';
+}
+else if ($_REQUEST['nearby'] || $_REQUEST['suburb']) {
+ if ($_REQUEST['suburb']) {
+ $suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);
+ $url = $APIurl . "/json/stopzonesearch?q=" . $suburb;
+ include_header("Routes by Suburb", "routeList");
+ }
+ if ($_REQUEST['nearby']) {
+ $url = $APIurl . "/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15";
+ include_header("Routes Nearby", "routeList");
+ }
+ $stops = json_decode(getPage($url));
+ $routes = Array();
+ foreach ($stops as $stop) {
+ $url = $APIurl . "/json/stoproutes?stop=" . $stop[0];
+ $stoproutes = json_decode(getPage($url));
+ foreach ($stoproutes as $route) {
+ if (!isset($routes[$route[0]])) $routes[$route[0]] = $route;
+ }
+ }
+ navbar();
+ echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';
+ sksort($routes, 1, true);
foreach ($routes as $row) {
- echo '<li>' . $row[1] . ' <a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . " (" . ucwords($row[3]) . ")</a></li>\n";
+ echo '<li>' . $row[1] . ' <a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . " (" . ucwords($row[4]) . ")</a></li>\n";
}
}
-if ($_REQUEST['bynumber']) {
+else if ($_REQUEST['bynumber']) {
+ include_header("Routes by Number", "routeList");
+ navbar();
+ echo ' <ul data-role="listview" data-inset="true">';
+ $url = $APIurl . "/json/routes";
+ $contents = json_decode(getPage($url));
$routeSeries = Array();
$seriesRange = Array();
foreach ($contents as $key => $row) {
@@ -54,11 +94,19 @@
echo '<a name="' . $series . '"></a>';
if ($series <= 9) echo '<li>' . $series . "<ul>\n";
else echo "<li>{$seriesRange[$series]['min']}-{$seriesRange[$series]['max']}<ul>\n";
- printRoutes($routes);
+ foreach ($routes as $row) {
+ echo '<li>' . $row[1] . ' <a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . " (" . ucwords($row[3]) . ")</a></li>\n";
+ }
echo "</ul></li>\n";
}
}
else {
+ include_header("Routes by Destination", "routeList");
+ navbar();
+ echo ' <ul data-role="listview" data-inset="true">';
+ $url = $APIurl . "/json/routes";
+ $contents = json_decode(getPage($url));
+ // by destination!
foreach ($contents as $key => $row) {
$routeDestinations[$row[2]][] = $row;
}
@@ -73,7 +121,9 @@
foreach ($routeDestinations as $destination => $routes) {
echo '<a name="' . $destination . '"></a>';
echo '<li>' . $destination . "... <ul>\n";
- printRoutes($routes);
+ foreach ($routes as $row) {
+ echo '<li>' . $row[1] . ' <a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . " (" . ucwords($row[3]) . ")</a></li>\n";
+ }
echo "</ul></li>\n";
}
}
--- a/schedule_viewer.py
+++ b/schedule_viewer.py
@@ -282,6 +282,23 @@
result.sort(key = lambda x: x[1:3])
return result
+ def handle_json_GET_routesearch(self, params):
+ """Return a list of routes with matching short name."""
+ schedule = self.server.schedule
+ routeshortname = params.get('routeshortname', None)
+ result = []
+ for r in schedule.GetRouteList():
+ if r.route_short_name == routeshortname:
+ servicep = None
+ for t in schedule.GetTripList():
+ if t.route_id == r.route_id:
+ servicep = t.service_period
+ break
+ result.append( (r.route_id, r.route_short_name, r.route_long_name, servicep.service_id) )
+ result.sort(key = lambda x: x[1:3])
+ return result
+
+
def handle_json_GET_routerow(self, params):
schedule = self.server.schedule
route = schedule.GetRoute(params.get('route', None))
@@ -361,7 +378,7 @@
schedule = self.server.schedule
lat = float(params.get('lat'))
lon = float(params.get('lon'))
- limit = int(params.get('limit'))
+ limit = int(params.get('limit',5))
scale = int(params.get('scale',5)) # 5 = neighbourhood ~ 1km, 4= town 5 by 7km
stops = []
@@ -385,6 +402,7 @@
stops.append(s)
if scale == 5:
+ print stops
return [StopToTuple(s) for s in stops]
else:
dist_stop_list = []
@@ -396,7 +414,8 @@
elif dist < dist_stop_list[-1][0]:
bisect.insort(dist_stop_list, (dist, s))
dist_stop_list.pop() # Remove stop with greatest distance
- return [StopToTuple(s) for s in dist_stop_list]
+ print dist_stop_list
+ return [StopToTuple(s) for dist, s in dist_stop_list]
def handle_json_GET_boundboxstops(self, params):
"""Return a list of up to 'limit' stops within bounding box with 'n','e'
@@ -475,8 +494,8 @@
result = {}
for trip in trips:
route = schedule.GetRoute(trip.route_id)
- if not trip.route_short_name+route.route_long_name in result:
- result[trip.route_short_name+route.route_long_name] = (route.route_id, route.route_short_name, route.route_long_name, trip.trip_id)
+ if not route.route_short_name+route.route_long_name+trip.service_id in result:
+ result[route.route_short_name+route.route_long_name+trip.service_id] = (route.route_id, route.route_short_name, route.route_long_name, trip.trip_id, trip.service_id)
return result
def handle_json_GET_stopalltrips(self, params):
@@ -507,6 +526,8 @@
if service_period == None or trip.service_id == service_period:
result.append((time, (trip.trip_id, trip_name, trip.service_id), tp))
return result
+
+
def handle_json_GET_stoptrips(self, params):
"""Given a stop_id and time in seconds since midnight return the next
@@ -516,7 +537,7 @@
requested_time = int(params.get('time', 0))
limit = int(params.get('limit', 15))
service_period = params.get('service_period', None)
- time_range = params.get('time_range', 24*60*60)
+ time_range = int(params.get('time_range', 24*60*60))
filtered_time_trips = []
--- a/stop.php
+++ b/stop.php
@@ -4,45 +4,49 @@
$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 ($stopcode != "" && $stop[5] != $stopcode) {
$url = $APIurl . "/json/stopcodesearch?q=" . $stopcode;
$stopsearch = json_decode(getPage($url));
$stopid = $stopsearch[0][0];
$url = $APIurl . "/json/stop?stop_id=" . $stopid;
$stop = json_decode(getPage($url));
}
-if (!startsWith($stop[5], "Wj") && strpos($stop[1],"Platform") === false) {
- // expand out to all platforms
+if (!startsWith($stop[5], "Wj") && strpos($stop[1], "Platform") === false) {
+ // expand out to all platforms
+
}
$stops = Array();
$stopPositions = Array();
+$stopNames = Array();
$tripStopNumbers = Array();
$allStopsTrips = Array();
$stopLinks = "";
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;
- }
- $stop = $stops[0];
- $stopid = $stops[0][0];
- $stopLinks .= "Individual stop pages: ";
- foreach ($stops as $key => $sub_stop) {
- $stopLinks .= '<a href="stop.php?stopid='.$sub_stop[0].'&stopcode='.$sub_stop[5].'">'.$sub_stop[1].' Stop #'.($key+1).'</a> ';
- $stopPositions[$key] = Array($sub_stop[2],$sub_stop[3]);
- $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($allStopTrips[$row[1][0]])) $allStopTrips[$row[1][0]] = $trip;
- $tripStopNumbers[$row[1][0]][] = $key;
- }
- }
+ $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;
+ }
+ $stop = $stops[0];
+ $stopid = $stops[0][0];
+ $stopLinks.= "Individual stop pages: ";
+ foreach ($stops as $key => $sub_stop) {
+ $stopNames[$key] = $sub_stop[1] . ' Stop #' . ($key + 1);
+ $stopLinks.= '<a href="stop.php?stopid=' . $sub_stop[0] . '&stopcode=' . $sub_stop[5] . '">' . $stopNames[$key] . '</a> ';
+ $stopPositions[$key] = Array(
+ $sub_stop[2],
+ $sub_stop[3]
+ );
+ $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;
+ $tripStopNumbers[$trip[1][0]][] = $key;
+ }
+ }
}
-
include_header($stop[1], "stop");
-
if (isMetricsOn()) {
// Create a new Instance of the tracker
$owa = new owa_php();
@@ -61,25 +65,39 @@
echo '<div data-role="content" class="ui-content" role="main">';
echo $stopLinks;
if (sizeof($stops) > 0) {
- echo '<p>' . staticmap($stopPositions) . '</p>';
-} else {
- echo '<p>' . staticmap(Array(
- 0 => Array(
- $stop[2],
- $stop[3]
- )
-)) . '</p>';
+ echo '<p>' . staticmap($stopPositions) . '</p>';
+}
+else {
+ echo '<p>' . staticmap(Array(
+ 0 => Array(
+ $stop[2],
+ $stop[3]
+ )
+ )) . '</p>';
}
echo ' <ul data-role="listview" data-inset="true">';
-$url = $APIurl . "/json/stoptrips?stop=" . $stopid . "&time=" . midnight_seconds() . "&service_period=" . service_period();
-$trips = json_decode(getPage($url));
+if (sizeof($allStopsTrips) > 0) {
+ $trips = $allStopsTrips;
+}
+else {
+ $url = $APIurl . "/json/stoptrips?stop=" . $stopid . "&time=" . midnight_seconds() . "&service_period=" . service_period();
+ $trips = json_decode(getPage($url));
+}
foreach ($trips as $row) {
echo '<li>';
echo '<h3><a href="trip.php?stopid=' . $stopid . '&tripid=' . $row[1][0] . '">' . $row[1][1];
if (isFastDevice()) {
$viaPoints = viaPointNames($row[1][0], $stopid);
- if ($viaPoints != "") echo '<br><small>Via: ' . $viaPoints . '</small> </a></h3>';
+ if ($viaPoints != "") echo '<br><small>Via: ' . $viaPoints . '</small>';
}
+ if (sizeof($tripStopNumbers) > 0) {
+ echo '<br><small>Boarding At: ';
+ foreach ($tripStopNumbers[$row[1][0]] as $key) {
+ echo $stopNames[$key] .' ';
+ }
+ echo '</small>';
+ }
+ echo '</a></h3>';
echo '<p class="ui-li-aside"><strong>' . midnight_seconds_to_time($row[0]) . '</strong></p>';
echo '</li>';
}
--- a/stopList.php
+++ b/stopList.php
@@ -1,5 +1,8 @@
<?php
include ('common.inc.php');
+function filterByFirstLetter($var) {
+ return $var[1][0] == $_REQUEST['firstLetter'];
+}
function navbar()
{
echo '
@@ -19,19 +22,28 @@
navbar();
echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';
foreach ($suburbs as $suburb) {
- echo '<li><a href="stopList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>';
+ if (!isset($_REQUEST['firstLetter'])) {
+ foreach (range('A', 'Z') as $letter) {
+ echo "<li><a href=\"stopList.php?firstLetter=$letter&suburbs=yes\">$letter...</a></li>\n";
+ }
+ }
+ else if (startsWith($suburb, $_REQUEST['firstLetter'])) {
+ echo '<li><a href="stopList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>';
+ }
}
echo '</ul>';
}
else {
// Timing Points / All stops
if ($_REQUEST['allstops']) {
+ $listType = 'allstops=yes';
$url = $APIurl . "/json/stops";
include_header("All Stops", "stopList");
navbar();
timePlaceSettings();
}
else if ($_REQUEST['nearby']) {
+ $listType = 'nearby=yes';
$url = $APIurl . "/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15";
include_header("Nearby Stops", "stopList");
navbar();
@@ -39,6 +51,7 @@
}
else if ($_REQUEST['suburb']) {
$suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);
+ $listType = "suburb=$suburb";
$url = $APIurl . "/json/stopzonesearch?q=" . $suburb;
include_header("Stops in " . ucwords($suburb) , "stopList");
if (isMetricsOn()) {
@@ -63,73 +76,76 @@
navbar();
timePlaceSettings();
}
- echo '<div class="noscriptnav"> Go to letter: ';
- foreach (range('A', 'Z') as $letter) {
- echo "<a href=\"#$letter\">$letter</a> ";
- }
- echo "</div>
- <script>
-$('.noscriptnav').hide();
- </script>";
echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';
- $stops = json_decode(getPage($url));
- foreach ($stops as $key => $row) {
- $stopName[$key] = $row[1];
- }
- // Sort the stops by name
- array_multisort($stopName, SORT_ASC, $stops);
- $firstletter = "";
- $stopsGrouped = Array();
- foreach ($stops as $key => $row) {
- if (substr($row[1], 0, 1) != $firstletter) {
- echo "<a name=$firstletter></a>";
- $firstletter = substr($row[1], 0, 1);
- }
- if (($stops[$key][1] != $stops[$key + 1][1]) || $key + 1 >= sizeof($stops)) {
- if (sizeof($stopsGrouped) > 0) {
- // print and empty grouped stops
- // subsequent duplicates
- $stopsGrouped["stop_ids"][] = $row[0];
- echo '<li><a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">';
- if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
- echo '<span class="ui-li-count">' . floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])) . 'm away</span>';
- }
- echo bracketsMeanNewLine($row[1].'('.sizeof($stopsGrouped["stop_ids"]).' stops)');
- echo "</a></li>\n";
- $stopsGrouped = Array();
- }
- else {
- // just a normal stop
- echo '<li>';
- if (!startsWith($row[5], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">';
-
- if (!startsWith($row[5], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">';
- echo '<a href="stop.php?stopid=' . $row[0] . (startsWith($row[5], "Wj") ? '&stopcode=' . $row[5] : "") . '">';
- if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
- echo '<span class="ui-li-count">' . floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])) . 'm away</span>';
- }
- echo bracketsMeanNewLine($row[1]);
- echo "</a></li>\n";
- }
- }
- else {
- // this is a duplicated line item
- if ($key - 1 <= 0 || ($stops[$key][1] != $stops[$key - 1][1])) {
- // first duplicate
- $stopsGrouped = Array(
- "name" => $row[1],
- "stop_ids" => Array(
- $row[0]
- )
- );
- }
- else {
- // subsequent duplicates
- $stopsGrouped["stop_ids"][] = $row[0];
- }
+ if (!isset($_REQUEST['firstLetter']) && !$_REQUEST['suburb']) {
+ foreach (range('A', 'Z') as $letter) {
+ echo "<li><a href=\"stopList.php?firstLetter=$letter&$listType\">$letter...</a></li>\n";
}
}
+ else {
+ $stops = json_decode(getPage($url));
+ foreach ($stops as $key => $row) {
+ $stopName[$key] = $row[1];
+ }
+ // Sort the stops by name
+ array_multisort($stopName, SORT_ASC, $stops);
+ if (!isset($_REQUEST['suburb'])){
+ $stops = array_filter($stops, "filterByFirstLetter");
+ }
+ $stopsGrouped = Array();
+ foreach ($stops as $key => $row) {
+ if ((trim(preg_replace("/\(Platform.*/","",$stops[$key][1])) != trim(preg_replace("/\(Platform.*/","",$stops[$key + 1][1]))) || $key + 1 >= sizeof($stops)) {
+ if (sizeof($stopsGrouped) > 0) {
+ // print and empty grouped stops
+ // subsequent duplicates
+ $stopsGrouped["stop_ids"][] = $row[0];
+ echo '<li>';
+
+ if (!startsWith($stopsGrouped['stop_codes'][0], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">';
+ echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">';
+ if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
+ echo '<span class="ui-li-count">' . floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])) . 'm away</span>';
+ }
+ echo bracketsMeanNewLine(trim(preg_replace("/\(Platform.*/","",$row[1])) . '(' . sizeof($stopsGrouped["stop_ids"]) . ' stops)');
+ echo "</a></li>\n";
+ $stopsGrouped = Array();
+ }
+ else {
+ // just a normal stop
+ echo '<li>';
+ if (!startsWith($row[5], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">';
+ echo '<a href="stop.php?stopid=' . $row[0] . (startsWith($row[5], "Wj") ? '&stopcode=' . $row[5] : "") . '">';
+ if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
+ echo '<span class="ui-li-count">' . floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])) . 'm away</span>';
+ }
+ echo bracketsMeanNewLine($row[1]);
+ echo "</a></li>\n";
+ }
+
+ } else {
+ // this is a duplicated line item
+ if ($key - 1 <= 0 || (trim(preg_replace("/\(Platform.*/","",$stops[$key][1])) != trim(preg_replace("/\(Platform.*/","",$stops[$key - 1][1])))) {
+ // first duplicate
+ $stopsGrouped = Array(
+ "name" => trim(preg_replace("/\(Platform.*/","",$row[1])),
+ "stop_ids" => Array(
+ $row[0]
+ ),
+ "stop_codes" => Array(
+ $row[5]
+ )
+ );
+ }
+ else {
+ // subsequent duplicates
+ $stopsGrouped["stop_ids"][] = $row[0];
+ }
+ }
+
+ }
+ }
echo '</ul>';
+ var_dump ($stopsGrouped);
}
include_footer();
?>
--- a/trip.php
+++ b/trip.php
@@ -4,16 +4,17 @@
$stopid = filter_var($_REQUEST['stopid'], FILTER_SANITIZE_NUMBER_INT);
$routeid = filter_var($_REQUEST['routeid'], FILTER_SANITIZE_NUMBER_INT);
$routetrips = Array();
-if ($_REQUEST['routeid']) {
+if ($_REQUEST['routeid'] && !$_REQUEST['tripid']) {
+ $tripid = 0;
$url = $APIurl . "/json/routetrips?route_id=" . $routeid;
$routetrips = json_decode(getPage($url));
foreach ($routetrips as $trip) {
- if ($trip[0] < midnight_seconds()) {
+ if ($trip[0] > midnight_seconds()) {
$tripid = $trip[1];
break;
}
}
- if (!($tripid > 0)) $tripid = $routetrip[0][1];
+ if ($tripid == 0) $tripid = $routetrips[0][1];
}
$url = $APIurl . "/json/triprows?trip=" . $tripid;
$trips = array_flatten(json_decode(getPage($url)));
@@ -39,18 +40,30 @@
// Track the event
$owa->trackEvent($event);
}
-timePlaceSettings();
+$url = $APIurl . "/json/tripstoptimes?trip=" . $tripid;
+$json = json_decode(getPage($url));
+$stops = $json[0];
+$times = $json[1];
+$viaPoints = Array();
+foreach ($stops as $stop) {
+ if (!startsWith($stop[5], "Wj")) {
+ $viaPoints[] = $stop[1];
+ }
+}
+echo 'Via: ' . implode(", ",$viaPoints) . '</small>';
echo '<p> Other Trips: ';
foreach ($routetrips as $othertrip) {
echo '<a href="trip.php?tripid=' . $othertrip[1] . "&routeid=" . $routeid . '">' . midnight_seconds_to_time($othertrip[0]) . '</a> ';
}
echo '</p> Other directions/timing periods: ';
+$url = $APIurl . "/json/routesearch?routeshortname=" . $trips[1]->route_short_name;
+$json = json_decode(getPage($url));
+foreach ($json as $row) {
+ if ($row[0] != $routeid) echo '<a href="trip.php?routeid=' . $row[0]. '">' . $row[2] . ' (' . ucwords($row[3]) . ')</a> ';
+}
+
echo ' <ul data-role="listview" data-inset="true">';
-$url = $APIurl . "/json/tripstoptimes?trip=" . $tripid;
-$json = json_decode(getPage($url));
-$stops = $json[0];
-$times = $json[1];
-echo '<li data-role="list-divider">' . midnight_seconds_to_time($times[0]) . '-' . midnight_seconds_to_time($times[sizeof($times) - 1]) . '</li>';
+echo '<li data-role="list-divider">' . midnight_seconds_to_time($times[0]) . '-' . midnight_seconds_to_time($times[sizeof($times) - 1]) . ' ' . $trips[1]->route_long_name .'</li>';
$stopsGrouped = Array();
foreach ($stops as $key => $row) {
if (($stops[$key][1] != $stops[$key + 1][1]) || $key + 1 >= sizeof($stops)) {
@@ -61,7 +74,7 @@
// subsequent duplicates
$stopsGrouped["stop_ids"][] = $row[0];
$stopsGrouped["endTime"] = $times[$key];
- echo '<a href="stop.php?stopids=' . implode(",",$stopsGrouped['stop_ids']) . '">';
+ echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">';
echo '<p class="ui-li-aside">' . midnight_seconds_to_time($stopsGrouped['startTime']) . ' to ' . midnight_seconds_to_time($stopsGrouped['endTime']) . '</p>';
echo bracketsMeanNewLine($row[1]);
echo '</a></li>';
--- a/view.sh
+++ b/view.sh
@@ -1,3 +1,6 @@
-python schedule_viewer.py --feed=/var/www/cbrfeed.zip \
+ #!/bin/sh
+ f=`dirname $0`
+ cd $f
+ python schedule_viewer.py --feed=/var/www/cbrfeed.zip \
--key=ABQIAAAA95XYXN0cki3Yj_Sb71CFvBTPaLd08ONybQDjcH_VdYtHHLgZvRTw2INzI_m17_IoOUqH3RNNmlTk1Q