Merge branch 'master' of github.com:maxious/ACTBus-ui

maxious · Nov 24, 2012 · d3b1a28 · d3b1a28
2 parents 607df4a + bdadeff
commit d3b1a28
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 215 deletions.
diff --git a/js/FlashCanvas b/js/FlashCanvas
diff --git a/js/flotr2 b/js/flotr2
diff --git a/labs/mywaytimeliness-tripupdates.proto.php b/labs/mywaytimeliness-tripupdates.proto.php
@@ -0,0 +1,71 @@
+ <?php
+// https://developers.google.com/transit/gtfs-realtime/examples/trip-updates-full
+    if (isset($labs)) {
+// ETA calculation
+
+        $tripETA = Array();
+        // max/min delay instead of stddev?
+        $query = $query = "select 'lol', avg(timing_delta), stddev(timing_delta), count(*) from myway_timingdeltas 
+			where extract(hour from time) between " . date("H", $earlierTime) . " and " . date("H", $laterTime);
+        //select 'lol', stop_id,extract(hour from time), avg(timing_delta), stddev(timing_delta), count(*) from myway_timingdeltas where stop_id = '5501' group by stop_id, extract(hour from time) 
+        $query = $conn->prepare($query);
+        $query->execute();
+        if (!$query) {
+            databaseError($conn->errorInfo());
+            return Array();
+        }
+       	$ETAparams = Array();
+        foreach ($query->fetchAll() as $row) {
+            $ETAparams[$row[0]] = Array("avg" => $row[1], "stddev" => floor($row[2]), "count" => $row[3]);
+        };
+	//print_r($ETAparams);
+        foreach ($trips as $trip) {
+            $tripETA[$trip['trip_id']] = date("H:i", strtotime($trip['arrival_time'] . " - " . (floor($ETAparams['lol']['stddev'])) . " seconds")) . " to " .
+                    date("H:i", strtotime($trip['arrival_time'] . " + " . (floor($ETAparams['lol']['stddev'])) . " seconds"));
+        }
+	//print_r($tripETA);
+    }
+
+/*include_once("library/DrSlump/Protobuf.php");
+include_once("library/DrSlump/Protobuf/Message.php");
+include_once("library/DrSlump/Protobuf/Registry.php");
+include_once("library/DrSlump/Protobuf/Descriptor.php");
+include_once("library/DrSlump/Protobuf/Field.php");
+
+include_once("gtfs-realtime.php");
+include_once("library/DrSlump/Protobuf/CodecInterface.php");
+include_once("library/DrSlump/Protobuf/Codec/PhpArray.php");
+include_once("library/DrSlump/Protobuf/Codec/Binary.php");
+include_once("library/DrSlump/Protobuf/Codec/Binary/Writer.php");
+include_once("library/DrSlump/Protobuf/Codec/Json.php");
+//print_r(get_declared_classes());
+$fm = new transit_realtime\FeedMessage();
+$fh = new transit_realtime\FeedHeader();
+$fh->setGtfsRealtimeVersion(1);
+$fh->setTimestamp(time());
+$fm->setHeader($fh);
+$fe = new transit_realtime\FeedEntity();
+	$fe->setId("1234");
+	$fe->setIsDeleted(false);
+	$tu = new transit_realtime\TripUpdate();	
+		$td = new transit_realtime\TripDescriptor();
+			$td->setRouteId("0");
+		$tu->setTrip($td);
+		$stu = new transit_realtime\TripUpdate\StopTimeUpdate();
+				$stu->setStopId("1");
+				$stu->setScheduleRelationship(transit_realtime\TripUpdate\StopTimeUpdate\ScheduleRelationship::SKIPPED);
+		$tu->addStopTimeUpdate($stu);
+	$fe->setTripUpdate($tu);
+$fm->addEntity($fe);
+//var_dump($fm);
+
+//$codec = new DrSlump\Protobuf\Codec\Binary();
+//echo $codec->encode($fm);
+
+//$codec = new DrSlump\Protobuf\Codec\Json();
+//echo $codec->encode($fm);
+
+$codec = new DrSlump\Protobuf\Codec\PhpArray();
+print_r($codec->encode($fm));*/
+
+?>
diff --git a/lib/Requests b/lib/Requests
diff --git a/lib/amon-php b/lib/amon-php
diff --git a/rtpis/importer.py b/rtpis/importer.py
diff --git a/rtpis/index.php b/rtpis/index.php
@@ -10,13 +10,13 @@
           }
  	echo'	<li><a href="servicealert_viewer.php"><h3>Service Alert Viewer</h3>
 		<p>Browse current network alerts</p></a></li>';
