From: maxious Date: Mon, 07 Mar 2011 14:19:23 +0000 Subject: Add myway card balance/transaction API X-Git-Url: http://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=3282b203140613de91e5bf3119f35f364a9fd7f0 --- Add myway card balance/transaction API --- --- a/about.php +++ b/about.php @@ -1,10 +1,11 @@

Busness Time - An ACT bus timetable webapp
-Based on the maxious-canberra-transit-feed (download, last updated )
+Based on the maxious-canberra-transit-feed (download, last updated )
Source code for the transit feed and this site @ http://maxious.lambdacomplex.org/git
Uses jQuery Mobile, PHP, Ruby, Python, Google Transit Feed Specification tools, OpenTripPlanner, OpenLayers, OpenStreetMap, Cloudmade Geocoder and Tile Service

--- a/aws/awsStartup.sh +++ b/aws/awsStartup.sh @@ -1,10 +1,11 @@ #!/bin/bash #this script should be run from a fresh git checkout from http://maxious.lambdacomplex.org #ami base must have yum install lighttpd-fastcgi, git, tomcat6 -#screen php-cli php-gd tomcat6-webapps tomcat6-admin-webapps +#screen php-cli php-gd tomcat6-webapps tomcat6-admin-webapps svn maven2 #http://www.how2forge.org/installing-lighttpd-with-php5-and-mysql-support-on-fedora-12 cp -rfv /tmp/busui/* /var/www +cp /root/aws.php /tmp/ chcon -h system_u:object_r:httpd_sys_content_t /var/www chcon -R -h root:object_r:httpd_sys_content_t /var/www/* chcon -R -t httpd_sys_content_rw_t /var/www/staticmaplite/cache --- a/aws/fastcgi.conf +++ b/aws/fastcgi.conf --- a/aws/modules.conf +++ b/aws/modules.conf --- a/aws/php.ini +++ b/aws/php.ini --- a/aws/rc.local +++ b/aws/rc.local --- /dev/null +++ b/common-geo.inc.php @@ -1,1 +1,146 @@ - + $mapPoint) { + $markers.= $mapPoint[0] . "," . $mapPoint[1] . "," . $markerImage . ($index + 1); + if ($index + 1 != sizeof($mapPoints)) $markers.= "|"; + if ($mapPoint[0] < $minlat) $minlat = $mapPoint[0]; + if ($mapPoint[0] > $maxlat) $maxlat = $mapPoint[0]; + if ($mapPoint[1] < $minlon) $minlon = $mapPoint[1]; + if ($mapPoint[1] > $maxlon) $maxlon = $mapPoint[1]; + $totalLat+= $mapPoint[0]; + $totalLon+= $mapPoint[1]; + } + if ($zoom == 0) { + $mapwidthinmeters = distance($minlat, $minlon, $minlat, $maxlon); + foreach (array_reverse($metersperpixel, true) as $zoomLevel => $maxdistance) { + if ($zoom == 0 && $mapwidthinmeters < ($maxdistance + 50)) $zoom = $zoomLevel; + } + } + $center = $totalLat / sizeof($mapPoints) . "," . $totalLon / sizeof($mapPoints); + } + $output = ""; + if ($collapsible) $output.= '

Open Map...

