Added service periods to route names
--- a/busui/common.inc.php
+++ b/busui/common.inc.php
@@ -8,6 +8,9 @@
return true;
}
+function debug($msg) {
+ if (isDebug()) echo "<!-- $msg -->";
+}
function isFastDevice() {
return true;
}
@@ -19,22 +22,68 @@
<html>
<head>
<title>bus.lambdacomplex.org - '.$pageTitle.'</title>
- <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.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" />
+ <link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a2/jquery.mobile-1.0a2.min.css" />
+ <style type="text/css">
+ .ui-navbar {
+ padding-bottom: 18px;
+ width: 100%;
+ }
+</style>
+ <script src="http://code.jquery.com/jquery-1.4.3.min.js"></script>
+ <script type="text/javascript" src="http://code.jquery.com/mobile/1.0a2/jquery.mobile-1.0a2.min.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>
+ <link rel="apple-touch-icon" href="apple-touch-icon.png" />';
+ if ($geolocate) {
+echo "<script>
+
+function setCookie(c_name,value,expiredays)
+{
+var exdate=new Date();
+exdate.setDate(exdate.getDate()+expiredays);
+document.cookie=c_name+ \"=\" +escape(value)+
+((expiredays==null) ? \"\" : \";expires=\"+exdate.toUTCString());
+}
+
+function getCookie(c_name)
+{
+if (document.cookie.length>0)
+ {
+ c_start=document.cookie.indexOf(c_name + \"=\");
+ if (c_start!=-1)
+ {
+ c_start=c_start + c_name.length+1;
+ c_end=document.cookie.indexOf(\";\",c_start);
+ if (c_end==-1) c_end=document.cookie.length;
+ return unescape(document.cookie.substring(c_start,c_end));
+ }
+ }
+return \"\";
+}
+
+function success(position) {
+$('#geolocate').val(position.coords.latitude+','+position.coords.longitude);
+setCookie('geolocate',position.coords.latitude+','+position.coords.longitude,1);
+}
+
+function error(msg) {
+ console.log(msg);
+}
+
+if (navigator.geolocation) {
+ navigator.geolocation.getCurrentPosition(success, error);
+}
+
+</script> ";
+ }
+echo '</head>
<body>
';
if ($opendiv) echo '<div data-role="page">
<div data-role="header">
<h1>'.$pageTitle.'</h1>
- <a href="index.php" data-icon="back" class="ui-btn-right">Home</a>
</div><!-- /header -->
<div data-role="content"> ';
}
@@ -87,31 +136,71 @@
return $f;
}
-function staticmap($mapPoints)
+function staticmap($mapPoints, $zoom = 0, $markerImage = "iconb")
{
$width = 300;
$height = 300;
-$zoom = 0;
+$metersperpixel[9]=305.492*$width;
+$metersperpixel[10]=152.746*$width;
+$metersperpixel[11]=76.373*$width;
+$metersperpixel[12]=38.187*$width;
+$metersperpixel[13]=19.093*$width;
+$metersperpixel[14]=9.547*$width;
+$metersperpixel[15]=4.773*$width;
+$metersperpixel[16]=2.387*$width;
+// $metersperpixel[17]=1.193*$width;
$center = "";
$markers = "";
-
- if (sizeof($mapPoints) < 1) return "";
+$minlat = 999;
+$minlon = 999;
+$maxlat = 0;
+$maxlon = 0;
+
+ if (sizeof($mapPoints) < 1) return "map error";
if (sizeof($mapPoints) === 1) {
- $zoom = 14;
- $markers .= $mapPoint[0].",".$mapPoint[1].",ol-marker";
+ if ($zoom == 0) $zoom = 14;
+ $markers .= "{$mapPoints[0][0]},{$mapPoints[0][1]},$markerimage";
$center = "{$mapPoints[0][0]},{$mapPoints[0][1]}";
} else {
foreach ($mapPoints as $index => $mapPoint) {
- $markers .= $mapPoint[0].",".$mapPoint[1].",lightblue".($index+1);
+ $markers .= $mapPoint[0].",".$mapPoint[1].",".$markerImage.($index+1);
if ($index+1 != sizeof($mapPoints)) $markers .= "|";
+ if ($mapPoint[0] < $minlat) $minlat = $mapPoint[0];
+ if ($mapPoint[0] > $maxlat) $maxlat = $mapPoint[0];
+ if ($mapPoint[1] < $minlon) $minlon = $mapPoint[1];
+ if ($mapPoint[1] > $maxlon) $maxlon = $mapPoint[1];
$totalLat += $mapPoint[0];
$totalLon += $mapPoint[1];
}
- $zoom = 11;
+ if ($zoom == 0) {
+ $mapwidthinmeters = distance($minlat,$minlon,$minlat,$maxlon);
+ foreach (array_reverse($metersperpixel,true) as $zoomLevel => $maxdistance)
+ {
+ if ($zoom == 0 && $mapwidthinmeters < ($maxdistance + 50)) $zoom = $zoomLevel;
+ }
+ }
$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 distance($lat1, $lng1, $lat2, $lng2)
+{
+ $pi80 = M_PI / 180;
+ $lat1 *= $pi80;
+ $lng1 *= $pi80;
+ $lat2 *= $pi80;
+ $lng2 *= $pi80;
+
+ $r = 6372.797; // mean radius of Earth in km
+ $dlat = $lat2 - $lat1;
+ $dlng = $lng2 - $lng1;
+ $a = sin($dlat / 2) * sin($dlat / 2) + cos($lat1) * cos($lat2) * sin($dlng / 2) * sin($dlng / 2);
+ $c = 2 * atan2(sqrt($a), sqrt(1 - $a));
+ $km = $r * $c;
+
+ return $km * 1000;
}
function decodePolylineToArray($encoded)
@@ -202,7 +291,8 @@
$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];
+ elseif (isset($contents->features[0]->centroid)) return $contents->features[0]->centroid->coordinates[0].",".$contents->features[0]->centroid->coordinates[1];
+ else return "";
}
function reverseGeocode($lat,$lng) {
@@ -210,6 +300,16 @@
$contents = json_decode(getPage($url));
return $contents->features[0]->properties->name;
}
+
+function startsWith($haystack,$needle,$case=true) {
+ if($case){return (strcmp(substr($haystack, 0, strlen($needle)),$needle)===0);}
+ return (strcasecmp(substr($haystack, 0, strlen($needle)),$needle)===0);
+}
+
+function endsWith($haystack,$needle,$case=true) {
+ if($case){return (strcmp(substr($haystack, strlen($haystack) - strlen($needle)),$needle)===0);}
+ return (strcasecmp(substr($haystack, strlen($haystack) - strlen($needle)),$needle)===0);
+}
?>
--- a/busui/index.php
+++ b/busui/index.php
@@ -1,29 +1,29 @@
<?php
include('common.inc.php');
-include_header("bus.lambdacomplex.org",false)
+include_header("bus.lambdacomplex.org",false, true)
?>
<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" />
+ <center><h1 id="jqm-logo"><img src="apple-touch-icon.png" alt="logo" width="64" height="64" /><br>
bus.lambdacomplex.org</h1></center>
</div>
- <div data-role="content">
+ <div data-role="content">
+ <a href="tripPlanner.php" data-role="button">Launch Trip Planner...</a>
<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="stopList.php?nearby=yes">Nearby List</a></li>
- <li><a href="stopList.php?favourites=yes">Favourites List</a></li>
+ <li data-role="list-divider">Timetables - Stops</li>
+ <li><a href="stopList.php">Major (Timing Point) Stops</a></li>
+ <li><a href="stopList.php">All Stops</a></li>
+ <li><a href="stopList.php?nearbyfavs=yes">Nearby/Favourite Stops</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="routeList.php?nearby=yes">Nearby List</a></li>
- <li><a href="routeList.php?favourites=yes">Favourites List</a></li>
+ <li data-role="list-divider">Timetables - Routes</li>
+ <li><a href="routeList.php">All Routes</a></li>
+ <li><a href="routeList.php?nearbyfavs=yes">Nearby/Favourites Routes</a></li>
</ul>
- <div class="ui-body ui-body-c info">
- <p class="latlng"></p>
+ <div class="ui-body ui-body-c">
+ Current Location: <input type="text" id="geolocate" name="geolocate"/> Search? Update to Here?<br>
Time: <?php echo date("H:m"); ?> <br>
- Service Period: <?php echo ucwords(service_period()); ?>
+ Service Period: <?php echo ucwords(service_period()); ?><br>
</div>
</div>
</div>
--- a/busui/routeList.php
+++ b/busui/routeList.php
@@ -1,12 +1,27 @@
<?php
include('common.inc.php');
include_header("Routes");
-/* data-filter="true">';
-echo "<script> $('#routeList').listnav({prefixes: ['to'] }); </script>";*/
+echo'
+ <div data-role="navbar">
+ <ul>
+ <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>
+ ';
echo ' <ul data-role="listview">';
$url = $APIurl."/json/routes";
$contents = json_decode(getPage($url));
+debug(print_r($contents,true));
+
+function printRoutes($routes){
+ foreach($routes as $row) {
+ echo '<li>'.$row[1].' <a href="trip.php?routeid='.$row[0].'">'.$row[2]." (".ucwords($row[3]).")</a></li>\n";
+ }
+}
+
if ($_REQUEST['bynumber']) {
$routeSeries = Array();
foreach ($contents as $key => $row) {
@@ -22,9 +37,7 @@
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";
- }
+ printRoutes($routes);
echo "</ul></li>\n";
}
} else {
@@ -34,22 +47,12 @@
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";
- }
+ printRoutes($routes);
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="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>
- ';
+
include_footer();
?>
--- a/busui/schedule_viewer.py
+++ b/busui/schedule_viewer.py
@@ -256,7 +256,12 @@
schedule = self.server.schedule
result = []
for r in schedule.GetRouteList():
- result.append( (r.route_id, r.route_short_name, r.route_long_name) )
+ servicep = None
+ for t in schedule.GetTripList():
+ if t.route_id == r.route_id:
+ servicep = t.service_period
+ break
+ result.append( (r.route_id, r.route_short_name, r.route_long_name, servicep.service_id) )
result.sort(key = lambda x: x[1:3])
return result
@@ -273,8 +278,6 @@
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):
--- /dev/null
+++ b/busui/staticmaplite/.gitignore
@@ -1,1 +1,3 @@
+cache/tiles
+cache/map
--- /dev/null
+++ b/busui/staticmaplite/images/markers/GPlotter - Make Google Maps Easily.URL
@@ -1,1 +1,3 @@
+[InternetShortcut]
+URL=http://gplotter.offwhite.net/
--- /dev/null
+++ b/busui/staticmaplite/images/markers/Google Maps Icons, Free!.URL
@@ -1,1 +1,3 @@
+[InternetShortcut]
+URL=http://brennan.offwhite.net/blog/2005/07/23/new-google-maps-icons-free/
Binary files /dev/null and b/busui/staticmaplite/images/markers/Thumbs.db differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb1.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb10.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb11.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb12.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb13.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb14.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb15.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb16.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb17.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb18.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb19.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb2.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb20.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb21.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb22.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb23.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb24.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb25.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb3.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb4.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb5.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb6.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb7.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb8.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/iconb9.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong1.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong10.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong11.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong12.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong13.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong14.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong15.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong16.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong17.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong18.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong19.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong2.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong20.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong21.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong22.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong23.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong24.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong25.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong3.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong4.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong5.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong6.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong7.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong8.png differ
Binary files /dev/null and b/busui/staticmaplite/images/markers/icong9.png differ