Added service periods to route names
Added service periods to route names

file:a/.gitignore -> file:b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-maxious-canberra-transit-feed/output/
+origin-src
 

file:a/betweenpoint.load.php (deleted)
--- a/betweenpoint.load.php
+++ /dev/null
@@ -1,76 +1,1 @@
-<?php

-/*

- * GeoPo Encode in PHP

- * @author : Shintaro Inagaki

- * @param $location (Array)

- * @return $geopo (String)

- */

-function geopoEncode($lat, $lng) {

-	// 64characters (number + big and small letter + hyphen + underscore)

-	$chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";

-

-	$geopo = "";

-	$scale = 7;

-	

-	// Change a degree measure to a decimal number

-	$lat = ($lat + 90) / 180 * pow(8, 10);

-	$lng = ($lng + 180) / 360 * pow(8, 10);

-	// Compute a GeoPo code from head and concatenate

-	for($i = 0; $i < $scale; $i++) {

-		$geopo .= substr($chars, floor($lat / pow(8, 9 - $i) % 8) + floor($lng / pow(8, 9 - $i) % 8) * 8, 1);

-	}

-	return $geopo;

-}		

-

-/*

- * GeoPo Decode in PHP

- * @author : Shintaro Inagaki

- * @param $geopo (String)

- * @return $location (Array)

- */

-function geopoDecode($geopo) {

-	// 64characters (number + big and small letter + hyphen + underscore)

-	$chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";

-	// Array for geolocation

-	$location = array ();

-

-	for ($i = 0; $i < strlen($geopo); $i++) {

-		// What number of character that equal to a GeoPo code (0-63)

-		$order = strpos($chars, substr($geopo, $i, 1));

-		// Lat/Lng plus geolocation value of scale 

-		$location['lat'] = $location['lat'] + floor($order % 8) * pow(8, 9 - $i);

-		$location['lng'] = $location['lng'] + floor($order / 8) * pow(8, 9 - $i);

-	}

-

-	// Change a decimal number to a degree measure, and plus revised value that shift center of area

-	$location['lat'] = $location['lat'] * 180 / pow(8, 10) + 180 / pow(8, strlen($geopo)) / 2 - 90;

-	$location['lng'] = $location['lng'] * 360 / pow(8, 10) + 360 / pow(8, strlen($geopo)) / 2 - 180;

-	$location['scale'] = strlen($geopo);

-

-	return $location;

-}	

-

-$conn = pg_connect("dbname=bus user=postgres password=snmc");

-if (!$conn) {

-  echo "An error occured.\n";

-  exit;

-}

-$xml = simplexml_load_file("04-locatebetweenpoints.osm");

-

-/* Access the <rating> nodes of the first movie.

- * Output the rating scale, too. */

-foreach ($xml->node as $node) {

-	$geoPo = geopoEncode((float)$node['lat'],(float)$node['lon']);

-	$node['lat'] = (int) ((float)$node['lat']*10000000);

-	$node['lon'] = (int) ((float)$node['lon']*10000000);

-	echo($node['lat'].",".$node['lon']."=$geoPo<br>");

-   $sql = "INSERT INTO stops (geohash, lat, lng) VALUES('$geoPo','{$node['lat']}','{$node['lon']}')";

-     $result = pg_query($conn, $sql);

-     if (!$result) {

-         echo("Error in SQL query: " . pg_last_error() ."<br>\n");

-     }

-flush();

-    

-}

-?>

 

--- a/betweenpoint.php
+++ b/betweenpoint.php
@@ -7,71 +7,66 @@
 
 function init()
 {
-		// create the ol map object
-		var map = new OpenLayers.Map('map');
+    // 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");
+    markers = new OpenLayers.Layer.Markers("Between Stop Markers");
  
 
 <?php
-$conn = pg_connect("dbname=bus user=postgres password=snmc");
-if (!$conn) {
-  echo "An error occured.\n";
-  exit;
-}
-$result_stops = pg_query($conn, "Select * FROM stops");                                     
-
-while ($stop = pg_fetch_assoc($result_stops)) {
-echo 'marker = new OpenLayers.Marker(new OpenLayers.LonLat('.($stop['lng']/10000000).",".($stop['lat']/10000000).')
+  $conn = pg_connect("dbname=bus user=postgres password=snmc");
+  if (!$conn) {
+      echo "An error occured.\n";
+      exit;
+  }
+  $result_stops = pg_query($conn, "Select * FROM stops");
+  
+  while ($stop = pg_fetch_assoc($result_stops)) {
+      echo 'marker = new OpenLayers.Marker(new OpenLayers.LonLat(' . ($stop['lng'] / 10000000) . "," . ($stop['lat'] / 10000000) . ')
             .transform(
             new OpenLayers.Projection("EPSG:4326"), // transform from WGS 1984
             new OpenLayers.Projection("EPSG:900913") // to Spherical Mercator Projection
             ));';
-
-echo '
-            marker.id="'.$stop['geohash'].'";
+      
+      echo '
+            marker.id="' . $stop['geohash'] . '";
             markers.addMarker(marker);
 marker.events.register("mousedown", marker, function() {
 document.getElementById("between_points").innerHTML += this.id+";";
 });
 ';
-}
+  }
 ?>
 var timeicon = new OpenLayers.Icon("http://maps.google.com/mapfiles/kml/pushpin/grn-pushpin.png",new OpenLayers.Size(32,32));
 var timepoints = new OpenLayers.Layer.GeoRSS("Timing Points", "displaytimepoints.georss.php", { icon: timeicon });
 
             map.addLayers([osmtiles, markers,timepoints]);
             map.addControl(new OpenLayers.Control.LayerSwitcher());