'; + $output.= '
'; + if ($collapsible) $output.= '
'; + return $output; +} +function distance($lat1, $lng1, $lat2, $lng2) +{ + $pi80 = M_PI / 180; + $lat1*= $pi80; + $lng1*= $pi80; + $lat2*= $pi80; + $lng2*= $pi80; + $r = 6372.797; // mean radius of Earth in km + $dlat = $lat2 - $lat1; + $dlng = $lng2 - $lng1; + $a = sin($dlat / 2) * sin($dlat / 2) + cos($lat1) * cos($lat2) * sin($dlng / 2) * sin($dlng / 2); + $c = 2 * atan2(sqrt($a) , sqrt(1 - $a)); + $km = $r * $c; + return $km * 1000; +} +function decodePolylineToArray($encoded) +{ + // source: http://latlongeeks.com/forum/viewtopic.php?f=4&t=5 + $length = strlen($encoded); + $index = 0; + $points = array(); + $lat = 0; + $lng = 0; + while ($index < $length) { + // Temporary variable to hold each ASCII byte. + $b = 0; + // The encoded polyline consists of a latitude value followed by a + // longitude value. They should always come in pairs. Read the + // latitude value first. + $shift = 0; + $result = 0; + do { + // The `ord(substr($encoded, $index++))` statement returns the ASCII + // code for the character at $index. Subtract 63 to get the original + // value. (63 was added to ensure proper ASCII characters are displayed + // in the encoded polyline string, which is `human` readable) + $b = ord(substr($encoded, $index++)) - 63; + // AND the bits of the byte with 0x1f to get the original 5-bit `chunk. + // Then left shift the bits by the required amount, which increases + // by 5 bits each time. + // OR the value into $results, which sums up the individual 5-bit chunks + // into the original value. Since the 5-bit chunks were reversed in + // order during encoding, reading them in this way ensures proper + // summation. + $result|= ($b & 0x1f) << $shift; + $shift+= 5; + } + // Continue while the read byte is >= 0x20 since the last `chunk` + // was not OR'd with 0x20 during the conversion process. (Signals the end) + while ($b >= 0x20); + // Check if negative, and convert. (All negative values have the last bit + // set) + $dlat = (($result & 1) ? ~($result >> 1) : ($result >> 1)); + // Compute actual latitude since value is offset from previous value. + $lat+= $dlat; + // The next values will correspond to the longitude for this point. + $shift = 0; + $result = 0; + do { + $b = ord(substr($encoded, $index++)) - 63; + $result|= ($b & 0x1f) << $shift; + $shift+= 5; + } while ($b >= 0x20); + $dlng = (($result & 1) ? ~($result >> 1) : ($result >> 1)); + $lng+= $dlng; + // The actual latitude and longitude values were multiplied by + // 1e5 before encoding so that they could be converted to a 32-bit + // integer representation. (With a decimal accuracy of 5 places) + // Convert back to original values. + $points[] = array( + $lat * 1e-5, + $lng * 1e-5 + ); + } + return $points; +} +function geocode($query, $giveOptions) +{ + global $cloudmadeAPIkey; + $url = "http://geocoding.cloudmade.com/$cloudmadeAPIkey/geocoding/v2/find.js?query=" . urlencode($query) . "&bbox=-35.5,149.00,-35.15,149.1930&return_location=true&bbox_only=true"; + $contents = json_decode(getPage($url)); + if ($giveOptions) return $contents->features; + elseif (isset($contents->features[0]->centroid)) return $contents->features[0]->centroid->coordinates[0] . "," . $contents->features[0]->centroid->coordinates[1]; + else return ""; +} +function reverseGeocode($lat, $lng) +{ + global $cloudmadeAPIkey; + $url = "http://geocoding.cloudmade.com/$cloudmadeAPIkey/geocoding/v2/find.js?around=" . $lat . "," . $lng . "&distance=closest&object_type=road"; + $contents = json_decode(getPage($url)); + return $contents->features[0]->properties->name; +} +?> --- /dev/null +++ b/common-net.inc.php @@ -1,1 +1,23 @@ - + Database temporarily unavailable: " . curl_errno($ch) . " " . curl_error($ch) . "
"; + curl_close($ch); + debug(print_r($page,true),"json"); + return $page; +} +function curPageURL() +{ + $isHTTPS = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on"); + $port = (isset($_SERVER["SERVER_PORT"]) && ((!$isHTTPS && $_SERVER["SERVER_PORT"] != "80") || ($isHTTPS && $_SERVER["SERVER_PORT"] != "443"))); + $port = ($port) ? ':' . $_SERVER["SERVER_PORT"] : ''; + $url = ($isHTTPS ? 'https://' : 'http://') . $_SERVER["SERVER_NAME"] . $port . htmlentities(dirname($_SERVER['PHP_SELF']) , ENT_QUOTES) . "/"; + return $url; +} +?> --- /dev/null +++ b/common-template.inc.php @@ -1,1 +1,150 @@ + + + + ' . $pageTitle . ''; + if (isDebugServer()) echo ' + + '; + else echo ' + + '; + echo ' + + + + + + + + + '; + if ($geolocate) { + echo " "; + } + echo ' + + '; + if (isMetricsOn()) { + require_once ('owa/owa_env.php'); + require_once (OWA_DIR . 'owa_php.php'); + $owa = new owa_php(); + global $owaSiteID; + $owa->setSiteId($owaSiteID); + $owa->setPageTitle($pageTitle); + $owa->setPageType($pageType); + $owa->trackPageView(); + $owa->placeHelperPageTags(); + } + if ($opendiv) { + echo '
+ +
+

' . $pageTitle . '

+
+
'; + } +} +function include_footer() +{ + if ($geolocate && isset($_SESSION['lat'])) { + echo ""; + } + echo ''; +} +function timePlaceSettings($geolocate = false) +{ + global $service_periods; + $geoerror = false; + if ($geolocate == true) { + $geoerror = !isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == ""; + } + if ($geoerror) { + echo '
Sorry, but your location could not currently be detected. + Please allow location permission, wait for your location to be detected, + or enter an address/co-ordinates in the box below.
'; + } + echo '
+

Change Time/Place...

