Dotcloud support
--- /dev/null
+++ b/aws/awsStartup.sh
@@ -1,1 +1,36 @@
+#!/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
+#http://www.how2forge.org/installing-lighttpd-with-php5-and-mysql-support-on-fedora-12
+cp /root/aws.php /tmp/
+mkdir /var/www/lib/staticmaplite/cache
+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/lib/staticmaplite/cache
+chmod -R 777 /var/www/lib/staticmaplite/cache
+wget http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip \
+-O /var/www/cbrfeed.zip
+
+createdb transitdata
+createlang -d transitdata plpgsql
+psql -d transitdata -f /var/www/lib/postgis.sql
+# curl https://github.com/maxious/ACTBus-ui/raw/master/transitdata.cbrfeed.sql.gz -o transitdata.cbrfeed.sql.gz
+#made with pg_dump transitdata | gzip -c > transitdata.cbrfeed.sql.gz
+gunzip /var/www/transitdata.cbrfeed.sql.gz
+psql -d transitdata -f /var/www/transitdata.cbrfeed.sql
+#createuser transitdata -SDRP
+#password transitdata
+#psql -c \"GRANT SELECT ON TABLE agency,calendar,calendar_dates,routes,stop_times,stops,trips TO transitdata;\"
+php /var/www/updatedb.php
+
+wget http://s3-ap-southeast-1.amazonaws.com/busresources/Graph.obj \
+-O /tmp/Graph.obj
+rm -rfv /usr/share/tomcat6/webapps/opentripplanner*
+wget http://s3-ap-southeast-1.amazonaws.com/busresources/opentripplanner-webapp.war \
+-O /usr/share/tomcat6/webapps/opentripplanner-webapp.war
+wget http://s3-ap-southeast-1.amazonaws.com/busresources/opentripplanner-api-webapp.war \
+-O /usr/share/tomcat6/webapps/opentripplanner-api-webapp.war
+/etc/init.d/tomcat6 restart
+
--- /dev/null
+++ b/include/common-db.inc.php
@@ -1,1 +1,16 @@
-
+<?php
+ if ($isDebugServer) $conn = pg_connect("dbname=transitdata user=postgres password=snmc");
+ if (php_uname('n') == "actbus-www") $conn = pg_connect("dbname=transitdata user=transitdata password=transitdata host=db.actbus.dotcloud.com port=2242");
+ if (!$conn) {
+ echo "An error occured.\n";
+ exit;
+ }
+
+ function databaseError($errMsg) {
+ die($errMsg);
+ }
+
+ include('db/route-dao.inc.php');
+ include('db/trip-dao.inc.php');
+ include('db/stop-dao.inc.php');
+ ?>
--- a/include/db/route-dao.inc.php
+++ b/include/db/route-dao.inc.php
@@ -40,6 +40,7 @@
}
function getRouteNextTrip($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
arrival_time > CURRENT_TIME and routes.route_id = '$routeID' order by
@@ -52,7 +53,19 @@
}
return pg_fetch_assoc($result);
}
-
+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
+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 getRoutesByDestination($destination = "", $service_period = "") {
global $conn;
if ($service_period == "") $service_period = service_period();
--- a/include/db/trip-dao.inc.php
+++ b/include/db/trip-dao.inc.php
@@ -2,7 +2,10 @@
function getTrip($tripID)
{
global $conn;
- $query = "Select * from trips where trip_id = '$tripID' join routes on trips.route_id = routes.route_id LIMIT 1";
+ $query = "Select * from trips
+ join routes on trips.route_id = routes.route_id
+ where trip_id = '$tripID'
+ LIMIT 1";
debug($query, "database");
$result = pg_query($conn, $query);
if (!$result) {
@@ -49,7 +52,7 @@
function getTimeInterpolatedTrip($tripID)
{
global $conn;
- $query = "SELECT stop_times.trip_id,arrival_time,stop_times.stop_id,stop_lat,stop_lon,
+ $query = "SELECT stop_times.trip_id,arrival_time,stop_times.stop_id,stop_lat,stop_lon,stop_name,stop_code,
stop_sequence,service_id,trips.route_id,route_short_name,route_long_name
FROM stop_times
join trips on trips.trip_id = stop_times.trip_id
@@ -129,14 +132,14 @@
$r = pg_fetch_assoc($result);
return $r['arrival_time'];
}
-function viaPointNames($tripid, $stopid)
+function viaPointNames($tripid, $stop_sequence = "")
{
global $conn;
$query = "SELECT stop_name
FROM stop_times join stops on stops.stop_id = stop_times.stop_id
WHERE stop_times.trip_id = '$tripid'
-AND stop_sequence > '$stop_sequence'
-AND substr(stop_code,1,2) != 'Wj' ORDER BY stop_sequence";
+".($stop_sequence != "" ? "AND stop_sequence > '$stop_sequence'" : "").
+"AND substr(stop_code,1,2) != 'Wj' ORDER BY stop_sequence";
debug($query, "database");
$result = pg_query($conn, $query);
if (!$result) {
--- a/postinstall
+++ b/postinstall
@@ -1,32 +1,17 @@
#!/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
-#http://www.how2forge.org/installing-lighttpd-with-php5-and-mysql-support-on-fedora-12
+#dotcloud postinstall
-cp /root/aws.php /tmp/
-mkdir /var/www/lib/staticmaplite/cache
-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/lib/staticmaplite/cache
-chmod -R 777 /var/www/lib/staticmaplite/cache
-wget http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip \
--O /var/www/cbrfeed.zip
+curl http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip \
+-o /home/dotcloud/current/cbrfeed.zip
-createdb transitdata
-#made with pg_dump transitdata | gzip -c > transitdata.cbrfeed.sql.gz
-gunzip /var/www/transitdata.cbrfeed.sql.gz
-psql -d transitdata -f /var/www/transitdata.cbrfeed.sql
-createlang -d transitdata plpgsql
-psql -d transitdata -f /var/www/lib/postgis.sql
-php /var/www/updatedb.php
+#db setup
+#curl https://github.com/maxious/ACTBus-ui/raw/master/transitdata.cbrfeed.sql.gz -o transitdata.cbrfeed.sql.gz
+#curl https://github.com/maxious/ACTBus-ui/raw/master/lib/postgis.sql -o postgis.sql
+#createlang -d transitdata plpgsql
+#psql -d transitdata -f postgis.sql
+#gunzip /var/www/transitdata.cbrfeed.sql.gz
+#psql -d transitdata -f transitdata.cbrfeed.sql
+#createuser transitdata -SDRP
+#password transitdata
+#psql -c \"GRANT SELECT ON TABLE agency,calendar,calendar_dates,routes,stop_times,stops,trips TO transitdata;\"
-wget http://s3-ap-southeast-1.amazonaws.com/busresources/Graph.obj \
--O /tmp/Graph.obj
-rm -rfv /usr/share/tomcat6/webapps/opentripplanner*
-wget http://s3-ap-southeast-1.amazonaws.com/busresources/opentripplanner-webapp.war \
--O /usr/share/tomcat6/webapps/opentripplanner-webapp.war
-wget http://s3-ap-southeast-1.amazonaws.com/busresources/opentripplanner-api-webapp.war \
--O /usr/share/tomcat6/webapps/opentripplanner-api-webapp.war
-/etc/init.d/tomcat6 restart
-
--- a/stop.php
+++ b/stop.php
@@ -94,8 +94,8 @@
foreach ($trips as $trip) {
echo '<li>';
echo '<a href="trip.php?stopid=' . $stopid . '&tripid=' . $trip['trip_id'] . '"><h3>' . $trip['route_short_name'] . " " . $trip['route_long_name'] . "</h3><p>";
- //$viaPoints = viaPointNames($trip['trip_id'], $trip['stop_sequence']);
- //if ($viaPoints != "") echo '<br><span class="viaPoints">Via: ' . $viaPoints . '</span>';
+ $viaPoints = viaPointNames($trip['trip_id'], $trip['stop_sequence']);
+ if ($viaPoints != "") echo '<br><span class="viaPoints">Via: ' . $viaPoints . '</span>';
if (sizeof($tripStopNumbers) > 0) {
echo '<br><small>Boarding At: ';
foreach ($tripStopNumbers[$trip['trip_id']] as $key) {
Binary files a/transitdata.cbrfeed.sql.gz and b/transitdata.cbrfeed.sql.gz differ
--- a/transitdata.sql
+++ /dev/null
@@ -1,59 +1,1 @@
---
--- PostgreSQL database dump
---
-SET statement_timeout = 0;
-SET client_encoding = 'UTF8';
-SET standard_conforming_strings = off;
-SET check_function_bodies = false;
-SET client_min_messages = warning;
-SET escape_string_warning = off;
-
-SET search_path = public, pg_catalog;
-
-SET default_tablespace = '';
-
-SET default_with_oids = false;
-
---
--- Name: trips; Type: TABLE; Schema: public; Owner: postgres; Tablespace:
---
-
-CREATE TABLE trips (
- route_id integer,
- trip_id integer NOT NULL,
- trip_headsign text,
- service_id text
-);
-
-
-ALTER TABLE public.trips OWNER TO postgres;
-
---
--- Data for Name: trips; Type: TABLE DATA; Schema: public; Owner: postgres
---
-
-COPY trips (route_id, trip_id, trip_headsign, service_id) FROM stdin;
-\.
-
-
---
--- Name: trips_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres; Tablespace:
---
-
-ALTER TABLE ONLY trips
- ADD CONSTRAINT trips_pkey PRIMARY KEY (trip_id);
-
-
---
--- Name: routetrips; Type: INDEX; Schema: public; Owner: postgres; Tablespace:
---
-
-CREATE INDEX routetrips ON trips USING btree (route_id);
-
-
---
--- PostgreSQL database dump complete
---
-
-
--- a/trip.php
+++ b/trip.php
@@ -3,95 +3,81 @@
$tripid = filter_var($_REQUEST['tripid'], FILTER_SANITIZE_NUMBER_INT);
$stopid = filter_var($_REQUEST['stopid'], FILTER_SANITIZE_NUMBER_INT);
$routeid = filter_var($_REQUEST['routeid'], FILTER_SANITIZE_NUMBER_INT);
+
$routetrips = Array();
+
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[2] > midnight_seconds()) {
- $tripid = $trip[1];
- break;
- }
- }
- if ($tripid == 0) $tripid = $routetrips[0][1];
+ $trip = getRouteNextTrip($routeid);
+ $tripid = $trip['trip_id'];
+} else {
+ $trip = getTrip($tripid);
+ $routeid = $trip["route_id"];
}
-$url = $APIurl . "/json/triprows?trip=" . $tripid;
-$trips = array_flatten(json_decode(getPage($url)));
-if (sizeof($routetrips) == 0) {
- $routeid = $trips[1]->route_id;
- $url = $APIurl . "/json/routetrips?route_id=" . $trips[1]->route_id;
- $routetrips = json_decode(getPage($url));
-}
-include_header("Stops on " . $trips[1]->route_short_name . ' ' . $trips[1]->route_long_name, "trip");
-trackEvent("Route/Trip View","View Route", $trips[1]->route_short_name . ' ' . $trips[1]->route_long_name, $trips[1]->route_id);
-$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 '<p><h2>Via:</h2> ' . implode(", ", $viaPoints) . '</small></p>';
+
+$routetrips = getRouteTrips($routeid);
+
+include_header("Stops on " . $trip['route_short_name'] . ' ' . $trip['route_long_name'], "trip");
+trackEvent("Route/Trip View","View Route", $trip['route_short_name'] . ' ' . $trip['route_long_name'], $routeid);
+
+
+echo '<p><h2>Via:</h2> ' . viaPointNames($tripid) . '</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> ';
+foreach (getRouteTrips($routeid) as $othertrip) {
+ echo '<a href="trip.php?tripid=' . $othertrip['trip_id'] . "&routeid=" . $routeid . '">' . str_replace(" ",":00",str_replace(":00"," ",$othertrip['arrival_time'])). '</a> ';
}
flush(); @ob_flush();
echo '</p><p><h2>Other directions/timing periods:</h2> ';
-$url = $APIurl . "/json/routesearch?routeshortname=" . rawurlencode($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> ';
+foreach (getRoutesByNumber($trip['route_short_name']) as $row) {
+ if ($row['route_id'] != $routeid) echo '<a href="trip.php?routeid=' . $row['route_id'] . '">' . $row['route_long_name'] . ' (' . ucwords($row['service_id']) . ')</a> ';
}
flush(); @ob_flush();
echo ' <ul data-role="listview" data-inset="true">';
-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)) {
+$tripStopTimes = getTimeInterpolatedTrip($tripid);
+echo '<li data-role="list-divider">' . $tripStopTimes[0]['arrival_time'] . ' to ' . $tripStopTimes[sizeof($tripStopTimes) - 1]['arrival_time'] . ' ' . $trips[1]->route_long_name . '</li>';
+
+foreach ($tripStopTimes as $key => $tripStopTime) {
+ if (($tripStopTimes[$key]["stop_name"] != $tripStopTimes[$key + 1]["stop_name"]) || $key + 1 >= sizeof($tripStopTimes)) {
echo '<li>';
- if (!startsWith($row[5], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">';
+ if (!startsWith($tripStopTime['stop_code'], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">';
if (sizeof($stopsGrouped) > 0) {
// print and empty grouped stops
// subsequent duplicates
- $stopsGrouped["stop_ids"][] = $row[0];
- $stopsGrouped["endTime"] = $times[$key];
+ $stopsGrouped["stop_ids"][] = $tripStopTime['stop_id'];
+ $stopsGrouped["endTime"] = $tripStopTime['arrival_time'];
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 '<p class="ui-li-aside">' . $stopsGrouped['startTime'] . ' to ' . $stopsGrouped['endTime'] . '</p>';
+ echo bracketsMeanNewLine($tripStopTime["stop_name"]);
echo '</a></li>';
flush(); @ob_flush();
$stopsGrouped = Array();
}
else {
// just a normal stop
- echo '<a href="stop.php?stopid=' . $row[0] . (startsWith($row[5], "Wj") ? '&stopcode=' . $row[5] : "") . '">';
- echo '<p class="ui-li-aside">' . midnight_seconds_to_time($times[$key]) . '</p>';
- echo bracketsMeanNewLine($row[1]);
+ echo '<a href="stop.php?stopid=' . $tripStopTime['stop_id'] . (startsWith($tripStopTime['stop_code'], "Wj") ? '&stopcode=' . $tripStopTime['stop_code'] : "") . '">';
+ echo '<p class="ui-li-aside">' . $tripStopTime['arrival_time'] . '</p>';
+ echo bracketsMeanNewLine($tripStopTime['stop_name']);
echo '</a></li>';
flush(); @ob_flush();
}
}
else {
// this is a duplicated line item
- if ($key - 1 <= 0 || ($stops[$key][1] != $stops[$key - 1][1])) {
+ if ($key - 1 <= 0 || ($tripStopTimes[$key]['stop_name'] != $tripStopTimes[$key - 1]['stop_name'])) {
// first duplicate
$stopsGrouped = Array(
- "name" => $row[1],
- "startTime" => $times[$key],
+ "name" => $tripStopTime['stop_name'],
+ "startTime" => $tripStopTime['arrival_time'],
"stop_ids" => Array(
- $row[0]
+ $tripStopTime['stop_id']
)
);
}
else {
// subsequent duplicates
- $stopsGrouped["stop_ids"][] = $row[0];
- $stopsGrouped["endTime"] = $times[$key];
+ $stopsGrouped["stop_ids"][] = $tripStopTime['stop_id'];
+ $stopsGrouped["endTime"] = $tripStopTime['arrival_time'];
}
}
}
--- a/updatedb.php
+++ b/updatedb.php
@@ -1,9 +1,11 @@
<?php
-include('lib/common-db.inc.php');
+include('include/common-db.inc.php');
// Unzip cbrfeed.zip, import all csv files to database
+$unzip = true;
$zip = zip_open(dirname(__FILE__) . "/cbrfeed.zip");
$tmpdir = "/tmp/cbrfeed/";
mkdir($tmpdir);
+if ($unzip) {
if (is_resource($zip)) {
while ($zip_entry = zip_read($zip)) {
$fp = fopen($tmpdir . zip_entry_name($zip_entry) , "w");
@@ -16,6 +18,7 @@
}
}
zip_close($zip);
+}
}
foreach (scandir($tmpdir) as $file) {