-	    map.zoomToExtent(markers.getDataExtent());
+      map.zoomToExtent(markers.getDataExtent());
  }
+    </script>
+        <script type="text/javascript">
+function submitBetween () {
+        $.post("betweenpoint.submit.php", $("#inputform").serialize(), function(html){
+        $("#response").html(html);
+        //clearForms();
+	return false;
+      });
+};
 
-	function submit(){
-		$.ajax({
-			type: "POST",
-			url: "betweenpoint.submit.php",
-			data: 	"reverse=" + document.getElementById("reverse").value + 
-					"&from=" + document.getElementById("from").value + 
-					"&to=" + document.getElementById("to").value +
-					"&routes=" + document.getElementById("routes").value +
-					"&between_points=" + document.getElementById("between_points").value,
-			success: function(html){
-				$("#response").html(html);
-				clearForms();
-			}
-		});
-		
-		}
-<!--
 function OnChange(dropdown)
 {
     var myindex  = dropdown.selectedIndex
-    var selValue = dropdown.options[myindex].value
-alert(selValue);    
+    var selValue = dropdown.options[myindex].value;
+  $("#routes").val(selValue.split(":",2)[0]);
+  fromto = selValue.split(":",2)[1];
+  $("#from").val(fromto.split("->",2)[0]);
+  $("#to").val(fromto.split("->",2)[1]);
+ document.getElementById("between_points").innerHTML = "";
     return true;
 }
-//--> 
 
 // function will clear input elements on each form
 function clearForms(){
@@ -96,7 +91,7 @@
           break;
         case "radio":
         case "checkbox":
-          document.forms[x].elements[y].checked = "";
+          document.forms[x].elements[y].checked = true;
           break;
         case "select-one":
           document.forms[x].elements[y].options[0].selected = true;
@@ -118,72 +113,76 @@
 <select name=selectPair onchange='OnChange(this.form.selectPair);'>
 <option>Select a from/to pair...</option>
 <?php
-include('spyc/spyc.php');
-//$timetable = Spyc::YAMLLoad('../spyc.yaml');
-$path = "maxious-canberra-transit-feed/output/";
-$dhandle = opendir("maxious-canberra-transit-feed/output/");
-// define an array to hold the files
-$files = array();
-$paths = array();
+  include('spyc/spyc.php');
+  //$timetable = Spyc::YAMLLoad('../spyc.yaml');
+  $path = "maxious-canberra-transit-feed/output/";
+  $dhandle = opendir("maxious-canberra-transit-feed/output/");
+  // define an array to hold the files
+  $files = array();
+  $paths = array();
+  
+  if ($dhandle) {
+      // loop through all of the files
+      while (false !== ($fname = readdir($dhandle))) {
+          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"]);
+              for ($i = 0; $i < sizeof($timetable["time_points"]) - 1; $i++) {
+		$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"] . ";";
+              }
+          }
+      }
+  }
+  ksort($paths);
+  
+  $completedPaths = array();
+  $result_betweenstops = pg_query($conn, "Select * FROM between_stops");
+  while ($path = pg_fetch_assoc($result_betweenstops)) {
+    $key = trim($path['fromlocation']) . "->" . trim($path['tolocation']);
+    $completedPaths[$key].= trim($path['routes']);
+    
+  }
 