+
+
+
+ + +
+
+ + Current Time? +
+
+ + + +
+ + + +
'; +} +?> --- /dev/null +++ b/common-transit.inc.php @@ -1,1 +1,73 @@ - + 0) { + $midnight = mktime(0, 0, 0, date("n") , date("j") , date("Y")); + return date("h:ia", $midnight + $seconds); + } + else { + return ""; + } +} +function viaPoints($tripid, $stopid, $timingPointsOnly = false) +{ + global $APIurl; + $url = $APIurl . "/json/tripstoptimes?trip=" . $tripid; + $json = json_decode(getPage($url)); + debug(print_r($json, true)); + $stops = $json[0]; + $times = $json[1]; + $foundStop = false; + $viaPoints = Array(); + foreach ($stops as $key => $row) { + if ($foundStop) { + if (!$timingPointsOnly || !startsWith($row[5], "Wj")) { + $viaPoints[] = Array( + "id" => $row[0], + "name" => $row[1], + "time" => $times[$key] + ); + } + } + else { + if ($row[0] == $stopid) $foundStop = true; + } + } + return $viaPoints; +} +function viaPointNames($tripid, $stopid) +{ + $points = viaPoints($tripid, $stopid, true); + $pointNames = Array(); + foreach ($points as $point) { + $pointNames[] = $point['name']; + } + return implode(", ", $pointNames); +} +?> --- a/common.inc.php +++ b/common.inc.php @@ -1,470 +1,143 @@ centroid)) { - $session['lat'] = $contents[0]->centroid->coordinates[0]; - $session['lon'] = $contents[0]->centroid->coordinates[1]; - } - else { - $session['lat'] = ""; - $session['lon'] = ""; - } - } -//print_r ($_SESSION); -function isDebug() +if (isset($_REQUEST['service_period'])) { + $_SESSION['service_period'] = filter_var($_REQUEST['service_period'], FILTER_SANITIZE_STRING); +} +if (isset($_REQUEST['time'])) { + $_SESSION['time'] = filter_var($_REQUEST['time'], FILTER_SANITIZE_STRING); +} +if (isset($_REQUEST['geolocate'])) { + $geocoded = false; + if (isset($_REQUEST['lat']) && isset($_REQUEST['lon'])) { + $_SESSION['lat'] = filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); + $_SESSION['lon'] = filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); + } + else { + $contents = geocode(filter_var($_REQUEST['geolocate'], FILTER_SANITIZE_URL) , true); + if (isset($contents[0]->centroid)) { + $geocoded = true; + $_SESSION['lat'] = $contents[0]->centroid->coordinates[0]; + $_SESSION['lon'] = $contents[0]->centroid->coordinates[1]; + } + else { + $_SESSION['lat'] = ""; + $_SESSION['lon'] = ""; + } + } + if ($_SESSION['lat'] != "" && isMetricsOn()) { + // Create a new Instance of the tracker + $owa = new owa_php($config); + // Set the ID of the site being tracked + $owa->setSiteId($owaSiteID); + // Create a new event object + $event = $owa->makeEvent(); + // Set the Event Type, in this case a "video_play" + $event->setEventType('geolocate'); + // Set a property + $event->set('lat', $_SESSION['lat']); + $event->set('lon', $_SESSION['lon']); + $event->set('geocoded', $geocoded); + // Track the event + $owa->trackEvent($event); + } +} +debug(print_r($_SESSION, true) , "session"); +function isDebugServer() { - return $_SERVER['SERVER_NAME'] == "10.0.1.154" || $_SERVER['SERVER_NAME'] == "localhost" || $_SERVER['SERVER_NAME'] == "127.0.0.1" || !$_SERVER['SERVER_NAME']; + return $_SERVER['SERVER_NAME'] == "10.0.1.154" || $_SERVER['SERVER_NAME'] == "localhost" || $_SERVER['SERVER_NAME'] == "127.0.0.1" || !$_SERVER['SERVER_NAME']; } - +function isDebug($debugReason = "other") +{ + global $debugOkay; + return in_array($debugReason, $debugOkay, false) && isDebugServer(); +} function isMetricsOn() { - return true; + return !isDebugServer(); } - -function debug($msg) { - if (isDebug()) echo ""; +function debug($msg, $debugReason = "other") +{ + if (isDebug($debugReason)) echo "\n\n"; } -function isFastDevice() { - $fastDevices = Array("Mozilla/5.0 (X11;", "Mozilla/5.0 (Windows;", "Mozilla/5.0 (iP", "Mozilla/5.0 (Linux; U; Android", "Mozilla/4.0 (compatible; MSIE"); - $slowDevices = Array("J2ME","MIDP","Opera/","Mozilla/2.0 (compatible;","Mozilla/3.0 (compatible;"); - return true; +function isFastDevice() +{ + $ua = $_SERVER['HTTP_USER_AGENT']; + $fastDevices = Array( + "Mozilla/5.0 (X11;", + "Mozilla/5.0 (Windows;", + "Mozilla/5.0 (iP", + "Mozilla/5.0 (Linux; U; Android", + "Mozilla/4.0 (compatible; MSIE" + ); + $slowDevices = Array( + "J2ME", + "MIDP", + "Opera/", + "Mozilla/2.0 (compatible;", + "Mozilla/3.0 (compatible;" + ); + return true; } - -function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false) { - echo ' - - - - '.$pageTitle.''; - if (isDebug()) echo ' - - '; - else echo ' - - '; -echo ' - - - - - - - - - '; - if ($geolocate) { -echo " "; - } -echo ' - - '; - if (isMetricsOn()) { - require_once('owa/owa_env.php'); - require_once(OWA_DIR.'owa_php.php'); - $owa = new owa_php(); - $owa->setSiteId('bus.lambdacomplex.org'); - $owa->setPageTitle($pageTitle); - $owa->setPageType($pageType); - $owa->trackPageView(); - $owa->placeHelperPageTags(); - } - -if ($opendiv) { - echo '
- -
-

'.$pageTitle.'

