From: maxious Date: Fri, 15 Apr 2011 14:08:30 +0000 Subject: Service warnings for changed timetable days X-Git-Url: http://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=a0bda5d898199a4d51fd890589fa3d284a72ba43 --- Service warnings for changed timetable days --- --- a/feedback.php +++ b/feedback.php @@ -48,7 +48,7 @@ if you click on feedback from a stop page, these will get filled in automatically. else describe the location/street of the stop in one of these boxes
Suggested Stop Location (lat/long or words):
- if your device supports javascript, you can pick a location from the map above
+ --- a/include/common-template.inc.php +++ b/include/common-template.inc.php @@ -74,14 +74,14 @@ .ui-listview-filter { margin: 0 !important; } - .ui-icon-navigation { + .ui-icon-navigation { background-image: url(css/images/113-navigation.png); background-position: 1px 0; } - .ui-icon-beaker { + .ui-icon-beaker { background-image: url(css/images/91-beaker-2.png); background-position: 1px 0; - } + } #footer { text-size: 0.75em; text-align: center; @@ -102,6 +102,14 @@ #extrainfo { visibility: hidden; display: none; + } + #servicewarning { + padding: 1em; + margin-bottom: 0.5em; + text-size: 0.2em; + background-color: #FF9; + -moz-border-radius: 15px; +border-radius: 15px; } // source http://webaim.org/techniques/skipnav/ #skip a, #skip a:hover, #skip a:visited @@ -180,6 +188,12 @@
'; + if (!$_SESSION['service_id']) { + $overrides = getServiceOverride(); + if ($overrides['service_id']){ + echo '
Buses are running on an altered timetable today due to industrial action/public holiday. See http://www.action.act.gov.au for details.
'; + } + } } } function include_footer() --- a/include/common-transit.inc.php +++ b/include/common-transit.inc.php @@ -4,9 +4,26 @@ 'saturday', 'weekday' ); +function getServiceOverride() { + global $conn; + $query = "Select * from calendar_dates where date = '".date("Ymd")."' and exception_type = '1'"; + debug($query,"database"); + $result = pg_query($conn, $query); + if (!$result) { + databaseError(pg_result_error($result)); + return Array(); + } + return pg_fetch_assoc($result); +} function service_period() { + if (isset($_SESSION['service_period'])) return $_SESSION['service_period']; + $override = getServiceOverride(); + if ($override['service_id']){ + return $override['service_id']; + } + switch (date('w')) { case 0: return 'sunday'; --- a/include/db/route-dao.inc.php +++ b/include/db/route-dao.inc.php @@ -47,11 +47,25 @@ arrival_time limit 1"; debug($query,"database"); $result = pg_query($conn, $query); - if (!$result) { + if (!$result) { databaseError(pg_result_error($result)); return Array(); } - return pg_fetch_assoc($result); + $r = pg_fetch_assoc($result); + // past last trip of the day special case + if (sizeof($r) == 0) { + $query = "select * from routes join trips on trips.route_id = routes.route_id +join stop_times on stop_times.trip_id = trips.trip_id where routes.route_id = '$routeID' order by +arrival_time DESC limit 1"; + debug($query,"database"); + $result = pg_query($conn, $query); + if (!$result) { + databaseError(pg_result_error($result)); + return Array(); + } + $r = pg_fetch_assoc($result); + } + return $r; } function getTimeInterpolatedRouteAtStop($routeID, $stop_id) @@ -67,8 +81,8 @@ function getRouteTrips($routeID) { global $conn; - $query = "select * from routes join trips on trips.route_id = routes.route_id -join stop_times on stop_times.trip_id = trips.trip_id where routes.route_id = '$routeID' order by + $query = "select routes.route_id,trips.trip_id,service_id,arrival_time, stop_id, stop_sequence from routes join trips on trips.route_id = routes.route_id +join stop_times on stop_times.trip_id = trips.trip_id where routes.route_id = '$routeID' and stop_sequence = '1' order by arrival_time "; debug($query,"database"); $result = pg_query($conn, $query); --- a/include/db/stop-dao.inc.php +++ b/include/db/stop-dao.inc.php @@ -84,18 +84,17 @@ $afterCondition = "AND arrival_time > '$afterTime'"; global $conn; if ($afterTime != "") { - $query = " SELECT stop_times.trip_id,stop_times.arrival_time,stop_times.stop_id,stop_sequence,service_id,trips.route_id,route_short_name,route_long_name, start_times.arrival_time as start_time + $query = " SELECT stop_times.trip_id,stop_times.arrival_time,stop_times.stop_id,stop_sequence,service_id,trips.route_id,route_short_name,route_long_name, end_times.arrival_time as end_time FROM stop_times join trips on trips.trip_id = stop_times.trip_id -join routes on trips.route_id = routes.route_id , (SELECT trip_id,arrival_time from stop_times - WHERE stop_times.arrival_time IS NOT NULL - AND stop_sequence = '1') as start_times +join routes on trips.route_id = routes.route_id , (SELECT trip_id,max(arrival_time) as arrival_time from stop_times + WHERE stop_times.arrival_time IS NOT NULL group by trip_id) as end_times WHERE stop_times.stop_id = '$stopID' -AND stop_times.trip_id = start_times.trip_id +AND stop_times.trip_id = end_times.trip_id AND service_id='$service_period' -AND start_times.arrival_time > '$afterTime' -ORDER BY start_time"; +AND end_times.arrival_time > '$afterTime' +ORDER BY end_time"; } else { $query = "SELECT stop_times.trip_id,arrival_time,stop_times.stop_id,stop_sequence,service_id,trips.route_id,route_short_name,route_long_name --- a/include/db/trip-dao.inc.php +++ b/include/db/trip-dao.inc.php @@ -49,7 +49,7 @@ points.append((stop.stop_lat, stop.stop_lon)) return points*/ } -function getTimeInterpolatedTrip($tripID) +function getTimeInterpolatedTrip($tripID, $range = "") { global $conn; $query = "SELECT stop_times.trip_id,arrival_time,stop_times.stop_id,stop_lat,stop_lon,stop_name,stop_code, @@ -58,7 +58,7 @@ join trips on trips.trip_id = stop_times.trip_id join routes on trips.route_id = routes.route_id join stops on stops.stop_id = stop_times.stop_id -WHERE trips.trip_id = '$tripID' ORDER BY stop_sequence"; +WHERE trips.trip_id = '$tripID' $range ORDER BY stop_sequence"; debug($query, "database"); $result = pg_query($conn, $query); if (!$result) { @@ -109,11 +109,21 @@ } return $rv; } -function getTimeInterpolatedTripAtStop($tripID, $stop_sequence, $stop_id = "") +function getTimeInterpolatedTripAtStop($tripID, $stop_sequence) { - foreach (getTimeInterpolatedTrip($tripID) as $tripStop) { + global $conn; + // limit interpolation to between nearest actual points. + $prevTimePoint = pg_fetch_assoc(pg_query($conn," SELECT trip_id,stop_id, + stop_sequence +FROM stop_times +WHERE trip_id = '$tripID' and stop_sequence < $stop_sequence and stop_times.arrival_time IS NOT NULL ORDER BY stop_sequence DESC LIMIT 1")); + $nextTimePoint = pg_fetch_assoc(pg_query($conn," SELECT trip_id,stop_id, + stop_sequence +FROM stop_times +WHERE trip_id = '$tripID' and stop_sequence > $stop_sequence and stop_times.arrival_time IS NOT NULL ORDER BY stop_sequence LIMIT 1")); + $range = "AND stop_sequence >= '{$prevTimePoint['stop_sequence']}' AND stop_sequence <= '{$nextTimePoint['stop_sequence']}'"; + foreach (getTimeInterpolatedTrip($tripID,$range) as $tripStop) { if ($tripStop['stop_sequence'] == $stop_sequence) return $tripStop; - if ($tripStop['stop_id'] == $stop_id) return $tripStop; } return Array(); } @@ -133,6 +143,22 @@ $r = pg_fetch_assoc($result); return $r['arrival_time']; } +function getActiveTrips($time) +{ + global $conn; + if ($time == "") $time = current_time(); + $query = "Select distinct stop_times.trip_id, start_times.arrival_time as start_time, end_times.arrival_time as end_time from stop_times, (SELECT trip_id,arrival_time from stop_times WHERE stop_times.arrival_time IS NOT NULL +AND stop_sequence = '1') as start_times, (SELECT trip_id,max(arrival_time) as arrival_time from stop_times WHERE stop_times.arrival_time IS NOT NULL group by trip_id) as end_times +WHERE start_times.trip_id = end_times.trip_id AND stop_times.trip_id = end_times.trip_id AND $time > start_times.arrival_time AND $time < end_times.arrival_time"; + debug($query, "database"); + $result = pg_query($conn, $query); + if (!$result) { + databaseError(pg_result_error($result)); + return Array(); + } + return pg_fetch_all($result); +} + function viaPointNames($tripid, $stop_sequence = "") { global $conn; --- a/readme.txt +++ b/readme.txt @@ -5,10 +5,19 @@ Uses jQuery Mobile, PHP, PostgreSQL, OpenTripPlanner, OpenLayers, OpenStreetMap, Cloudmade Geocoder and Tile Service -See aws/awsStartup.sh for example startup steps +See aws/awsStartup.sh for example startup steps. You need to load the included database dump; +for other transit networks you can use the updatedb.php script to load. -For static maps, may have to do +For openstreetmap static maps, may have to do /usr/sbin/setsebool -P httpd_can_network_connect=1 -on fedora +on Fedora and other SELinux systems. + +To enter a service override, you can use the psql tool. eg. +transitdata=# COPY calendar_dates (service_id, date, exception_type) FROM stdin; +Enter data to be copied [spaced with tabs] followed by a newline. +End with a backslash and a period on a line by itself. +>> saturday 20110416 2 +>> sunday 20110416 1 +>> \. --- a/stop.php +++ b/stop.php @@ -57,9 +57,9 @@ if (!isset($allStopsTrips[$trip["trip_id"]])) $allStopsTrips[$trip["trip_id"]] = $trip; } } - else { - echo "skipped sequence $tripSequence"; - } + //else { + // echo "skipped sequence $tripSequence"; + //} } } include_header($stop['stop_name'], "stop"); --- a/trip.php +++ b/trip.php @@ -46,8 +46,11 @@ $stopsGrouped["stop_ids"][] = $tripStopTime['stop_id']; $stopsGrouped["endTime"] = $tripStopTime['arrival_time']; echo ''; - - echo '

' . $stopsGrouped['startTime'] . ' to ' . $stopsGrouped['endTime'] . '

'; + echo '

' . $stopsGrouped['startTime'] . ' to ' . $stopsGrouped['endTime']; + echo '

'; + if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { + echo '' . distance($stop['stop_lat'],$stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away'; + } echo bracketsMeanNewLine($tripStopTime["stop_name"]); echo ''; flush(); @ob_flush(); @@ -57,7 +60,10 @@ // just a normal stop echo ''; echo '

' . $tripStopTime['arrival_time'] . '

'; - echo bracketsMeanNewLine($tripStopTime['stop_name']); + if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { + echo '' . distance($stop['stop_lat'],$stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away'; + } + echo bracketsMeanNewLine($tripStopTime['stop_name']); echo ''; flush(); @ob_flush(); }