Add trip planner, fix weekend routes appearing on weekdays in network 10
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-maxious-canberra-transit-feed/source-html
origin-src
--- a/betweenpoint.php
+++ b/betweenpoint.php
@@ -10,7 +10,7 @@
// create the ol map object
var map = new OpenLayers.Map('map');
- var osmtiles = new OpenLayers.Layer.OSM("local", "http://127.0.0.1/Maps/OSM/${z}/${x}/${y}.png")
+ var osmtiles = new OpenLayers.Layer.OSM("local", "http://127.0.0.1/tiles/${z}/${x}/${y}.png")
// use http://open.atlas.free.fr/GMapsTransparenciesImgOver.php and http://code.google.com/p/googletilecutter/ to make tiles
markers = new OpenLayers.Layer.Markers("Between Stop Markers");
@@ -64,6 +64,7 @@
fromto = selValue.split(":",2)[1];
$("#from").val(fromto.split("->",2)[0]);
$("#to").val(fromto.split("->",2)[1]);
+ document.getElementById("between_points").innerHTML = "";
return true;
}
@@ -126,9 +127,11 @@
if (($fname != '.') && ($fname != '..')) {
$timetable = Spyc::YAMLLoad("maxious-canberra-transit-feed/output/" . $fname);
// Strip off individual platforms because it usually doesn't matter for routes
- $timetable["time_points"] = preg_replace("/(Platform.*/","",$timetable["time_points"]);
+ $timetable["time_points"] = preg_replace("/\(Platform.*/","",$timetable["time_points"]);
for ($i = 0; $i < sizeof($timetable["time_points"]) - 1; $i++) {
- @$paths[trim($timetable["time_points"][$i]) . "->" . trim($timetable["time_points"][$i + 1])] .= $timetable["short_name"] . ";";
+ $key = trim($timetable["time_points"][$i]) . "->" . trim($timetable["time_points"][$i + 1]);
+ if (strstr($paths[$key],";" . $timetable["short_name"] . ";") === false)
+ @$paths[$key] .= $timetable["short_name"] . ";";
}
}
}
@@ -138,9 +141,12 @@
$completedPaths = array();
$result_betweenstops = pg_query($conn, "Select * FROM between_stops");
while ($path = pg_fetch_assoc($result_betweenstops)) {
- $completedPaths[trim($path['fromlocation']) . "->" . trim($path['tolocation'])] .= trim($path['routes']);
+ $key = trim($path['fromlocation']) . "->" . trim($path['tolocation']);
+ $completedPaths[$key].= trim($path['routes']);
+
}
-
+
+
foreach ($paths as $path => $routes) {
if (!in_array($path, array_keys($completedPaths))) {
echo "<option value=\"$routes:$path\">" . sizeof(explode(";", $routes)) . " $path</option>\n";
@@ -149,12 +155,14 @@
$incompleteRoutes = "";
foreach (explode(";", $routes) as $route) {
- if (!in_array($route,$completedRoutes)) {
+ if (!in_array($route,$completedRoutes) && strstr($incompleteRoutes,';'.$route.';') === false) {
$incompleteRoutes .= $route.';';
}
}
- if ($incompleteRoutes != "") echo "<option value=\"$incompleteRoutes:$path\">" . sizeof(explode(";", $incompleteRoutes)) . " $path</option>\n";
+ if ($incompleteRoutes != "") {
+ echo "<option value=\"$incompleteRoutes:$path\">" . sizeof(explode(";", $incompleteRoutes)) . " $path</option>\n";
+ }
}
}
--- a/betweenpoint.submit.php
+++ b/betweenpoint.submit.php
@@ -16,8 +16,11 @@
echo("Error in SQL query: " . pg_last_error() ."<br>\n");
}
if ($reverse === "on") {
- $points = implode(";",array_reverse(explode(";",$points)));
-$sql = "INSERT INTO between_stops ( toLocation, fromLocation, points, routes) VALUES('$from','$to','$points','$routes')";
+ $ep = explode(";",$points);
+ $epr = array_reverse($ep);
+ $p = implode(";",$epr).";";
+ $pointsString = substr($p,1);
+$sql = "INSERT INTO between_stops ( toLocation, fromLocation, points, routes) VALUES('$from','$to','$pointsString','$routes')";
$result = pg_query($conn, $sql);
if (!$result) {
echo("Error in SQL query: " . pg_last_error() ."<br>\n");
--- /dev/null
+++ b/busui/about.php
@@ -1,1 +1,9 @@
+<?php
+include('common.inc.php');
+?>
+<p>
+Some icons by Joseph Wain / glyphish.com
+<?
+include_footer();
+?>
--- a/busui/common.inc.php
+++ b/busui/common.inc.php
@@ -12,24 +12,29 @@
return true;
}
-function include_header($pageTitle) {
+function include_header($pageTitle, $opendiv = true, $geolocate = false) {
// if (isDebug()) // set php error level high
echo '
<!DOCTYPE html>
<html>
<head>
<title>bus.lambdacomplex.org - '.$pageTitle.'</title>
- <link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a1/jquery.mobile-1.0a1.min.css" />
+ <link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a2/jquery.mobile-1.0a2.min.css" />
<script src="http://code.jquery.com/jquery-1.4.3.min.js"></script><script type="text/javascript"
-src="http://code.jquery.com/mobile/1.0a1/jquery.mobile-1.0a1.min.js"></script>
+src="http://code.jquery.com/mobile/1.0a2/jquery.mobile-1.0a2.min.js"></script>
<script type="text/javascript" src="docs/docs.js"></script>
+ <meta name="apple-mobile-web-app-capable" content="yes" />
+ <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+ <link rel="apple-touch-startup-image" href="startup.png" />
+ <link rel="apple-touch-icon" href="apple-touch-icon.png" />
</head>
<body>
-
-<div data-role="page">
+ ';
+if ($opendiv) echo '<div data-role="page">
<div data-role="header">
- <h1>'.$pageTitle.'</h1>
+ <h1>'.$pageTitle.'</h1>
+ <a href="index.php" data-icon="back" class="ui-btn-right">Home</a>
</div><!-- /header -->
<div data-role="content"> ';
}
@@ -81,5 +86,130 @@
}
return $f;
}
+
+function staticmap($mapPoints)
+{
+$width = 300;
+$height = 300;
+$zoom = 0;
+$center = "";
+$markers = "";
+
+ if (sizeof($mapPoints) < 1) return "";
+ if (sizeof($mapPoints) === 1) {
+ $zoom = 14;
+ $markers .= $mapPoint[0].",".$mapPoint[1].",ol-marker";
+ $center = "{$mapPoints[0][0]},{$mapPoints[0][1]}";
+ } else {
+ foreach ($mapPoints as $index => $mapPoint) {
+ $markers .= $mapPoint[0].",".$mapPoint[1].",lightblue".($index+1);
+ if ($index+1 != sizeof($mapPoints)) $markers .= "|";
+ $totalLat += $mapPoint[0];
+ $totalLon += $mapPoint[1];
+ }
+ $zoom = 11;
+ $center = $totalLat/sizeof($mapPoints).",".$totalLon/sizeof($mapPoints);
+ }
+
+ return '<img src="staticmaplite/staticmap.php?center='.$center.'&zoom='.$zoom.'&size='.$width.'x'.$height.'&maptype=mapnik&markers='.$markers.'" width='.$width.' height='.$height.'>';
+}
+
+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) {
+ $url = "http://geocoding.cloudmade.com/daa03470bb8740298d4b10e3f03d63e6/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;
+ else return $contents->features[0]->centroid->coordinates[0].",".$contents->features[0]->centroid->coordinates[1];
+}
+
+function reverseGeocode($lat,$lng) {
+ $url = "http://geocoding.cloudmade.com/daa03470bb8740298d4b10e3f03d63e6/geocoding/v2/find.js?around=".$lat.",".$lng."&distance=closest&object_type=road";
+ $contents = json_decode(getPage($url));
+ return $contents->features[0]->properties->name;
+}
?>
+
Binary files /dev/null and b/busui/images/01-refresh.png differ
Binary files /dev/null and b/busui/images/02-redo.png differ
Binary files /dev/null and b/busui/images/06-magnify.png differ
Binary files /dev/null and b/busui/images/07-map-marker.png differ
Binary files /dev/null and b/busui/images/101-gameplan.png differ
Binary files /dev/null and b/busui/images/102-walk.png differ
Binary files /dev/null and b/busui/images/103-map.png differ
Binary files /dev/null and b/busui/images/113-navigation.png differ
Binary files /dev/null and b/busui/images/121-landscape.png differ
Binary files /dev/null and b/busui/images/13-target.png differ
Binary files /dev/null and b/busui/images/139-flags.png differ
Binary files /dev/null and b/busui/images/145-persondot.png differ
Binary files /dev/null and b/busui/images/184-warning.png differ
Binary files /dev/null and b/busui/images/193-location-arrow.png differ
Binary files /dev/null and b/busui/images/28-star.png differ
Binary files /dev/null and b/busui/images/53-house.png differ
Binary files /dev/null and b/busui/images/55-network.png differ
Binary files /dev/null and b/busui/images/57-download.png differ
Binary files /dev/null and b/busui/images/58-bookmark.png differ
Binary files /dev/null and b/busui/images/59-flag.png differ
Binary files /dev/null and b/busui/images/60-signpost.png differ
Binary files /dev/null and b/busui/images/73-radar.png differ
Binary files /dev/null and b/busui/images/74-location.png differ
Binary files /dev/null and b/busui/images/83-calendar.png differ
--- a/busui/index.php
+++ b/busui/index.php
@@ -1,60 +1,26 @@
<?php
-include('common.inc.php');
+include('common.inc.php');
+include_header("bus.lambdacomplex.org",false)
?>
-<!doctype html>
-<html>
- <head>
- <meta charset="UTF-8" />
- <title>bus.lambdacomplex.org</title>
- <link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a1/jquery.mobile-1.0a1.min.css" />
- <script src="http://code.jquery.com/jquery-1.4.3.min.js"></script>
- <script src="http://code.jquery.com/mobile/1.0a1/jquery.mobile-1.0a1.min.js"></script>
- <!-- <script src="jqtouch/extensions/jqt.location.js" type="application/x-javascript" charset="utf-8"></script> -->
-
-<!-- <script type="text/javascript" charset="utf-8">
- $(function(){
- function setDisplay(text) {
- $('.latlng').empty().append(text)
- }
-
- // We pass "updateLocation" a callback function,
- // to run once we have the coordinates.
- // We also set it to a variable, so we can know
- // right away if it's working or not
- var lookup = jQT.updateLocation(function(coords){
- if (coords) {
- setDisplay('Latitude: ' + coords.latitude + '<br />Longitude: ' + coords.longitude);
- $('.nearby').empty().append('<a href="list.php?lat=' + coords.latitude + '&lng=' + coords.longitude + '">Nearby List</a>');
- } else {
- setDisplay('Device not capable of geo-location.');
- }
- });
-
- if (lookup) {
- setDisplay('Looking up location…');
- }
- });
- </script> -->
- </head>
- <body>
-<div data-role="page" data-theme="b" id="jqm-home">
- <div id="jqm-homeheader">
- <p>bus.lambdacomplex.org</p>
+<div data-role="page" data-theme="b" id="jqm-home" class="ui-page ui-body-b ui-page-active">
+ <div id="jqm-homeheader">
+ <center><h1 id="jqm-logo"><img src="apple-touch-icon.png" alt="jQuery Mobile Framework" width="64" height="64" />
+ bus.lambdacomplex.org</h1></center>
</div>
<div data-role="content">
<ul data-role="listview" data-inset="true" data-theme="c" data-dividertheme="b">
<li data-role="list-divider">Stops</li>
<li><a href="stopList.php">All stops List</a></li>
- <li class="nearby"><a href="">Nearby List</a></li>
- <li><a href="stopList.php">Favourites List</a></li>
+ <li class="nearby"><a href="stopList.php?nearby=yes">Nearby List</a></li>
+ <li><a href="stopList.php?favourites=yes">Favourites List</a></li>
</ul>
<ul data-role="listview" data-inset="true" data-theme="c" data-dividertheme="b">
<li data-role="list-divider">Routes</li>
<li><a href="routeList.php">All Routes List</a></li>
- <li class="nearby"><a href="">Nearby List</a></li>
- <li><a href="routeList.php">Favourites List</a></li>
+ <li class="nearby"><a href="routeList.php?nearby=yes">Nearby List</a></li>
+ <li><a href="routeList.php?favourites=yes">Favourites List</a></li>
</ul>
- <div class="info">
+ <div class="ui-body ui-body-c info">
<p class="latlng"></p>
Time: <?php echo date("H:m"); ?> <br>
Service Period: <?php echo ucwords(service_period()); ?>
--- a/busui/readme.txt
+++ b/busui/readme.txt
@@ -21,3 +21,10 @@
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/busui/route.php
+++ /dev/null
--- a/busui/routeList.php
+++ b/busui/routeList.php
@@ -7,28 +7,49 @@
$url = $APIurl."/json/routes";
$contents = json_decode(getPage($url));
-foreach ($contents as $key => $row) {
- $routeDestinations[$row[2]][] = $row;
-}
-foreach ($routeDestinations as $destination => $routes)
-{
- echo '<li>'.$destination."... <ul>\n";
- foreach($routes as $row) {
- echo '<li>'.$row[1].' <a href="route.php?routeid='.$row[0].'">'.$row[2]."</a></li>\n";
+if ($_REQUEST['bynumber']) {
+ $routeSeries = Array();
+ foreach ($contents as $key => $row) {
+ foreach (explode(" ",$row[1]) as $routeNumber ) {
+ $seriesNum = substr($routeNumber, 0, -1)."0";
+ if ($seriesNum == "0") $seriesNum = $routeNumber;
+ $routeSeries[$seriesNum][$seriesNum."-".$row[1]."-".$row[0]] = $row;
+
+
}
- echo "</ul></li>\n";
+ }
+ ksort($routeSeries);
+ foreach ($routeSeries as $series => $routes)
+ {
+ echo '<li>'.$series."... <ul>\n";
+ foreach($routes as $row) {
+ echo '<li>'.$row[1].' <a href="route.php?routeid='.$row[0].'">'.$row[2]."</a></li>\n";
+ }
+ echo "</ul></li>\n";
+ }
+} else {
+ foreach ($contents as $key => $row) {
+ $routeDestinations[$row[2]][] = $row;
+ }
+ foreach ($routeDestinations as $destination => $routes)
+ {
+ echo '<li>'.$destination."... <ul>\n";
+ foreach($routes as $row) {
+ echo '<li>'.$row[1].' <a href="trip.php?routeid='.$row[0].'">'.$row[2]."</a></li>\n";
+ }
+ echo "</ul></li>\n";
+ }
}
echo "</ul>\n";
-/*
+echo'
<div data-role="footer" data-id="foo1" data-position="fixed">
<div data-role="navbar">
<ul>
- <li><a href="footer-persist-a.html" class="ui-btn-active">Friends</a></li>
- <li><a href="footer-persist-b.html">Albums</a></li>
- <li><a href="footer-persist-c.html">Emails</a></li>
+ <li><a href="routeList.php" class="ui-btn-active">By Final Destination...</a></li>
+ <li><a href="routeList.php?bynumber=yes">By Number... </a></li>
+ <li><a href="routeList.php?bysuburb=yes">By Suburb... </a></li>
</ul>
- </div><!-- /navbar -->
-*/
+ ';
include_footer();
?>
--- a/busui/schedule_viewer.py
+++ b/busui/schedule_viewer.py
@@ -264,7 +264,19 @@
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
+ query = params.get('route_id', None).lower()
+ result = []
+ for t in schedule.GetTripList():
+ if t.route_id == query:
+ result.append ( (t.GetStartTime(), t.trip_id) )
+ """ UGH fails for 300s """
+ """return result"""
+ return sorted(result, key=lambda trip: trip[0])
+
def handle_json_GET_triprows(self, params):
"""Return a list of rows from the feed file that are related to this
trip."""
@@ -369,6 +381,7 @@
schedule = self.server.schedule
stop = schedule.GetStop(params.get('stop', None))
time = int(params.get('time', 0))
+ 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'.
@@ -397,8 +410,8 @@
trip_name += route.route_long_name
if headsign:
trip_name += " (Direction: %s)" % headsign
-
- result.append((time, (trip.trip_id, trip_name, trip.service_id), tp))
+ 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_GET_ttablegraph(self,params):
Binary files /dev/null and b/busui/staticmaplite/images/markers/lightblue1.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/lightblue2.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/lightblue3.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/lightblue4.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/lightblue5.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/ol-marker-blue.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/ol-marker-gold.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/ol-marker-green.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/ol-marker.png differ
Binary files /dev/null and b/busui/staticmaplite/images/osm_logo.png differ
--- /dev/null
+++ b/busui/staticmaplite/index.html
@@ -1,1 +1,122 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de-de" lang="de-de">
+<head>
+ <!--
+ CSS based on template of Dandelion wiki engine by Radomir Dopieralski who release