From: maxious Date: Thu, 14 Apr 2011 09:00:26 +0000 Subject: limit interpolation to between nearest timing points. X-Git-Url: https://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=63cdf2e7c8130fe4ecc34757a445a501e30de208 --- limit interpolation to between nearest timing points. --- --- a/aws/awsStartup.sh +++ b/aws/awsStartup.sh @@ -1,8 +1,8 @@ #!/bin/bash #this script should be run from a fresh git checkout from github #ami base must have yum install lighttpd-fastcgi, git, tomcat6 -#screen php-cli php-gd tomcat6-webapps tomcat6-admin-webapps svn maven2 -#postgrtes postgres-server php-pg +#php-cli php-gd tomcat6-webapps tomcat6-admin-webapps svn maven2 +#postgres postgres-server php-pg #http://www.how2forge.org/installing-lighttpd-with-php5-and-mysql-support-on-fedora-12 cp /root/aws.php /tmp/ --- a/include/common-session.inc.php +++ b/include/common-session.inc.php @@ -53,4 +53,7 @@ } debug(print_r($_SESSION, true) , "session"); +function current_time() { + return ($_SESSION['time']? $_SESSION['time'] : date("H:i:s")); +} ?> --- a/include/common-template.inc.php +++ b/include/common-template.inc.php @@ -78,6 +78,10 @@ background-image: url(css/images/113-navigation.png); background-position: 1px 0; } + .ui-icon-beaker { + background-image: url(css/images/91-beaker-2.png); + background-position: 1px 0; + } #footer { text-size: 0.75em; text-align: center; @@ -169,12 +173,6 @@ '; if ($opendiv) { echo '
-
Back

' . $pageTitle . '