-if ($dhandle) {
-   // loop through all of the files
-   while (false !== ($fname = readdir($dhandle))) {
-      if (($fname != '.') && ($fname != '..')) {
-		$timetable = Spyc::YAMLLoad("maxious-canberra-transit-feed/output/".$fname);
-		for ($i = 0; $i < sizeof($timetable["time_points"]) -1 ; $i++)
-		{
-			@$paths[$timetable["time_points"][$i]."->".$timetable["time_points"][$i+1]] .= $timetable["short_name"].";";
-		}
+ 
+  foreach ($paths as $path => $routes) {
+      if (!in_array($path, array_keys($completedPaths))) {
+          echo "<option value=\"$routes:$path\">" . sizeof(explode(";", $routes)) . " $path</option>\n";
+      } else {
+	$completedRoutes = explode(";", $completedPaths[$path]);
+	 $incompleteRoutes = "";
+	foreach (explode(";", $routes) as $route) {
+
+	  if (!in_array($route,$completedRoutes) && strstr($incompleteRoutes,';'.$route.';') === false) {
+	  $incompleteRoutes .= $route.';';
+	  }
+	  
 	}
-   }
-}
-$completedPaths = Array("Cameron Ave Bus Station->Lathlain St Bus Station",
-"Lathlain St Bus Station->Cohen St Bus Station",
-"Cohen St Bus Station->Lathlain St Bus Station",
-"Lathlain St Bus Station->Cameron Ave Bus Station",
-"Lathlain St Bus Station - Platform 1->Cameron Ave Bus Station - Platform 1",
-"Lathlain St Bus Station - Platform 2->Cameron Ave Bus Station - Platform 1",
-"Lathlain St Bus Station - Platform 2->Cameron Ave Bus Station - Platform 2",
-"Lathlain St Bus Station - Platform 3->Cameron Ave Bus Station - Platform 2",
-"Lathlain St Bus Station - Platform 3->Cameron Ave Bus Station - Platform 3",
-"Lathlain St Bus Station - Platform 4->Cohen St Bus Station - Platform 4",
-"Lathlain St Bus Station - Platform 4->Cohen St Bus Station - Platform 6",
-"Lathlain St Bus Station - Platform 5->Cohen St Bus Station - Platform 5",
-"Lathlain St Bus Station - Platform 6->Cohen St Bus Station - Platform 5",
-"Cohen St Bus Station - Platform 1->Lathlain St Bus Station - Platform 2",
-"Cohen St Bus Station - Platform 1->Lathlain St Bus Station - Platform 3",
-"Cohen St Bus Station - Platform 2->Lathlain St Bus Station - Platform 1",
-"Cohen St Bus Station - Platform 2->Lathlain St Bus Station - Platform 2",
-"Cohen St Bus Station - Platform 2->Lathlain St Bus Station - Platform 3",
-"Cohen St Bus Station - Platform 3->Lathlain St Bus Station - Platform 1",
-"Cameron Ave Bus Station - Platform 4->Lathlain St Bus Station - Platform 4", 
-"Cameron Ave Bus Station - Platform 5->Lathlain St Bus Station - Platform 5",
-"Cameron Ave Bus Station - Platform 5->Lathlain St Bus Station - Platform 6"
-);
-ksort($paths);
-foreach ($paths as $path => $routes)
-{
- if (!in_array($path,$completedPaths)) echo  "<option value=\"$routes:$path\">".sizeof(explode(";",$routes))." $path</option>\n";
-}
+	if ($incompleteRoutes != "") {
+	  echo "<option value=\"$incompleteRoutes:$path\">" . sizeof(explode(";", $incompleteRoutes)) . " $path</option>\n";
+	}
+      }
+      
+  }
 ?>
 </select>
- from <input type="text" id="from"/>
- to <input type="text" id="to"/>
+ from <input type="text" name="from" id="from"/>
+ to <input type="text" name="to" id="to"/>
 <br>
- on routes <input type="text" id="routes"/>
-Reverse? <input type="checkbox" name="reverse" id="reverse" value="true"/> 
-<input type="button" onclick="javascript:submit()" name="mysubmit" value="Submit!">
+ on routes <input type="text" name="routes" id="routes"/>
+Reverse? <input type="checkbox" name="reverse" id="reverse" checked="true"/> 
+<input type="button" onclick="javascript:submitBetween()" value="Submit!">
 <input type="button" value="Clear" onclick="javascript:clearForms()" title="Start clearForms() JavaScript function">
 <br>
-<textarea id="between_points" rows="1" cols="120"></textarea>
+<textarea name="between_points" id="between_points" rows="1" cols="120"></textarea>
 </form>
-<br><div id="response">
-		<!-- Our message will be echoed out here -->
-	</div>
+<div id="response">
+    <!-- Our message will be echoed out here -->
+  </div>
 </div>
    <div id="map" width="100%" height="100%"></div>
   </body>
 </html>
 
-

--- a/betweenpoint.submit.php
+++ b/betweenpoint.submit.php
@@ -1,76 +1,32 @@
 <?php

-/*

- * GeoPo Encode in PHP

- * @author : Shintaro Inagaki

- * @param $location (Array)

- * @return $geopo (String)

- */

-function geopoEncode($lat, $lng) {

-	// 64characters (number + big and small letter + hyphen + underscore)

-	$chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";

-

-	$geopo = "";

-	$scale = 7;

-	

-	// Change a degree measure to a decimal number

-	$lat = ($lat + 90) / 180 * pow(8, 10);

-	$lng = ($lng + 180) / 360 * pow(8, 10);

-	// Compute a GeoPo code from head and concatenate

-	for($i = 0; $i < $scale; $i++) {

-		$geopo .= substr($chars, floor($lat / pow(8, 9 - $i) % 8) + floor($lng / pow(8, 9 - $i) % 8) * 8, 1);

-	}

-	return $geopo;

-}		

-

-/*

- * GeoPo Decode in PHP

- * @author : Shintaro Inagaki

- * @param $geopo (String)

- * @return $location (Array)

- */

-function geopoDecode($geopo) {

-	// 64characters (number + big and small letter + hyphen + underscore)

-	$chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";

-	// Array for geolocation

-	$location = array ();

-

-	for ($i = 0; $i < strlen($geopo); $i++) {

-		// What number of character that equal to a GeoPo code (0-63)

-		$order = strpos($chars, substr($geopo, $i, 1));

-		// Lat/Lng plus geolocation value of scale 

-		$location['lat'] = $location['lat'] + floor($order % 8) * pow(8, 9 - $i);

-		$location['lng'] = $location['lng'] + floor($order / 8) * pow(8, 9 - $i);

-	}

-

-	// Change a decimal number to a degree measure, and plus revised value that shift center of area

-	$location['lat'] = $location['lat'] * 180 / pow(8, 10) + 180 / pow(8, strlen($geopo)) / 2 - 90;

-	$location['lng'] = $location['lng'] * 360 / pow(8, 10) + 360 / pow(8, strlen($geopo)) / 2 - 180;

-	$location['scale'] = strlen($geopo);

-

-	return $location;

-}	

-

 $conn = pg_connect("dbname=bus user=postgres password=snmc");

 if (!$conn) {

   echo "An error occured.\n";

   exit;

 }

-$xml = simplexml_load_file("04-locatebetweenpoints.osm");

-

-/* Access the <rating> nodes of the first movie.

- * Output the rating scale, too. */

-foreach ($xml->node as $node) {

-	$geoPo = geopoEncode((float)$node['lat'],(float)$node['lon']);

-	$node['lat'] = (int) ((float)$node['lat']*10000000);

-	$node['lon'] = (int) ((float)$node['lon']*10000000);

-	echo($node['lat'].",".$node['lon']."=$geoPo<br>");

-   $sql = "INSERT INTO stops (geohash, lat, lng) VALUES('$geoPo','{$node['lat']}','{$node['lon']}')";

+print_r($_REQUEST);

+$reverse=$_REQUEST["reverse"];

+$from=$_REQUEST["from"];

+$to=$_REQUEST["to"];

+$routes=$_REQUEST["routes"] ;

+$points=$_REQUEST["between_points"];

+   $sql = "INSERT INTO between_stops (fromLocation, toLocation, points, routes) VALUES('$from','$to','$points','$routes')";

      $result = pg_query($conn, $sql);

      if (!$result) {

          echo("Error in SQL query: " . pg_last_error() ."<br>\n");

      }

+     if ($reverse === "on") {

+	$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");

+     }

+     }

 flush();

     

-}

 ?>

 