-
-
'; -} -} -function include_footer() -{ - if ($geolocate && isset($_SESSION['lat'])) { - echo ""; - } - echo ''; -} - -$service_periods = Array ('sunday','saturday','weekday'); - -function service_period() -{ -if (isset($_SESSION['service_period'])) return $_SESSION['service_period']; - -switch (date('w')){ - -case 0: - return 'sunday'; -case 6: - return 'saturday'; -default: - return 'weekday'; -} -} - function remove_spaces($string) { - return str_replace(' ','',$string); + return str_replace(' ', '', $string); } - -function midnight_seconds() +function object2array($object) { -// from http://www.perturb.org/display/Perlfunc__Seconds_Since_Midnight.html -if (isset($_SESSION['time'])) { - $time = strtotime($_SESSION['time']); - return (date("G",$time) * 3600) + (date("i",$time) * 60) + date("s",$time); - } - return (date("G") * 3600) + (date("i") * 60) + date("s"); + if (is_object($object)) { + foreach ($object as $key => $value) { + $array[$key] = $value; + } + } + else { + $array = $object; + } + return $array; } - -function midnight_seconds_to_time($seconds) +function startsWith($haystack, $needle, $case = true) { -if ($seconds > 0) { - $midnight = mktime (0, 0, 0, date("n"), date("j"), date("Y")); - return date("h:ia",$midnight+$seconds); -} else { -return ""; + if ($case) { + return (strcmp(substr($haystack, 0, strlen($needle)) , $needle) === 0); + } + return (strcasecmp(substr($haystack, 0, strlen($needle)) , $needle) === 0); } +function endsWith($haystack, $needle, $case = true) +{ + if ($case) { + return (strcmp(substr($haystack, strlen($haystack) - strlen($needle)) , $needle) === 0); + } + return (strcasecmp(substr($haystack, strlen($haystack) - strlen($needle)) , $needle) === 0); } -function getPage($url) +function bracketsMeanNewLine($input) { - debug($url); - $ch = curl_init($url); -curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 ); -curl_setopt( $ch, CURLOPT_HEADER, 0 ); - curl_setopt($ch,CURLOPT_TIMEOUT,30); -$page = curl_exec($ch); - if(curl_errno($ch)) echo " Database temporarily unavailable: ".curl_errno($ch)." ".curl_error($ch).""; -curl_close($ch); -return $page; -} -function array_flatten($a,$f=array()){ - if(!$a||!is_array($a))return ''; - foreach($a as $k=>$v){ - if(is_array($v))$f=array_flatten($v,$f); - else $f[$k]=$v; - } - return $f; -} - -function staticmap($mapPoints, $zoom = 0, $markerImage = "iconb") -{ -$width = 300; -$height = 300; -$metersperpixel[9]=305.492*$width; -$metersperpixel[10]=152.746*$width; -$metersperpixel[11]=76.373*$width; -$metersperpixel[12]=38.187*$width; -$metersperpixel[13]=19.093*$width; -$metersperpixel[14]=9.547*$width; -$metersperpixel[15]=4.773*$width; -$metersperpixel[16]=2.387*$width; -// $metersperpixel[17]=1.193*$width; -$center = ""; -$markers = ""; -$minlat = 999; -$minlon = 999; -$maxlat = 0; -$maxlon = 0; - - if (sizeof($mapPoints) < 1) return "map error"; - if (sizeof($mapPoints) === 1) { - if ($zoom == 0) $zoom = 14; - $markers .= "{$mapPoints[0][0]},{$mapPoints[0][1]},$markerimage"; - $center = "{$mapPoints[0][0]},{$mapPoints[0][1]}"; - } else { - foreach ($mapPoints as $index => $mapPoint) { - $markers .= $mapPoint[0].",".$mapPoint[1].",".$markerImage.($index+1); - if ($index+1 != sizeof($mapPoints)) $markers .= "|"; - if ($mapPoint[0] < $minlat) $minlat = $mapPoint[0]; - if ($mapPoint[0] > $maxlat) $maxlat = $mapPoint[0]; - if ($mapPoint[1] < $minlon) $minlon = $mapPoint[1]; - if ($mapPoint[1] > $maxlon) $maxlon = $mapPoint[1]; - $totalLat += $mapPoint[0]; - $totalLon += $mapPoint[1]; - } - if ($zoom == 0) { - $mapwidthinmeters = distance($minlat,$minlon,$minlat,$maxlon); - foreach (array_reverse($metersperpixel,true) as $zoomLevel => $maxdistance) - { - if ($zoom == 0 && $mapwidthinmeters < ($maxdistance + 50)) $zoom = $zoomLevel; - } - } - $center = $totalLat/sizeof($mapPoints).",".$totalLon/sizeof($mapPoints); - } - $output = ""; - if(basename($_SERVER['PHP_SELF']) != "tripPlanner.php") $output .= '

Open Map...

