From: maxious Date: Sun, 10 Apr 2011 09:59:35 +0000 Subject: Merge branch 'master' of github.com:maxious/ACTBus-ui X-Git-Url: http://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=9e5320a4379e0f1feca1bae3f52052b52f011d33 --- Merge branch 'master' of github.com:maxious/ACTBus-ui Conflicts: include/common-db.inc.php --- --- /dev/null +++ b/aws/awsStartup.sh @@ -1,1 +1,37 @@ +#!/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 +#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 -d transitdata -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/aws/pg_hba.conf @@ -1,1 +1,75 @@ +# PostgreSQL Client Authentication Configuration File +# =================================================== +# +# Refer to the "Client Authentication" section in the +# PostgreSQL documentation for a complete description +# of this file. A short synopsis follows. +# +# This file controls: which hosts are allowed to connect, how clients +# are authenticated, which PostgreSQL user names they can use, which +# databases they can access. Records take one of these forms: +# +# local DATABASE USER METHOD [OPTIONS] +# host DATABASE USER CIDR-ADDRESS METHOD [OPTIONS] +# hostssl DATABASE USER CIDR-ADDRESS METHOD [OPTIONS] +# hostnossl DATABASE USER CIDR-ADDRESS METHOD [OPTIONS] +# +# (The uppercase items must be replaced by actual values.) +# +# The first field is the connection type: "local" is a Unix-domain socket, +# "host" is either a plain or SSL-encrypted TCP/IP socket, "hostssl" is an +# SSL-encrypted TCP/IP socket, and "hostnossl" is a plain TCP/IP socket. +# +# DATABASE can be "all", "sameuser", "samerole", a database name, or +# a comma-separated list thereof. +# +# USER can be "all", a user name, a group name prefixed with "+", or +# a comma-separated list thereof. In both the DATABASE and USER fields +# you can also write a file name prefixed with "@" to include names from +# a separate file. +# +# CIDR-ADDRESS specifies the set of hosts the record matches. +# It is made up of an IP address and a CIDR mask that is an integer +# (between 0 and 32 (IPv4) or 128 (IPv6) inclusive) that specifies +# the number of significant bits in the mask. Alternatively, you can write +# an IP address and netmask in separate columns to specify the set of hosts. +# +# METHOD can be "trust", "reject", "md5", "password", "gss", "sspi", "krb5", +# "ident", "pam", "ldap" or "cert". Note that "password" sends passwords +# in clear text; "md5" is preferred since it sends encrypted passwords. +# +# OPTIONS are a set of options for the authentication in the format +# NAME=VALUE. The available options depend on the different authentication +# methods - refer to the "Client Authentication" section in the documentation +# for a list of which options are available for which authentication methods. +# +# Database and user names containing spaces, commas, quotes and other special +# characters must be quoted. Quoting one of the keywords "all", "sameuser" or +# "samerole" makes the name lose its special character, and just match a +# database or username with that name. +# +# This file is read on server startup and when the postmaster receives +# a SIGHUP signal. If you edit the file on a running system, you have +# to SIGHUP the postmaster for the changes to take effect. You can use +# "pg_ctl reload" to do that. +# Put your actual configuration here +# ---------------------------------- +# +# If you want to allow non-local connections, you need to add more +# "host" records. In that case you will also need to make PostgreSQL listen +# on a non-local interface via the listen_addresses configuration parameter, +# or via the -i or -h command line switches. +# + + + +# TYPE DATABASE USER CIDR-ADDRESS METHOD + +# "local" is for Unix domain socket connections only +local all all trust +# IPv4 local connections: +host all all 127.0.0.1/32 trust +# IPv6 local connections: +host all all ::1/128 trust + --- /dev/null +++ b/include/common-db.inc.php @@ -1,1 +1,21 @@ + --- 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 '
  • '; echo '

    ' . $trip['route_short_name'] . " " . $trip['route_long_name'] . "

    "; - //$viaPoints = viaPointNames($trip['trip_id'], $trip['stop_sequence']); - //if ($viaPoints != "") echo '
    Via: ' . $viaPoints . ''; + $viaPoints = viaPointNames($trip['trip_id'], $trip['stop_sequence']); + if ($viaPoints != "") echo '
    Via: ' . $viaPoints . ''; if (sizeof($tripStopNumbers) > 0) { echo '
    Boarding At: '; foreach ($tripStopNumbers[$trip['trip_id']] as $key) { --- 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 '

    Via:

    ' . implode(", ", $viaPoints) . '

    '; + +$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 '

    Via:

    ' . viaPointNames($tripid) . '

    '; echo '

    Other Trips:

    '; -foreach ($routetrips as $othertrip) { - echo '    ' . midnight_seconds_to_time($othertrip[0]) . ' '; +foreach (getRouteTrips($routeid) as $othertrip) { + echo '' . str_replace(" ",":00",str_replace(":00"," ",$othertrip['arrival_time'])). ' '; } flush(); @ob_flush(); echo '

    Other directions/timing periods:

    '; -$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 '' . $row[2] . ' (' . ucwords($row[3]) . ') '; +foreach (getRoutesByNumber($trip['route_short_name']) as $row) { + if ($row['route_id'] != $routeid) echo '' . $row['route_long_name'] . ' (' . ucwords($row['service_id']) . ') '; } flush(); @ob_flush(); echo '