file:b/busui/about.php (new)
--- /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
@@ -1,34 +1,89 @@
 <?php
 date_default_timezone_set('Australia/ACT');
 $APIurl = "http://localhost:8765";
+error_reporting(E_ALL ^ E_NOTICE);
 
 function isDebug()
 {
     return true;
 }
 
+function debug($msg) {
+    if (isDebug()) echo "<!-- $msg -->";
+}
 function isFastDevice() {
     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" /> 
-	<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> 
-	<script type="text/javascript" src="docs/docs.js"></script> 
-</head> 
+	<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" />';
+ 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> 
- 
-<div data-role="page"> 
+ ';
+if ($opendiv) echo '<div data-role="page"> 
  
 	<div data-role="header"> 
-		<h1>'.$pageTitle.'</h1> 
+		<h1>'.$pageTitle.'</h1>
 	</div><!-- /header -->
         <div data-role="content"> ';
 }
@@ -80,5 +135,181 @@
   }
   return $f;
 }
+
+function staticmap($mapPoints, $zoom = 0, $markerImage = "iconb")
+{
+$width = 300;
+$height = 300;
+$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 = "";
+$minlat = 999;
+$minlon = 999;
+$maxlat = 0;
+$maxlon = 0;
+
+    if (sizeof($mapPoints) < 1) return "map error";
+    if (sizeof($mapPoints) === 1) {
+         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].",".$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];
+        }
+        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)
+{
+// 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;
+      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) {
+      $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;
+}
+
+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);
+}
 ?>
   
+

 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
file: