From: maxious <maxious@lambdacomplex.org>
Date: Wed, 16 Mar 2011 08:18:49 +0000
Subject: Round distances to 2 decimal place kilometers
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=b5c5993a2a28a6141d107876b198f8e32c720fcd
---
Round distances to 2 decimal place kilometers
---


--- a/common-geo.inc.php
+++ b/common-geo.inc.php
@@ -51,7 +51,7 @@
 	if ($collapsible) $output.= '</div>';
 	return $output;
 }
-function distance($lat1, $lng1, $lat2, $lng2)
+function distance($lat1, $lng1, $lat2, $lng2, $roundLargeValues = false)
 {
 	$pi80 = M_PI / 180;
 	$lat1*= $pi80;
@@ -64,7 +64,10 @@
 	$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;
+	if ($roundLargeValues) {
+	  if ($km < 1) return floor($km * 1000);
+	  else return round($km,2)."k";
+	} else return floor($km * 1000);
 }
 function decodePolylineToArray($encoded)
 {

--- a/common-template.inc.php
+++ b/common-template.inc.php
@@ -63,7 +63,12 @@
 }
 
 if (navigator.geolocation) {
-  navigator.geolocation.getCurrentPosition(success, error);
+var options = {
+      enableHighAccuracy: false,
+      timeout: 60000,
+      maximumAge: 10000
+}
+  navigator.geolocation.getCurrentPosition(success, error, options);
 }
 
 </script> ";

--- a/common.inc.php
+++ b/common.inc.php
@@ -129,5 +129,33 @@
 {
 	return str_replace(")", "</small>", str_replace("(", "<br><small>", $input));
 }
+
+function sksort(&$array, $subkey="id", $sort_ascending=false) {
+
+    if (count($array))
+        $temp_array[key($array)] = array_shift($array);
+
+    foreach($array as $key => $val){
+        $offset = 0;
+        $found = false;
+        foreach($temp_array as $tmp_key => $tmp_val)
+        {
+            if(!$found and strtolower($val[$subkey]) > strtolower($tmp_val[$subkey]))
+            {
+                $temp_array = array_merge(    (array)array_slice($temp_array,0,$offset),
+                                            array($key => $val),
+                                            array_slice($temp_array,$offset)
+                                          );
+                $found = true;
+            }
+            $offset++;
+        }
+        if(!$found) $temp_array = array_merge($temp_array, array($key => $val));
+    }
+
+    if ($sort_ascending) $array = array_reverse($temp_array);
+
+    else $array = $temp_array;
+}
 ?>
 

--- a/index.php
+++ b/index.php
@@ -19,6 +19,7 @@
                 <li data-role="list-divider">Timetables - Routes</li>
                 <li><a href="routeList.php">Routes By Final Destination</a></li>
 		<li><a href="routeList.php?bynumber=yes">Routes By Number</a></li>
+		<li><a href="routeList.php?bysuburb=yes">Stops By Suburb</a></li>
 		<li><a class="nearby" href="routeList.php?nearby=yes">Nearby Routes</a></li>
             </ul>
 <?php

--- a/routeList.php
+++ b/routeList.php
@@ -1,7 +1,8 @@
 <?php
 include ('common.inc.php');
-include_header("Routes", "routeList");
-echo '
+function navbar()
+{
+	echo '
 		<div data-role="navbar"> 
 			<ul> 
 				<li><a href="routeList.php">By Final Destination...</a></li> 
@@ -11,16 +12,55 @@
 			</ul>
                 </div>
 	';
-echo '  <ul data-role="listview"  data-inset="true">';
-$url = $APIurl . "/json/routes";
-$contents = json_decode(getPage($url));
-function printRoutes($routes)
-{
+}
+if ($_REQUEST['bysuburb']) {
+	include_header("Routes by Suburb", "routeList");
+	navbar();
+	echo '  <ul data-role="listview" data-filter="true" data-inset="true" >';
+	foreach ($suburbs as $suburb) {
+		if (!isset($_REQUEST['firstLetter'])) {
+			foreach (range('A', 'Z') as $letter) {
+				echo "<li><a href=\"routeList.php?firstLetter=$letter&bysuburb=yes\">$letter...</a></li>\n";
+			}
+		}
+		else if (startsWith($suburb, $_REQUEST['firstLetter'])) {
+			echo '<li><a href="routeList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>';
+		}
+	}
+	echo '</ul>';
+}
+else if ($_REQUEST['nearby'] || $_REQUEST['suburb']) {
+	if ($_REQUEST['suburb']) {
+		$suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);
+		$url = $APIurl . "/json/stopzonesearch?q=" . $suburb;
+		include_header("Routes by Suburb", "routeList");
+	}
+	if ($_REQUEST['nearby']) {
+		$url = $APIurl . "/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15";
+		include_header("Routes Nearby", "routeList");
+	}
+	$stops = json_decode(getPage($url));
+	$routes = Array();
+	foreach ($stops as $stop) {
+		$url = $APIurl . "/json/stoproutes?stop=" . $stop[0];
+		$stoproutes = json_decode(getPage($url));
+		foreach ($stoproutes as $route) {
+			if (!isset($routes[$route[0]])) $routes[$route[0]] = $route;
+		}
+	}
+	navbar();
+	echo '  <ul data-role="listview" data-filter="true" data-inset="true" >';
+	sksort($routes, 1, true);
 	foreach ($routes as $row) {
-		echo '<li>' . $row[1] . ' <a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . " (" . ucwords($row[3]) . ")</a></li>\n";
+		echo '<li>' . $row[1] . ' <a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . " (" . ucwords($row[4]) . ")</a></li>\n";
 	}
 }