@@ -224,7 +222,7 @@
- Current Time? + Current Time?
--- a/include/db/route-dao.inc.php +++ b/include/db/route-dao.inc.php @@ -40,10 +40,10 @@ } function getRouteNextTrip($routeID) { - global $conn; + 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 -arrival_time > CURRENT_TIME and routes.route_id = '$routeID' order by +arrival_time > '".current_time()."' and routes.route_id = '$routeID' order by arrival_time limit 1"; debug($query,"database"); $result = pg_query($conn, $query); @@ -53,6 +53,18 @@ } return pg_fetch_assoc($result); } + + function getTimeInterpolatedRouteAtStop($routeID, $stop_id) +{ + $nextTrip = getRouteNextTrip($routeID); + if ($nextTrip['trip_id']){ + foreach (getTimeInterpolatedTrip($nextTrip['trip_id']) as $tripStop) { + if ($tripStop['stop_id'] == $stop_id) return $tripStop; + } + } + return Array(); +} + function getRouteTrips($routeID) { global $conn; $query = "select * from routes join trips on trips.route_id = routes.route_id @@ -112,7 +124,7 @@ if ($service_period == "") $service_period = service_period(); if ($limit != "") $limit = " LIMIT $limit "; global $conn; - $query = "SELECT service_id,trips.route_id,route_short_name,route_long_name, + $query = "SELECT service_id,trips.route_id,route_short_name,route_long_name,min(stops.stop_id) as stop_id, min(ST_Distance(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), FALSE)) as distance FROM stop_times join trips on trips.trip_id = stop_times.trip_id --- a/include/db/stop-dao.inc.php +++ b/include/db/stop-dao.inc.php @@ -115,15 +115,16 @@ } return pg_fetch_all($result); } -function getStopTripsWithTimes($stopID, $time = "", $service_period = "", $time_range = "") +function getStopTripsWithTimes($stopID, $time = "", $service_period = "", $time_range = "", $limit = "") { if ($service_period == "") $service_period = service_period(); if ($time_range == "") $time_range = (24 * 60 * 60); - if ($time == "") $time = ($_SESSION['time'] ? $_SESSION['time'] : date("H:i:s")); + if ($time == "") $time = current_time(); if ($limit == "") $limit = 10; $trips = getStopTrips($stopID, $service_period, $time); $timedTrips = Array(); - foreach ($trips as $trip) { + if ($trips && sizeof($trips) > 0) { + foreach ($trips as $trip) { if ($trip['arrival_time'] != "") { if (strtotime($trip['arrival_time']) > strtotime($time) and strtotime($trip['arrival_time']) < (strtotime($time) + $time_range)) { $timedTrips[] = $trip; @@ -138,6 +139,7 @@ if (sizeof($timedTrips) > $limit) break; } sktimesort($timedTrips, "arrival_time", true); + } return $timedTrips; } ?> --- 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) { @@ -111,7 +111,18 @@ } 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; } return Array(); --- a/index.php +++ b/index.php @@ -25,6 +25,7 @@ Busness R&D'; include_footer(true) ?> --- /dev/null +++ b/labs/css @@ -1,1 +1,1 @@ - +../css/ --- /dev/null +++ b/labs/index.php @@ -1,1 +1,16 @@ + + +
+ + --- /dev/null +++ b/labs/js @@ -1,1 +1,1 @@ - +../js --- /dev/null +++ b/labs/lib @@ -1,1 +1,1 @@ - +../lib --- a/labs/myway_api.json.php +++ b/labs/myway_api.json.php @@ -74,7 +74,7 @@ } if (!isset($return['error'])) { - include_once ('simple_html_dom.php'); + include_once ('lib/simple_html_dom.php'); $page = str_get_html($pageHTML); $pageAlerts = $page->find(".smartCardAlert"); if (sizeof($pageAlerts) > 0) { --- a/labs/mywaybalance.php +++ b/labs/mywaybalance.php @@ -1,21 +1,36 @@ +
+ Back +

MyWay Balance

+ Logout +
+ +
'; + $return = Array(); +function logout() { + setcookie("card_number", "", time() - 60 * 60 * 24 * 100, "/"); + setcookie("date", "", time() - 60 * 60 * 24 * 100, "/"); + setcookie("secret_answer", "", time() - 60 * 60 * 24 * 100, "/"); +} function printBalance($cardNumber, $date, $pwrd) { global $return; - $return = json_decode(getPage(curPageURL() . "/myway_api.json.php?card_number=$cardNumber&DOBday={$date[0]}&DOBmonth={$date[1]}&DOByear={$date[2]}&secret_answer=$pwrd"), true); - - if (isset($return['error'])) { - echo "" . var_dump($return['error']) . ""; - } else { + $return = json_decode(getPage(curPageURL() . "/myway_api.json.php?card_number=$cardNumber&DOBday={$date[0]}&DOBmonth={$date[1]}&DOByear={$date[2]}&secret_answer=$pwrd") , true); + if (isset($return['error'])) { + logout(); + echo '

' . $return['error'][0] . "

"; + } + else { echo "

Balance: " . $return['myway_carddetails']['Card Balance'] . "

"; echo '
  • Recent Transactions
    • '; foreach ($return['myway_transactions'] as $transaction) { echo "
  • " . $transaction["Date / Time"] . ""; - echo "
    " . $transaction["TX Reference No / Type"]. ""; - echo '

    '.$transaction["TX Amount"].'

    '; + echo "
    " . $transaction["TX Reference No / Type"] . ""; + echo '

    ' . $transaction["TX Amount"] . '

    '; echo "
    • "; } echo "
"; @@ -25,12 +40,15 @@ $cardNumber = $_REQUEST['card_number']; $date = explode("/", $_REQUEST['date']); $pwrd = $_REQUEST['secret_answer']; - if ($_REQUEST['remember'] == true) { - $_COOKIE['card_number'] = $cardNumber; - $_COOKIE['date'] = $date; - $_COOKIE['secret_answer'] = $pwrd; + if ($_REQUEST['remember'] == "on") { + setcookie("card_number", $cardNumber, time() + 60 * 60 * 24 * 100, "/"); + setcookie("date", $_REQUEST['date'], time() + 60 * 60 * 24 * 100, "/"); + setcookie("secret_answer", $pwrd, time() + 60 * 60 * 24 * 100, "/"); } printBalance($cardNumber, $date, $pwrd); +} +else if (isset($_REQUEST['logout'])) { + echo '

Logged out of MyWay balance

Back to main menu...
'; } else if (isset($_COOKIE['card_number']) && isset($_COOKIE['date']) && isset($_COOKIE['secret_answer'])) { $cardNumber = $_COOKIE['card_number']; --- a/layar_api.php +++ b/layar_api.php @@ -9,32 +9,30 @@ $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); - -$contents = getStopsNearby($lat, $lon, 50); - +$max_distance = filter_var($_REQUEST['radius'], FILTER_SANITIZE_NUMBER_INT); +$contents = getNearbyStops($lat, $lon, 50, $max_distance); $stopNum = 0; foreach ($contents as $stop) { $stopNum++; if ($stopNum > $page_start && $stopNum <= $page_end) { $hotspot = Array(); - $hotspot['id'] = $stop[id]; - $hotspot['title'] = $stop[name]; + $hotspot['id'] = $stop['stop_id']; + $hotspot['title'] = $stop['stop_name']; $hotspot['type'] = 0; - $hotspot['lat'] = floor($stop[lat] * 1000000); - $hotspot['lon'] = floor($stop[lon] * 1000000); - $hotspot['distance'] = distance($stop[lat], $stop[lon], $_REQUEST['lat'], $_REQUEST['lon']); + $hotspot['lat'] = floor($stop['stop_lat'] * 1000000); + $hotspot['lon'] = floor($stop['stop_lon'] * 1000000); + $hotspot['distance'] = floor($stop['distance']); + $hotspot['attribution'] = "ACTION Buses"; $hotspot['actions'] = Array( Array( "label" => 'View more trips/information', - 'uri' => 'http://bus.lambdacomplex.org/' . 'stop.php?stopid=' . $stop[id] + 'uri' => 'http://bus.lambdacomplex.org/' . 'stop.php?stopid=' . $stop['stop_id'] ) ); - - $url = $APIurl . "/json/stoptrips?stop=" . $row[0] . "&time=" . midnight_seconds() . "&service_period=" . service_period() . "&limit=4&time_range=" . strval(90 * 60); - $trips = getStopTrips($stopID); + $trips = getStopTripsWithTimes($stop['stop_id'], "", "", "", 3); foreach ($trips as $key => $row) { if ($key < 3) { - $hotspot['line' . strval($key + 2) ] = $row[1][1] . ' @ ' . midnight_seconds_to_time($row[0]); + $hotspot['line' . strval($key + 2) ] = $row['route_short_name'] . ' ' . $row['route_long_name'] . ' @ ' . $row['arrival_time']; } } if (sizeof($trips) == 0) $hotspot['line2'] = 'No trips in the near future.'; @@ -49,7 +47,7 @@ $output['errorString'] = 'no results, try increasing range'; $output['errorCode'] = 21; } -if ($page_end >= $max_results || sizeof($hotspot) < $max_page) { +if ($page_end >= $max_results || sizeof($contents) < $page_start+$max_page) { $output["morePages"] = false; $output["nextPageKey"] = null; } --- a/readme.txt +++ b/readme.txt @@ -2,11 +2,10 @@ Based on the maxious-canberra-transit-feed @ http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip Source code for the https://github.com/maxious/ACTBus-data transit feed and https://github.com/maxious/ACTBus-ui this site available from github. -Uses jQuery Mobile, PHP, Ruby, Python, Google Transit Feed Specification -tools, OpenTripPlanner, OpenLayers, OpenStreetMap, Cloudmade Geocoder +Uses jQuery Mobile, PHP, PostgreSQL, OpenTripPlanner, OpenLayers, OpenStreetMap, Cloudmade Geocoder and Tile Service -Must have view.sh running on port 8765 for this webapp to work +See aws/awsStartup.sh for example startup steps For static maps, may have to do /usr/sbin/setsebool -P httpd_can_network_connect=1 --- a/routeList.php +++ b/routeList.php @@ -59,7 +59,8 @@ foreach ($routes as $route) { echo '

  • ' . $route['route_short_name'] . "

    " . $route['route_long_name'] . " (" . ucwords($route['service_id']) . ")

    "; if ($_REQUEST['nearby']) { - echo '' .floor($route['distance']) . 'm away'; + $time = getTimeInterpolatedRouteAtStop($route['route_id'], $route['stop_id']); + echo ''.($time['arrival_time']?$time['arrival_time']:"No more trips today")."
    " .floor($route['distance']) . 'm away    '; } echo "
    • \n"; } --- 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(); } --- a/tripPlanner.php +++ b/tripPlanner.php @@ -1,8 +1,8 @@ ".$url : "")); trackEvent("Trip Planner","Trip Planner Failed", $url); } else { trackEvent("Trip Planner","Plan Trip From", $from); trackEvent("Trip Planner","Plan Trip To", $to); $tripplan = json_decode($page); - debug(print_r($triplan, true)); + debug(print_r($tripplan, true)); echo "

    From: {$tripplan->plan->from->name} To: {$tripplan->plan->to->name}

    "; echo "

    At: ".formatTime($tripplan->plan->date)."

    "; if (is_array($tripplan->plan->itineraries->itinerary)) {