+ 	echo'	<li><a href="servicealert_map.php"><h3>Service Alert Map</h3>
+		<p>Browse current network alerts</p></a></li>';
 
            echo'  </ul>';
 echo '<ul data-role="listview" data-theme="e" data-groupingtheme="e">';
  	echo'	<li><a href="gtfs-realtime.php"><h3>GTFS-realtime API</h3>
-		<p>Browse current network alerts</p></a></li>';
- 	echo'	<li><a href="siri.php"><h3>SIRI API</h3>
-		<p>Browse current network alerts</p></a></li>';
+		<p>Current alerts/updates API</p></a></li>';
 
            echo'  </ul>';
 

diff --git a/rtpis/punkt.zip b/rtpis/punkt.zip
diff --git a/rtpis/siri.php b/rtpis/siri.php
diff --git a/setup/busuidb.sh b/setup/busuidb.sh
@@ -12,6 +12,8 @@ psql -d transitdata -f /var/www/transitdata.cbrfeed.sql
 #psql -d transitdata -c	"GRANT SELECT,INSERT,UPDATE ON TABLE servicealerts_alerts,servicealerts_informed TO transitdata;"
 #psql -d transitdata -c	"GRANT USAGE,SELECT ON SEQUENCE servicealerts_alerts_id_seq TO transitdata;"
 ##psql -d transitdata -c "GRANT SELECT ON ALL TABLES IN SCHEMA public TO transitdata;"
+#psql -d transitdata -c "CREATE OR REPLACE FUNCTION round_time(TIMESTAMP WITH TIME ZONE) RETURNS TIMESTAMP WITH TIME ZONE AS 
+#  $$ SELECT date_trunc('hour', $1) + INTERVAL '15 min' * ROUND(date_part('minute', $1) / 15.0) $$ LANGUAGE SQL;"
 ## INSERT INTO geometry_columns(f_table_catalog, f_table_schema, f_table_name, f_geometry_column, coord_dimension, srid, "type")
 ##SELECT '', 'public', 'shapes', 'shape_pt', ST_CoordDim(shape_pt), ST_SRID(shape_pt), GeometryType(shape_pt)
 ##FROM shapes LIMIT 1;

diff --git a/stop.php b/stop.php
@@ -160,30 +160,6 @@
 if (sizeof($trips) == 0) {
     echo "<li style='text-align: center;'>No trips in the near future.</li>";
 } else {
-    if (isset($labs)) {
-// ETA calculation
-
-        $tripETA = Array();
-        // max/min delay instead of stddev?
-        $query = $query = "select 'lol', avg(timing_delta), stddev(timing_delta), count(*) from myway_timingdeltas where extract(hour from time) between " . date("H", $earlierTime) . " and " . date("H", $laterTime);
-        //select 'lol', stop_id,extract(hour from time), avg(timing_delta), stddev(timing_delta), count(*) from myway_timingdeltas where stop_id = '5501' group by stop_id, extract(hour from time) order by extract(hour from time)
-        $query = $conn->prepare($query);
-        $query->execute();
-        if (!$query) {
-            databaseError($conn->errorInfo());
-            return Array();
-        }
-        $ETAparams = Array();
-        foreach ($query->fetchAll() as $row) {
-            $ETAparams[$row[0]] = Array("avg" => $row[1], "stddev" => floor($row[2]), "count" => $row[3]);
-        };
-        //print_r($ETAparams);
-        foreach ($trips as $trip) {
-            $tripETA[$trip['trip_id']] = date("H:i", strtotime($trip['arrival_time'] . " - " . (floor($ETAparams['lol']['stddev'])) . " seconds")) . " to " .
-                    date("H:i", strtotime($trip['arrival_time'] . " + " . (floor($ETAparams['lol']['stddev'])) . " seconds"));
-        }
-        //print_r($tripETA);
-    }
     foreach ($trips as $trip) {
         if (
                 isset($filterHasStop) && (getTripHasStop($trip['trip_id'], $filterHasStop) == 1)
@@ -196,7 +172,7 @@
             echo '<a class="url" href="' . curPageURL() . '/trip.php?stopid=' . $stopid . '&amp;tripid=' . $trip['trip_id'] . '"><h3 class="summary">' . $trip['route_short_name'] . ' ' . $trip['trip_headsign'] . " towards " . $destination['stop_name'] . "</h3><p>";
             $viaPoints = viaPointNames($trip['trip_id'], $trip['stop_sequence']);
             if (isset($labs)) {
-                echo '<br><span class="eta">ETA: ' . $tripETA[$trip['trip_id']] . '</span>';
+                //echo '<br><span class="eta">ETA: ' . $tripETA[$trip['trip_id']] . '</span>';
             }
             if ($viaPoints != "") {
                 echo '<br><span class="viaPoints">Via: ' . $viaPoints . '</span>';