'; - $output .= '
'; - if(basename($_SERVER['PHP_SELF']) != "tripPlanner.php") $output .= '
'; - return $output; -} - -function distance($lat1, $lng1, $lat2, $lng2) -{ - $pi80 = M_PI / 180; - $lat1 *= $pi80; - $lng1 *= $pi80; - $lat2 *= $pi80; - $lng2 *= $pi80; - - $r = 6372.797; // mean radius of Earth in km - $dlat = $lat2 - $lat1; - $dlng = $lng2 - $lng1; - $a = sin($dlat / 2) * sin($dlat / 2) + cos($lat1) * cos($lat2) * sin($dlng / 2) * sin($dlng / 2); - $c = 2 * atan2(sqrt($a), sqrt(1 - $a)); - $km = $r * $c; - - return $km * 1000; -} - -function decodePolylineToArray($encoded) -{ -// source: http://latlongeeks.com/forum/viewtopic.php?f=4&t=5 - $length = strlen($encoded); - $index = 0; - $points = array(); - $lat = 0; - $lng = 0; - - while ($index < $length) - { - // Temporary variable to hold each ASCII byte. - $b = 0; - - // The encoded polyline consists of a latitude value followed by a - // longitude value. They should always come in pairs. Read the - // latitude value first. - $shift = 0; - $result = 0; - do - { - // The `ord(substr($encoded, $index++))` statement returns the ASCII - // code for the character at $index. Subtract 63 to get the original - // value. (63 was added to ensure proper ASCII characters are displayed - // in the encoded polyline string, which is `human` readable) - $b = ord(substr($encoded, $index++)) - 63; - - // AND the bits of the byte with 0x1f to get the original 5-bit `chunk. - // Then left shift the bits by the required amount, which increases - // by 5 bits each time. - // OR the value into $results, which sums up the individual 5-bit chunks - // into the original value. Since the 5-bit chunks were reversed in - // order during encoding, reading them in this way ensures proper - // summation. - $result |= ($b & 0x1f) << $shift; - $shift += 5; - } - // Continue while the read byte is >= 0x20 since the last `chunk` - // was not OR'd with 0x20 during the conversion process. (Signals the end) - while ($b >= 0x20); - - // Check if negative, and convert. (All negative values have the last bit - // set) - $dlat = (($result & 1) ? ~($result >> 1) : ($result >> 1)); - - // Compute actual latitude since value is offset from previous value. - $lat += $dlat; - - // The next values will correspond to the longitude for this point. - $shift = 0; - $result = 0; - do - { - $b = ord(substr($encoded, $index++)) - 63; - $result |= ($b & 0x1f) << $shift; - $shift += 5; - } - while ($b >= 0x20); - - $dlng = (($result & 1) ? ~($result >> 1) : ($result >> 1)); - $lng += $dlng; - - // The actual latitude and longitude values were multiplied by - // 1e5 before encoding so that they could be converted to a 32-bit - // integer representation. (With a decimal accuracy of 5 places) - // Convert back to original values. - $points[] = array($lat * 1e-5, $lng * 1e-5); - } - - return $points; -} - -function object2array($object) { - if (is_object($object)) { - foreach ($object as $key => $value) { - $array[$key] = $value; - } - } - else { - $array = $object; - } - return $array; -} - -function geocode($query, $giveOptions) { - global $cloudmadeAPIkey; - $url = "http://geocoding.cloudmade.com/$cloudmadeAPIkey/geocoding/v2/find.js?query=".$query."&bbox=-35.5,149.00,-35.15,149.1930&return_location=true&bbox_only=true"; - $contents = json_decode(getPage($url)); - if ($giveOptions) return $contents->features; - elseif (isset($contents->features[0]->centroid)) return $contents->features[0]->centroid->coordinates[0].",".$contents->features[0]->centroid->coordinates[1]; - else return ""; -} - -function reverseGeocode($lat,$lng) { - global $cloudmadeAPIkey; - $url = "http://geocoding.cloudmade.com/$cloudmadeAPIkey/geocoding/v2/find.js?around=".$lat.",".$lng."&distance=closest&object_type=road"; - $contents = json_decode(getPage($url)); - return $contents->features[0]->properties->name; -} - -function startsWith($haystack,$needle,$case=true) { - if($case){return (strcmp(substr($haystack, 0, strlen($needle)),$needle)===0);} - return (strcasecmp(substr($haystack, 0, strlen($needle)),$needle)===0); -} - -function endsWith($haystack,$needle,$case=true) { - if($case){return (strcmp(substr($haystack, strlen($haystack) - strlen($needle)),$needle)===0);} - return (strcasecmp(substr($haystack, strlen($haystack) - strlen($needle)),$needle)===0); -} -function bracketsMeanNewLine($input) { - return str_replace(")","",str_replace("(","
",$input)); -} - -function viaPoints($tripid,$stopid, $timingPointsOnly = false) { - global $APIurl; - $url = $APIurl."/json/tripstoptimes?trip=".$tripid; - -$json = json_decode(getPage($url)); -debug(print_r($json,true)); -$stops = $json[0]; -$times = $json[1]; -$foundStop = false; -$viaPoints = Array(); -foreach ($stops as $key => $row) -{ - if ($foundStop) { - if (!$timingPointsOnly || !startsWith($row[5],"Wj") ) { - $viaPoints[] = Array("id" => $row[0], "name" => $row[1], "time" => $times[$key]); - } - } else { - if ($row[0] == $stopid) $foundStop = true; - } -} - return $viaPoints; -} - -function viaPointNames($tripid,$stopid) { - $points = viaPoints($tripid,$stopid,true); - $pointNames = Array(); - foreach ($points as $point) { - $pointNames[] = $point['name']; - } - return implode(", ",$pointNames); -} - -function timePlaceSettings($geolocate = false) { - global $service_periods; - $geoerror = false; - if ($geolocate == true) { - $geoerror = !isset($_SESSION['lat']) || !isset($_SESSION['lat']) - || $_SESSION['lat'] == "" || $_SESSION['lon'] == ""; - } - if ($geoerror) { - echo '
Sorry, but your location could not currently be detected. - Please allow location permission, wait for your location to be detected, - or enter an address/co-ordinates in the box below.
'; - } - echo '
-

Change Time/Place...

