--- a/layar_api.php
+++ b/layar_api.php
@@ -3,18 +3,18 @@
 $output = Array();
 $output['hotspots'] = Array();
 $output['layer'] = "canberrabusstops";
-//$max_page = 10;
-//$max_results = 50;
-//$page_start = 0 + filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT);
-//$page_end = $max_page + filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT);
+$max_page = 10;
+$max_results = 50;
+$page_start = 0 + filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT);
+$page_end = $max_page + filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT);
 $lat = filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 $lon = filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
-
-$contents = getNearbyStops($lat, $lon, 50);
+$max_distance = filter_var($_REQUEST['radius'], FILTER_SANITIZE_NUMBER_INT);
+$contents = getNearbyStops($lat, $lon, 50, $max_distance);
 $stopNum = 0;
 foreach ($contents as $stop) {
 	$stopNum++;
-//	if ($stopNum > $page_start && $stopNum <= $page_end) {
+	if ($stopNum > $page_start && $stopNum <= $page_end) {
 		$hotspot = Array();
 		$hotspot['id'] = $stop['stop_id'];
 		$hotspot['title'] = $stop['stop_name'];
@@ -22,22 +22,22 @@
 		$hotspot['lat'] = floor($stop['stop_lat'] * 1000000);
 		$hotspot['lon'] = floor($stop['stop_lon'] * 1000000);
 		$hotspot['distance'] = floor($stop['distance']);
+		$hotspot['attribution'] = "ACTION Buses";
 		$hotspot['actions'] = Array(
 			Array(
 				"label" => 'View more trips/information',
 				'uri' => 'http://bus.lambdacomplex.org/' . 'stop.php?stopid=' . $stop['stop_id']
 			)
 		);
-
-		$trips = getStopTripsWithTimes($stop['stop_id'],"","","",3);
+		$trips = getStopTripsWithTimes($stop['stop_id'], "", "", "", 3);
 		foreach ($trips as $key => $row) {
 			if ($key < 3) {
-				$hotspot['line' . strval($key + 2) ] = $row['route_short_name'] . ' '. $row['route_long_name']. ' @ ' . $row['arrival_time'];
+				$hotspot['line' . strval($key + 2) ] = $row['route_short_name'] . ' ' . $row['route_long_name'] . ' @ ' . $row['arrival_time'];
 			}
 		}
 		if (sizeof($trips) == 0) $hotspot['line2'] = 'No trips in the near future.';
 		$output['hotspots'][] = $hotspot;
-//	}
+	}
 }
 if (sizeof($hotspot) > 0) {
 	$output['errorString'] = 'ok';
@@ -47,14 +47,14 @@
 	$output['errorString'] = 'no results, try increasing range';
 	$output['errorCode'] = 21;
 }
-/*if ($page_end >= $max_results || sizeof($hotspot) < $max_page) {*/
+if ($page_end >= $max_results || sizeof($contents) < $page_start+$max_page) {
 	$output["morePages"] = false;
 	$output["nextPageKey"] = null;
-/*}
+}
 else {
 	$output["morePages"] = true;
 	$output["nextPageKey"] = $page_end;
-}*/
+}
 echo json_encode($output);
 ?>