-if ($_REQUEST['bynumber']) {
+else if ($_REQUEST['bynumber']) {
+	include_header("Routes by Number", "routeList");
+	navbar();
+	echo ' <ul data-role="listview"  data-inset="true">';
+	$url = $APIurl . "/json/routes";
+	$contents = json_decode(getPage($url));
 	$routeSeries = Array();
 	$seriesRange = Array();
 	foreach ($contents as $key => $row) {
@@ -54,11 +94,19 @@
 		echo '<a name="' . $series . '"></a>';
 		if ($series <= 9) echo '<li>' . $series . "<ul>\n";
 		else echo "<li>{$seriesRange[$series]['min']}-{$seriesRange[$series]['max']}<ul>\n";
-		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";
+		}
 		echo "</ul></li>\n";
 	}
 }
 else {
+	include_header("Routes by Destination", "routeList");
+	navbar();
+	echo ' <ul data-role="listview"  data-inset="true">';
+	$url = $APIurl . "/json/routes";
+	$contents = json_decode(getPage($url));
+	// by destination!
 	foreach ($contents as $key => $row) {
 		$routeDestinations[$row[2]][] = $row;
 	}
@@ -73,7 +121,9 @@
 	foreach ($routeDestinations as $destination => $routes) {
 		echo '<a name="' . $destination . '"></a>';
 		echo '<li>' . $destination . "... <ul>\n";
-		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";
+		}
 		echo "</ul></li>\n";
 	}
 }

--- a/schedule_viewer.py
+++ b/schedule_viewer.py
@@ -281,6 +281,23 @@
       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
+
+  def handle_json_GET_routesearch(self, params):
+    """Return a list of routes with matching short name."""
+    schedule = self.server.schedule
+    routeshortname = params.get('routeshortname', None)
+    result = []
+    for r in schedule.GetRouteList():
+      if r.route_short_name == routeshortname:
+        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
+
 
   def handle_json_GET_routerow(self, params):
     schedule = self.server.schedule
@@ -477,8 +494,8 @@
     result = {}
     for trip in trips:
       route = schedule.GetRoute(trip.route_id)
-      if not trip.route_short_name+route.route_long_name in result:
-        result[trip.route_short_name+route.route_long_name] = (route.route_id, route.route_short_name, route.route_long_name, trip.trip_id)
+      if not route.route_short_name+route.route_long_name+trip.service_id in result:
+        result[route.route_short_name+route.route_long_name+trip.service_id] = (route.route_id, route.route_short_name, route.route_long_name, trip.trip_id, trip.service_id)
     return result
     
   def handle_json_GET_stopalltrips(self, params):