-
-
-
- - -
-
- - Current Time? -
-
- - - -
- - - -
'; + return str_replace(")", "
", str_replace("(", "
", $input)); } ?> --- a/css/jquery-mobile-1.0a3.css +++ b/css/jquery-mobile-1.0a3.css --- a/css/jquery.ui.datepicker.mobile.css +++ b/css/jquery.ui.datepicker.mobile.css --- a/feedback.php +++ b/feedback.php @@ -1,18 +1,51 @@ verifyEmailAddress($address); + //$con->listVerifiedEmailAddresses(); + $m = new SimpleEmailServiceMessage(); + $m->addTo($address); + $m->setFrom($address); + $m->setSubject($topic); + $m->setMessageFromString($message); + $con->sendEmail($m); + } + else { + // In case any of our lines are larger than 70 characters, we should use wordwrap() + $message = wordwrap($message, 70); + // Send + mail($address, $topic, $message); + } +} ?>

Add/Move/Delete a Bus Stop Location

StopID: or StopCode: + if you click on feedback from a stop page, these will get filled in automatically. else describe the location/street of the stop Suggested Stop Location (lat/long or words): + if your device supports javascript, you can pick a location from the map above + +Submit!

Bug Report/Feedback

+Please leave feedback about bugs/errors or general suggestions about improvements that could be made to the way the data is presented! + + +Submit! --- a/index.php +++ b/index.php @@ -1,13 +1,13 @@ -

busness time


Canberra Bus Timetables and Trip Planner
- Launch Trip Planner... + Launch Trip Planner...
  • Timetables - Stops
  • Major (Timing Point) Stops
  • --- a/js/jQuery.ui.datepicker.js +++ b/js/jQuery.ui.datepicker.js --- a/js/jquery-1.5.js +++ b/js/jquery-1.5.js --- a/js/jquery-mobile-1.0a3.js +++ b/js/jquery-mobile-1.0a3.js --- a/js/jquery.effects.core.js +++ b/js/jquery.effects.core.js --- a/js/jquery.ui.autocomplete.js +++ b/js/jquery.ui.autocomplete.js --- a/js/jquery.ui.datepicker.mobile.js +++ b/js/jquery.ui.datepicker.mobile.js --- a/js/jquery.ui.position.js +++ b/js/jquery.ui.position.js --- a/js/jquery.ui.widget.js +++ b/js/jquery.ui.widget.js --- a/layar_api.php +++ b/layar_api.php @@ -1,58 +1,64 @@ $page_start && $stopNum <= $page_end) { - $hotspot = Array(); - $hotspot['id'] = $row[0]; - $hotspot['title'] = $row[1]; - $hotspot['type'] = 0; - $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'] < $_REQUEST['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(); - $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; - } - } +foreach ($contents as $row) { + $stopNum++; + if ($stopNum > $page_start && $stopNum <= $page_end) { + $hotspot = Array(); + $hotspot['id'] = $row[0]; + $hotspot['title'] = $row[1]; + $hotspot['type'] = 0; + $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]); + } + } + if (sizeof($trips) == 0) $hotspot['line2'] = 'No trips in the near future.'; + $output['hotspots'][] = $hotspot; + } + } } if (sizeof($hotspot) > 0) { - $output['errorString'] = 'ok'; - $output['errorCode'] = 0; - } else { - $output['errorString'] = 'no results, try increasing range'; - $output['errorCode'] = 21; + $output['errorString'] = 'ok'; + $output['errorCode'] = 0; +} +else { + $output['errorString'] = 'no results, try increasing range'; + $output['errorCode'] = 21; } if ($page_end >= $max_results || sizeof($hotspot) < $max_page) { - $output["morePages"] = false; - $output["nextPageKey"] = null; -} else { - $output["morePages"] = true; - $output["nextPageKey"] = $page_end; + $output["morePages"] = false; + $output["nextPageKey"] = null; +} +else { + $output["morePages"] = true; + $output["nextPageKey"] = $page_end; } echo json_encode($output); ?> --- /dev/null +++ b/myway_api.json.php @@ -1,1 +1,123 @@ + "SRNO", + "DOBmonth" => "month", + "DOBday" => "day", + "DOByear" => "year", + "secret_answer" => "pwrd", + "button" => "button" +); +foreach (Array( + "card_number", + "DOBday", + "DOBmonth", + "DOByear" +) as $field_name) { + if (isset($_REQUEST[$field_name])) { + $fields[$field_name] = filter_var($_REQUEST[$field_name], FILTER_SANITIZE_NUMBER_INT); + } + else { + $return["error"][] = $field_name. " parameter invalid or unspecified"; + } +} +if (isset($_REQUEST['secret_answer'])) { + $fields['secret_answer'] = filter_var($_REQUEST['secret_answer'], FILTER_SANITIZE_STRING, Array( + FILTER_FLAG_NO_ENCODE_QUOTES, + FILTER_FLAG_STRIP_HIGH, + FILTER_FLAG_STRIP_LOW + )); +} +else { + $return["error"][] = "secret_answer parameter invalid or unspecified"; +} +$fields['button'] = 'Submit'; +$fields_string = ""; +//url-ify the data for the POST +foreach ($fields as $key => $value) { + if (sizeof($value) === 0) $return['error'][] = $key . " parameter invalid or unspecified"; + $fields_string.= $field_mapping[$key] . '=' . $value . '&'; +} +$fields_string = rtrim($fields_string, '&'); +if (!isset($return['error'])) { + //open connection + $ch = curl_init(); + //set the url, number of POST vars, POST data + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_POST, count($fields)); + curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($ch, CURLOPT_HEADER, 0); + curl_setopt($ch, CURLOPT_TIMEOUT, 30); + //execute post + $pageHTML = curl_exec($ch); + if (curl_errno($ch)) $return["error"][] = "Network error " . curl_errno($ch) . " " . curl_error($ch) . " " . $url . $fields_string; + //close connection + curl_close($ch); +} +if (!isset($return['error'])) { + include_once ('simple_html_dom.php'); + $page = str_get_html($pageHTML); + $pageAlerts = $page->find(".smartCardAlert"); + if (sizeof($pageAlerts) > 0) { + $return['error'][] = $pageAlerts[0]->plaintext; + } + if (!isset($return['error'])) { + $tableNum = 0; + $tableName = Array( + 1 => "myway_carddetails", + 2 => "myway_transactions" + ); + foreach ($page->find("table") as $table) { + $tableNum++; + $tableColumns = Array(); + $tableColumnNum = 0; + foreach ($table->find("th") as $th) { + $tableColumns[$tableColumnNum] = cleanString($th->plaintext); + $tableColumnNum++; + } + $tableRowNum = 0; + foreach ($table->find("tr") as $tr) { + $tableColumnNum = 0; + foreach ($tr->find("td") as $td) { + $return[$tableName[$tableNum]][$tableRowNum][$tableColumns[$tableColumnNum]] = cleanString($td->plaintext); + $tableColumnNum++; + } + $tableRowNum++; + } + } + } +} +if (sizeof($return) == 0) { +$return['error'][] = "No data extracted from MyWay website - API may be out of date"; +print $pageHTML; +} +header('Content-Type: text/javascript; charset=utf8'); +// header('Access-Control-Allow-Origin: http://bus.lambdacomplex.org/'); +header('Access-Control-Max-Age: 3628800'); +header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE'); +if (isset($_GET['callback'])) { + $json = '(' . json_encode($return) . ');'; //must wrap in parens and end with semicolon + print_r($_GET['callback'] . $json); //callback is prepended for json-p + +} +else echo json_encode($return); +?> --- a/routeList.php +++ b/routeList.php @@ -1,7 +1,7 @@
