AWS fixes and js google analytics
--- a/about.php
+++ b/about.php
@@ -4,9 +4,14 @@
?>
<p>
Busness Time - An ACT bus timetable webapp<br />
-Based on the maxious-canberra-transit-feed (<a href="cbrfeed.zip">download</a>, last updated <?php
+Based on the maxious-canberra-transit-feed (<a
+href="http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip">download</a>,
+last updated <?php
echo date("F d Y.", @filemtime('cbrfeed.zip')); ?>)<br />
-Source code for the transit feed and this site @ <a href="http://maxious.lambdacomplex.org/git">http://maxious.lambdacomplex.org/git</a><br />
+Source code for the <a
+href="https://github.com/maxious/ACTBus-data">transit
+feed</a> and <a href="https://github.com/maxious/ACTBus-ui">this
+site</a> available from github.<br />
Uses jQuery Mobile, PHP, Ruby, Python, Google Transit Feed Specification tools, OpenTripPlanner, OpenLayers, OpenStreetMap, Cloudmade Geocoder and Tile Service<br />
<br />
Feedback encouraged; contact maxious@lambdacomplex.org<br />
--- a/aws/awsStartup.sh
+++ b/aws/awsStartup.sh
@@ -4,7 +4,6 @@
#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/*
@@ -14,7 +13,8 @@
-O /var/www/cbrfeed.zip
easy_install transitfeed
easy_install simplejson
-screen -d -m /var/www/view.sh
+screen -S viewsh -X quit
+screen -S viewsh -d -m /var/www/view.sh
wget http://s3-ap-southeast-1.amazonaws.com/busresources/Graph.obj \
-O /tmp/Graph.obj
--- /dev/null
+++ b/aws/compress.conf
@@ -1,1 +1,33 @@
+#######################################################################
+##
+## Output Compression
+## --------------------
+##
+## see http://www.lighttpd.net/documentation/compress.html
+##
+server.modules += ( "mod_compress" )
+##
+## where should the compressed files be cached?
+## see the base config for the declaration of the variable.
+##
+## This directory should be changed per vhost otherwise you can
+## run into trouble with overlapping filenames
+##
+compress.cache-dir = cache_dir + "/compress"
+
+##
+## FileTypes to compress.
+##
+#compress.filetype = ("text/plain", "text/html")
+compress.filetype = ("text/plain", "text/html", "text/javascript", "text/css", "text/xml")
+
+##
+## Maximum filesize that will be compressed.
+## Default is 0, which means unlimited file size.
+##
+#compress.max-filesize = 0
+
+##
+#######################################################################
+
--- /dev/null
+++ b/aws/expire.conf
@@ -1,1 +1,29 @@
+#######################################################################
+##
+## Expire Module
+## ---------------
+##
+## See http://www.lighttpd.net/documentation/expire.html
+##
+server.modules += ( "mod_expire" )
+##
+## assignes a expiration to all files below the specified path. The
+## specification of the time is made up of:
+##
+## <access|modification> <number> <years|months|days|hours|minutes|seconds>
+##
+#expire.url = (
+# "/buggy/" => "access 2 hours",
+# "/images/" => "access plus 1 seconds 2 minutes"
+#)
+etag.use-mtime = "enable"
+etag.use-inode = "disable"
+static-file.etags = "enable"
+$HTTP["url"] =~ "\.(css|js|png|jpg|ico|gif)$" {
+ expire.url = ( "" => "access 7 days" )
+}
+
+##
+#######################################################################
+
--- a/aws/modules.conf
+++ b/aws/modules.conf
@@ -76,7 +76,7 @@
##
## mod_compress
##
-#include "conf.d/compress.conf"
+include "conf.d/compress.conf"
##
## mod_userdir
@@ -106,7 +106,7 @@
##
## mod_expire
##
-#include "conf.d/expire.conf"
+include "conf.d/expire.conf"
##
## mod_secdownload
--- a/aws/php.ini
+++ b/aws/php.ini
@@ -1,4 +1,6 @@
[PHP]
+
+date.timezone = "Australia/Sydney"
;;;;;;;;;;;;;;;;;;;
; About php.ini ;
@@ -288,7 +290,7 @@
; Note: You need to use zlib.output_handler instead of the standard
; output_handler, or otherwise the output will be corrupted.
; http://www.php.net/manual/en/zlib.configuration.php#ini.zlib.output-compression
-zlib.output_compression = Off
+zlib.output_compression = on
; http://www.php.net/manual/en/zlib.configuration.php#ini.zlib.output-compression-level
;zlib.output_compression_level = -1
@@ -1264,7 +1266,7 @@
; where MODE is the octal representation of the mode. Note that this
; does not overwrite the process's umask.
; http://www.php.net/manual/en/session.configuration.php#ini.session.save-path
-session.save_path = "/var/lib/php/session"
+session.save_path = "/tmp"
; Whether to use cookies.
; http://www.php.net/manual/en/session.configuration.php#ini.session.use-cookies
--- a/common-template.inc.php
+++ b/common-template.inc.php
@@ -1,4 +1,28 @@
<?php
+ // Copyright 2009 Google Inc. All Rights Reserved.
+ $GA_ACCOUNT = "MO-22173039-1";
+ $GA_PIXEL = "/ga.php";
+
+ function googleAnalyticsGetImageUrl() {
+ global $GA_ACCOUNT, $GA_PIXEL;
+ $url = "";
+ $url .= $GA_PIXEL . "?";
+ $url .= "utmac=" . $GA_ACCOUNT;
+ $url .= "&utmn=" . rand(0, 0x7fffffff);
+ $referer = $_SERVER["HTTP_REFERER"];
+ $query = $_SERVER["QUERY_STRING"];
+ $path = $_SERVER["REQUEST_URI"];
+ if (empty($referer)) {
+ $referer = "-";
+ }
+ $url .= "&utmr=" . urlencode($referer);
+ if (!empty($path)) {
+ $url .= "&utmp=" . urlencode($path);
+ }
+ $url .= "&guid=ON";
+ return str_replace("&", "&", $url);
+ }
+
function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false)
{
echo '
@@ -6,7 +30,9 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <title>' . $pageTitle . '</title>';
+ <title>' . $pageTitle . '</title>
+ <meta name="google-site-verification"
+content="-53T5Qn4TB_de1NyfR_ZZkEVdUNcNFSaYKSFkWKx-sY" />';
if ($datepicker) echo '<link rel="stylesheet" href="css/jquery.ui.datepicker.mobile.css" />';
if (isDebugServer()) echo '<link rel="stylesheet" href="css/jquery-mobile-1.0a3.css" />
<script type="text/javascript" src="js/jquery-1.5.js"></script>
@@ -48,7 +74,13 @@
#jqm-homeheader {
text-align: center;
}
-
+ .viaPoints {
+ display: none;
+ text-size: 0.2em;
+ }
+ .min-width-480px .viaPoints {
+ display: block;
+ }
// source http://webaim.org/techniques/skipnav/
#skip a, #skip a:hover, #skip a:visited
{
@@ -97,7 +129,23 @@
</script> ";
}
- echo '</head>
+ echo '
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-22173039-1']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type =
+'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ?
+'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
+s.parentNode.insertBefore(ga, s);
+ })();
+
+</script></head>
<body>
<div id="skip">
<a href="#maincontent">Skip to content</a>
@@ -128,6 +176,10 @@
}
echo '<div id="footer"><a href="about.php">About/Contact Us</a> <a href="feedback.php">Feedback/Bug Report</a></a>';
echo '</div>';
+ if (!isDebug()) {
+ $googleAnalyticsImageUrl = googleAnalyticsGetImageUrl();
+ echo '<img src="' . $googleAnalyticsImageUrl . '" />';
+ }
}
function timePlaceSettings($geolocate = false)
{
--- /dev/null
+++ b/ga.php
@@ -1,1 +1,187 @@
+<?php
+/**
+ Copyright 2009 Google Inc. All Rights Reserved.
+**/
+
+ // Tracker version.
+ define("VERSION", "4.4sh");
+
+ define("COOKIE_NAME", "__utmmobile");
+
+ // The path the cookie will be available to, edit this to use a different
+ // cookie path.
+ define("COOKIE_PATH", "/");
+
+ // Two years in seconds.
+ define("COOKIE_USER_PERSISTENCE", 63072000);
+
+ // 1x1 transparent GIF
+ $GIF_DATA = array(
+ chr(0x47), chr(0x49), chr(0x46), chr(0x38), chr(0x39), chr(0x61),
+ chr(0x01), chr(0x00), chr(0x01), chr(0x00), chr(0x80), chr(0xff),
+ chr(0x00), chr(0xff), chr(0xff), chr(0xff), chr(0x00), chr(0x00),
+ chr(0x00), chr(0x2c), chr(0x00), chr(0x00), chr(0x00), chr(0x00),
+ chr(0x01), chr(0x00), chr(0x01), chr(0x00), chr(0x00), chr(0x02),
+ chr(0x02), chr(0x44), chr(0x01), chr(0x00), chr(0x3b)
+ );
+
+ // The last octect of the IP address is removed to anonymize the user.
+ function getIP($remoteAddress) {
+ if (empty($remoteAddress)) {
+ return "";
+ }
+
+ // Capture the first three octects of the IP address and replace the forth
+ // with 0, e.g. 124.455.3.123 becomes 124.455.3.0
+ $regex = "/^([^.]+\.[^.]+\.[^.]+\.).*/";
+ if (preg_match($regex, $remoteAddress, $matches)) {
+ return $matches[1] . "0";
+ } else {
+ return "";
+ }
+ }
+
+ // Generate a visitor id for this hit.
+ // If there is a visitor id in the cookie, use that, otherwise
+ // use the guid if we have one, otherwise use a random number.
+ function getVisitorId($guid, $account, $userAgent, $cookie) {
+
+ // If there is a value in the cookie, don't change it.
+ if (!empty($cookie)) {
+ return $cookie;
+ }
+
+ $message = "";
+ if (!empty($guid)) {
+ // Create the visitor id using the guid.
+ $message = $guid . $account;
+ } else {
+ // otherwise this is a new user, create a new random id.
+ $message = $userAgent . uniqid(getRandomNumber(), true);
+ }
+
+ $md5String = md5($message);
+
+ return "0x" . substr($md5String, 0, 16);
+ }
+
+ // Get a random number string.
+ function getRandomNumber() {
+ return rand(0, 0x7fffffff);
+ }
+
+ // Writes the bytes of a 1x1 transparent gif into the response.
+ function writeGifData() {
+ global $GIF_DATA;
+ header("Content-Type: image/gif");
+ header("Cache-Control: " .
+ "private, no-cache, no-cache=Set-Cookie, proxy-revalidate");
+ header("Pragma: no-cache");
+ header("Expires: Wed, 17 Sep 1975 21:32:10 GMT");
+ echo join($GIF_DATA);
+ }
+
+ // Make a tracking request to Google Analytics from this server.
+ // Copies the headers from the original request to the new one.
+ // If request containg utmdebug parameter, exceptions encountered
+ // communicating with Google Analytics are thown.
+ function sendRequestToGoogleAnalytics($utmUrl) {
+ $options = array(
+ "http" => array(
+ "method" => "GET",
+ "user_agent" => $_SERVER["HTTP_USER_AGENT"],
+ "header" => ("Accepts-Language: " . $_SERVER["HTTP_ACCEPT_LANGUAGE"]))
+ );
+ if (!empty($_GET["utmdebug"])) {
+ $data = file_get_contents(
+ $utmUrl, false, stream_context_create($options));
+ } else {
+ $data = @file_get_contents(
+ $utmUrl, false, stream_context_create($options));
+ }
+ }
+
+ // Track a page view, updates all the cookies and campaign tracker,
+ // makes a server side request to Google Analytics and writes the transparent
+ // gif byte data to the response.
+ function trackPageView() {
+ $timeStamp = time();
+ $domainName = $_SERVER["SERVER_NAME"];
+ if (empty($domainName)) {
+ $domainName = "";
+ }
+
+ // Get the referrer from the utmr parameter, this is the referrer to the
+ // page that contains the tracking pixel, not the referrer for tracking
+ // pixel.
+ $documentReferer = $_GET["utmr"];
+ if (empty($documentReferer) && $documentReferer !== "0") {
+ $documentReferer = "-";
+ } else {
+ $documentReferer = urldecode($documentReferer);
+ }
+ $documentPath = $_GET["utmp"];
+ if (empty($documentPath)) {
+ $documentPath = "";
+ } else {
+ $documentPath = urldecode($documentPath);
+ }
+
+ $account = $_GET["utmac"];
+ $userAgent = $_SERVER["HTTP_USER_AGENT"];
+ if (empty($userAgent)) {
+ $userAgent = "";
+ }
+
+ // Try and get visitor cookie from the request.
+ $cookie = $_COOKIE[COOKIE_NAME];
+
+ $guidHeader = $_SERVER["HTTP_X_DCMGUID"];
+ if (empty($guidHeader)) {
+ $guidHeader = $_SERVER["HTTP_X_UP_SUBNO"];
+ }
+ if (empty($guidHeader)) {
+ $guidHeader = $_SERVER["HTTP_X_JPHONE_UID"];
+ }
+ if (empty($guidHeader)) {
+ $guidHeader = $_SERVER["HTTP_X_EM_UID"];
+ }
+
+ $visitorId = getVisitorId($guidHeader, $account, $userAgent, $cookie);
+
+ // Always try and add the cookie to the response.
+ setrawcookie(
+ COOKIE_NAME,
+ $visitorId,
+ $timeStamp + COOKIE_USER_PERSISTENCE,
+ COOKIE_PATH);
+
+ $utmGifLocation = "http://www.google-analytics.com/__utm.gif";
+
+ // Construct the gif hit url.
+ $utmUrl = $utmGifLocation . "?" .
+ "utmwv=" . VERSION .
+ "&utmn=" . getRandomNumber() .
+ "&utmhn=" . urlencode($domainName) .
+ "&utmr=" . urlencode($documentReferer) .
+ "&utmp=" . urlencode($documentPath) .
+ "&utmac=" . $account .
+ "&utmcc=__utma%3D999.999.999.999.999.1%3B" .
+ "&utmvid=" . $visitorId .
+ "&utmip=" . getIP($_SERVER["REMOTE_ADDR"]);
+
+ sendRequestToGoogleAnalytics($utmUrl);
+
+ // If the debug parameter is on, add a header to the response that contains
+ // the url that was used to contact Google Analytics.
+ if (!empty($_GET["utmdebug"])) {
+ header("X-GA-MOBILE-URL:" . $utmUrl);
+ }
+ // Finally write the gif data to the response.
+ writeGifData();
+ }
+?><?php
+ trackPageView();
+?>
+
--- a/index.php
+++ b/index.php
@@ -20,7 +20,7 @@
<li data-role="list-divider">Timetables - Routes</li>
<li><a href="routeList.php">Routes By Final Destination</a></li>
<li><a href="routeList.php?bynumber=yes">Routes By Number</a></li>
- <li><a href="routeList.php?bysuburb=yes">Stops By Suburb</a></li>
+ <li><a href="routeList.php?bysuburb=yes">Routes By Suburb</a></li>
<li><a class="nearby" href="routeList.php?nearby=yes">Nearby Routes</a></li>
</ul>
<?php
--- a/readme.txt
+++ b/readme.txt
@@ -1,30 +1,15 @@
-# input location (via GPS or favourites or search) and destination (via searchable list, optional)
-# http://10.0.1.153:8765/json/boundboxstops?n=-35.27568499917103&e=149.1346514225006&s=-35.279495003493516
-&w=149.12622928619385&limit=50
-# http://10.0.1.153:8765/json/stoptrips?stop=43&time=64440 # recursively call to show all services nearby, sort by distance, need to filter by service period
-# Hey, can pick destination again from a list filtered to places these stops go if you're curious!
-# http://10.0.1.153:8765/json/tripstoptimes?trip=2139 # Can recursively call and parse based on intended destination to show ETA
-# http://10.0.1.153:8765/json/triprows?trip=2139 # For pretty maps
+Busness Time - An ACT bus timetable webapp
+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
+and Tile Service
-have to do
+Must have view.sh running on port 8765 for this webapp to work
+
+For static maps, may have to do
/usr/sbin/setsebool -P httpd_can_network_connect=1
on fedora
-might need http://forum.jquery.com/topic/google-maps-inside-jquery-mobile
-some extras
-/json/routes = all routes
-/json/neareststops?lat/lng/number
-TODO
-Destinations
-Favourites
-OOP stops/routes
-Stop sorting/search-filter
-
-static maps
-https://code.google.com/apis/maps/documentation/staticmaps/
-http://www.multimap.com/openapidocs/1.2/web_service/staticmaps.htm
-http://dev.openstreetmap.de/staticmap/ (os @ http://sourceforge.net/projects/staticmaplite/)
-(php and open source @ http://trac.openstreetmap.org/browser/sites/other/StaticMap?rev=16348)
-http://pafciu17.dev.openstreetmap.org/
-
--- a/stop.php
+++ b/stop.php
@@ -72,10 +72,8 @@
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>';
- }
+ $viaPoints = viaPointNames($row[1][0], $stopid);
+ if ($viaPoints != "") echo '<div class="viaPoints">Via: ' . $viaPoints . '</div>';
if (sizeof($tripStopNumbers) > 0) {
echo '<br><small>Boarding At: ';
foreach ($tripStopNumbers[$row[1][0]] as $key) {
--- a/trip.php
+++ b/trip.php
@@ -34,12 +34,12 @@
$viaPoints[] = $stop[1];
}
}
-echo 'Via: ' . implode(", ", $viaPoints) . '</small>';
-echo '<p> Other Trips: ';
+echo '<p><h2>Via:</h2> ' . implode(", ", $viaPoints) . '</small></p>';
+echo '<p><h2>Other Trips:</h2> ';
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: ';
+echo '</p><p><h2>Other directions/timing periods:</h2> ';
$url = $APIurl . "/json/routesearch?routeshortname=" . $trips[1]->route_short_name;
$json = json_decode(getPage($url));
foreach ($json as $row) {