@@ -509,6 +526,8 @@
       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_json_GET_stoptrips(self, params):
     """Given a stop_id and time in seconds since midnight return the next

--- a/stopList.php
+++ b/stopList.php
@@ -63,7 +63,7 @@
 		timePlaceSettings();
 	}
 	echo '  <ul data-role="listview" data-filter="true" data-inset="true" >';
-	if (!isset($_REQUEST['firstLetter']) && !$_REQUEST['suburb']) {
+	if (!isset($_REQUEST['firstLetter']) && !$_REQUEST['suburb'] && !$_REQUEST['nearby']) {
 		foreach (range('A', 'Z') as $letter) {
 			echo "<li><a href=\"stopList.php?firstLetter=$letter&$listType\">$letter...</a></li>\n";
 		}
@@ -75,9 +75,9 @@
 		}
 		// Sort the stops by name
 		array_multisort($stopName, SORT_ASC, $stops);
-		if (!isset($_REQUEST['suburb'])){
+		if (!isset($_REQUEST['suburb']) && !isset($_REQUEST['nearby'])){
 		  $stops = array_filter($stops, "filterByFirstLetter");
-		}
+		} 
 		$stopsGrouped = Array();
 		foreach ($stops as $key => $row) {
 				if ((trim(preg_replace("/\(Platform.*/","",$stops[$key][1])) != trim(preg_replace("/\(Platform.*/","",$stops[$key + 1][1]))) || $key + 1 >= sizeof($stops)) {
@@ -90,7 +90,7 @@
 						if (!startsWith($stopsGrouped['stop_codes'][0], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">';
 						echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">';
 						if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
-							echo '<span class="ui-li-count">' . floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])) . 'm away</span>';
+							echo '<span class="ui-li-count">' . distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away</span>';
 						}
 						echo bracketsMeanNewLine(trim(preg_replace("/\(Platform.*/","",$row[1])) . '(' . sizeof($stopsGrouped["stop_ids"]) . ' stops)');
 						echo "</a></li>\n";
@@ -102,7 +102,7 @@
 						if (!startsWith($row[5], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">';
 						echo '<a href="stop.php?stopid=' . $row[0] . (startsWith($row[5], "Wj") ? '&stopcode=' . $row[5] : "") . '">';
 						if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
-							echo '<span class="ui-li-count">' . floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])) . 'm away</span>';
+							echo '<span class="ui-li-count">' . distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away</span>';
 						}
 						echo bracketsMeanNewLine($row[1]);
 						echo "</a></li>\n";
@@ -131,7 +131,6 @@
 	       }
 	}
 	echo '</ul>';
-	var_dump ($stopsGrouped);
 }
 include_footer();
 ?>

--- a/trip.php
+++ b/trip.php
@@ -4,16 +4,17 @@
 $stopid = filter_var($_REQUEST['stopid'], FILTER_SANITIZE_NUMBER_INT);
 $routeid = filter_var($_REQUEST['routeid'], FILTER_SANITIZE_NUMBER_INT);
 $routetrips = Array();
-if ($_REQUEST['routeid']) {
+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[0] < midnight_seconds()) {
+		if ($trip[0] > midnight_seconds()) {
 			$tripid = $trip[1];
 			break;
 		}
 	}
-	if (!($tripid > 0)) $tripid = $routetrip[0][1];
+	if ($tripid == 0) $tripid = $routetrips[0][1];
 }
 $url = $APIurl . "/json/triprows?trip=" . $tripid;
 $trips = array_flatten(json_decode(getPage($url)));
@@ -23,18 +24,29 @@
 	$routetrips = json_decode(getPage($url));
 }
 include_header("Stops on " . $trips[1]->route_short_name . ' ' . $trips[1]->route_long_name, "trip");
-timePlaceSettings();
+$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) . '</small>';
 echo '<p> Other Trips: ';
 foreach ($routetrips as $othertrip) {
 	echo '<a href="trip.php?tripid=' . $othertrip[1] . "&routeid=" . $routeid . '">' . midnight_seconds_to_time($othertrip[0]) . '</a> ';
 }
 echo '</p> Other directions/timing periods: ';
+$url = $APIurl . "/json/routesearch?routeshortname=" . $trips[1]->route_short_name;
+$json = json_decode(getPage($url));
+foreach ($json as $row) {
+	if ($row[0] != $routeid) echo '<a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . ' (' . ucwords($row[3]) . ')</a> ';
+}
 echo '  <ul data-role="listview"  data-inset="true">';
-$url = $APIurl . "/json/tripstoptimes?trip=" . $tripid;
-$json = json_decode(getPage($url));
-$stops = $json[0];
-$times = $json[1];
-echo '<li data-role="list-divider">' . midnight_seconds_to_time($times[0]) . '-' . midnight_seconds_to_time($times[sizeof($times) - 1]) . '</li>';
+echo '<li data-role="list-divider">' . midnight_seconds_to_time($times[0]) . '-' . midnight_seconds_to_time($times[sizeof($times) - 1]) . ' ' . $trips[1]->route_long_name . '</li>';
 $stopsGrouped = Array();
 foreach ($stops as $key => $row) {
 	if (($stops[$key][1] != $stops[$key + 1][1]) || $key + 1 >= sizeof($stops)) {
@@ -45,7 +57,7 @@
 			// subsequent duplicates
 			$stopsGrouped["stop_ids"][] = $row[0];
 			$stopsGrouped["endTime"] = $times[$key];
-			echo '<a href="stop.php?stopids=' . implode(",",$stopsGrouped['stop_ids']) . '">';
+			echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">';
 			echo '<p class="ui-li-aside">' . midnight_seconds_to_time($stopsGrouped['startTime']) . ' to ' . midnight_seconds_to_time($stopsGrouped['endTime']) . '</p>';
 			echo bracketsMeanNewLine($row[1]);
 			echo '</a></li>';