'; echo '
    '; -$url = $APIurl."/json/routes"; +$url = $APIurl . "/json/routes"; $contents = json_decode(getPage($url)); -debug(print_r($contents,true)); - -function printRoutes($routes){ - foreach($routes as $row) { - echo '
  • '.$row[1].' '.$row[2]." (".ucwords($row[3]).")
  • \n"; - } +function printRoutes($routes) +{ + foreach ($routes as $row) { + echo '
  • ' . $row[1] . ' ' . $row[2] . " (" . ucwords($row[3]) . ")
  • \n"; + } } - if ($_REQUEST['bynumber']) { $routeSeries = Array(); $seriesRange = Array(); foreach ($contents as $key => $row) { - foreach (explode(" ",$row[1]) as $routeNumber ) { - $seriesNum = substr($routeNumber, 0, -1)."0"; + foreach (explode(" ", $row[1]) as $routeNumber) { + $seriesNum = substr($routeNumber, 0, -1) . "0"; if ($seriesNum == "0") $seriesNum = $routeNumber; - $finalDigit = substr($routeNumber, sizeof($routeNumber)-1, 1); + $finalDigit = substr($routeNumber, sizeof($routeNumber) - 1, 1); if (isset($seriesRange[$seriesNum])) { - if ($finalDigit < $seriesRange[$seriesNum]['max']) - $seriesRange[$seriesNum]['max'] = $routeNumber; - if ($finalDigit > $seriesRange[$seriesNum]['min']) - $seriesRange[$seriesNum]['min'] = $routeNumber; - } else { + if ($finalDigit < $seriesRange[$seriesNum]['max']) $seriesRange[$seriesNum]['max'] = $routeNumber; + if ($finalDigit > $seriesRange[$seriesNum]['min']) $seriesRange[$seriesNum]['min'] = $routeNumber; + } + else { $seriesRange[$seriesNum]['max'] = $routeNumber; $seriesRange[$seriesNum]['min'] = $routeNumber; } - $routeSeries[$seriesNum][$seriesNum."-".$row[1]."-".$row[0]] = $row; + $routeSeries[$seriesNum][$seriesNum . "-" . $row[1] . "-" . $row[0]] = $row; } } ksort($routeSeries); ksort($seriesRange); - echo '
    Go to route numbers: '; - foreach ($seriesRange as $series => $range) - { - if ($range['min'] == $range['max']) echo "$series "; - else echo "{$range['min']}-{$range['max']} "; - } - echo "
    + echo '
    Go to route numbers: '; + foreach ($seriesRange as $series => $range) { + if ($range['min'] == $range['max']) echo "$series "; + else echo "{$range['min']}-{$range['max']} "; + } + echo "
    "; - foreach ($routeSeries as $series => $routes) - { - echo ''; - if ($series <= 9) echo '
  • '.$series."
      \n"; + foreach ($routeSeries as $series => $routes) { + echo ''; + if ($series <= 9) echo '
    • ' . $series . "
        \n"; else echo "
      • {$seriesRange[$series]['min']}-{$seriesRange[$series]['max']}
          \n"; - printRoutes($routes); + printRoutes($routes); echo "
      • \n"; } -} else { +} +else { foreach ($contents as $key => $row) { - $routeDestinations[$row[2]][] = $row; + $routeDestinations[$row[2]][] = $row; } echo '
        Go to Destination: '; - foreach(ksort($routeDestinations) as $destination => $routes) - { - echo "$destination "; - } - echo "
        + foreach (ksort($routeDestinations) as $destination => $routes) { + echo "$destination "; + } + echo "
"; - foreach ($routeDestinations as $destination => $routes) - { - echo ''; - echo '
  • '.$destination."...
      \n"; + foreach ($routeDestinations as $destination => $routes) { + echo ''; + echo '
    • ' . $destination . "...
        \n"; printRoutes($routes); echo "
    • \n"; } } echo "
    \n"; - - include_footer(); ?> --- a/schedule_viewer.py +++ b/schedule_viewer.py @@ -32,6 +32,7 @@ import simplejson import socket import time +import datetime import transitfeed from transitfeed import util import urllib @@ -95,6 +96,8 @@ float(stop.stop_lon), stop.location_type, stop.stop_code, stop.zone_id) class ScheduleRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): + cache = {} + def do_GET(self): scheme, host, path, x, params, fragment = urlparse.urlparse(self.path) parsed_params = {} @@ -114,7 +117,7 @@ handler_name = 'handle_json_GET_%s' % m.group(1) handler = getattr(self, handler_name, None) if callable(handler): - return self.handle_json_wrapper_GET(handler, parsed_params) + return self.handle_json_wrapper_GET(handler, parsed_params, handler_name) # Restrict allowable file names to prevent relative path attacks etc m = re.match(r'/file/([a-z0-9_-]{1,64}\.?[a-z0-9_-]{1,64})$', path) @@ -243,11 +246,22 @@ patterns.sort() return patterns - def handle_json_wrapper_GET(self, handler, parsed_params): + def handle_json_wrapper_GET(self, handler, parsed_params, handler_name): """Call handler and output the return value in JSON.""" schedule = self.server.schedule - result = handler(parsed_params) - content = ResultEncoder().encode(result) + # round times to nearest 100 seconds + if "time" in parsed_params: + parsed_params['time'] = int(round(float(parsed_params['time']),-2)) + paramkey = tuple(sorted(parsed_params.items())) + if handler_name in self.cache and paramkey in self.cache[handler_name] : + print ("Cache hit for ",handler_name," params ",parsed_params) + else: + print ("Cache miss for ",handler_name," params ",parsed_params) + result = handler(parsed_params) + if not handler_name in self.cache: + self.cache[handler_name] = {} + self.cache[handler_name][paramkey] = ResultEncoder().encode(result) + content = self.cache[handler_name][paramkey] self.send_response(200) self.send_header('Content-Type', 'text/plain') self.send_header('Content-Length', str(len(content))) @@ -272,7 +286,7 @@ schedule = self.server.schedule route = schedule.GetRoute(params.get('route', None)) return [transitfeed.Route._FIELD_NAMES, route.GetFieldValuesTuple()] - + def handle_json_GET_routetrips(self, params): """ Get a trip for a route_id (preferablly the next one) """ schedule = self.server.schedule @@ -280,7 +294,12 @@ result = [] for t in schedule.GetTripList(): if t.route_id == query: - result.append ( (t.GetStartTime(), t.trip_id) ) + try: + starttime = t.GetStartTime() + except: + print "Error for GetStartTime of trip #" + t.trip_id + sys.exc_info()[0] + else: + result.append ( (starttime, t.trip_id) ) return sorted(result, key=lambda trip: trip[0]) def handle_json_GET_triprows(self, params): @@ -407,22 +426,71 @@ if s.stop_id.lower() == query: return StopToTuple(s) return [] + def handle_json_GET_stoproutes(self, params): + """Given a stop_id return all routes to visit the stop.""" + schedule = self.server.schedule + stop = schedule.GetStop(params.get('stop', None)) + service_period = params.get('service_period', None) + trips = stop.GetTrips(schedule) + 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) + return result + + def handle_json_GET_stopalltrips(self, params): + """Given a stop_id return all trips to visit the stop.""" + schedule = self.server.schedule + stop = schedule.GetStop(params.get('stop', None)) + service_period = params.get('service_period', None) + time_trips = stop.GetStopTimeTrips(schedule) + result = [] + for time, (trip, index), tp in time_trips: + headsign = None + # Find the most recent headsign from the StopTime objects + for stoptime in trip.GetStopTimes()[index::-1]: + if stoptime.stop_headsign: + headsign = stoptime.stop_headsign + break + # If stop_headsign isn't found, look for a trip_headsign + if not headsign: + headsign = trip.trip_headsign + route = schedule.GetRoute(trip.route_id) + trip_name = '' + if route.route_short_name: + trip_name += route.route_short_name + if route.route_long_name: + if len(trip_name): + trip_name += " - " + trip_name += route.route_long_name + 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 trips to visit the stop.""" schedule = self.server.schedule stop = schedule.GetStop(params.get('stop', None)) - time = int(params.get('time', 0)) + requested_time = int(params.get('time', 0)) + limit = int(params.get('limit', 15)) service_period = params.get('service_period', None) - time_trips = stop.GetStopTimeTrips(schedule) - time_trips.sort() # OPT: use bisect.insort to make this O(N*ln(N)) -> O(N) - # Keep the first 15 after param 'time'. - # Need make a tuple to find correct bisect point - time_trips = time_trips[bisect.bisect_left(time_trips, (time, 0)):] - time_trips = time_trips[:15] + time_range = params.get('time_range', 24*60*60) + + + filtered_time_trips = [] + for trip, index in stop._GetTripIndex(schedule): + tripstarttime = trip.GetStartTime() + if tripstarttime > requested_time and tripstarttime < (requested_time + time_range): + time, stoptime, tp = trip.GetTimeInterpolatedStops()[index] + if time > requested_time and time < (requested_time + time_range): + bisect.insort(filtered_time_trips, (time, (trip, index), tp)) + result = [] - for time, (trip, index), tp in time_trips: + for time, (trip, index), tp in filtered_time_trips: + if len(result) > limit: + break headsign = None # Find the most recent headsign from the StopTime objects for stoptime in trip.GetStopTimes()[index::-1]: @@ -566,12 +634,13 @@ if options.key and os.path.isfile(options.key): options.key = open(options.key).read().strip() - + schedule = transitfeed.Schedule(problem_reporter=transitfeed.ProblemReporter()) print 'Loading data from feed "%s"...' % options.feed_filename print '(this may take a few minutes for larger cities)' + t0 = datetime.datetime.now() schedule.Load(options.feed_filename) - + print ("Loaded in", (datetime.datetime.now() - t0).seconds , "seconds") server = StoppableHTTPServer(server_address=('', options.port), RequestHandlerClass=RequestHandlerClass) server.key = options.key @@ -579,6 +648,8 @@ server.file_dir = options.file_dir server.host = options.host server.feed_path = options.feed_filename + + print ("To view, point your browser at http://localhost:%d/" % (server.server_port)) --- /dev/null +++ b/ses.php @@ -1,1 +1,704 @@ - +__accessKey; } + public function getSecretKey() { return $this->__secretKey; } + public function getHost() { return $this->__host; } + + protected $__verifyHost = 1; + protected $__verifyPeer = 1; + + // verifyHost and verifyPeer determine whether curl verifies ssl certificates. + // It may be necessary to disable these checks on certain systems. + // These only have an effect if SSL is enabled. + public function verifyHost() { return $this->__verifyHost; } + public function enableVerifyHost($enable = true) { $this->__verifyHost = $enable; } + + public function verifyPeer() { return $this->__verifyPeer; } + public function enableVerifyPeer($enable = true) { $this->__verifyPeer = $enable; } + + /** + * Constructor + * + * @param string $accessKey Access key + * @param string $secretKey Secret key + * @return void + */ + public function __construct($accessKey = null, $secretKey = null, $host = 'email.us-east-1.amazonaws.com') { + if ($accessKey !== null && $secretKey !== null) { + $this->setAuth($accessKey, $secretKey); + } + $this->__host = $host; + } + + /** + * Set AWS access key and secret key + * + * @param string $accessKey Access key + * @param string $secretKey Secret key + * @return void + */ + public function setAuth($accessKey, $secretKey) { + $this->__accessKey = $accessKey; + $this->__secretKey = $secretKey; + } + + /** + * Lists the email addresses that have been verified and can be used as the 'From' address + * + *