--- a/layar_api.php +++ b/layar_api.php @@ -1,5 +1,5 @@ $page_start && $stopNum <= $page_end) { - $hotspot = Array(); - $hotspot['id'] = $row[0]; - $hotspot['title'] = $row[1]; + $hotspot['id'] = $stop[id]; + $hotspot['title'] = $stop[name]; $hotspot['type'] = 0; - $hotspot['lat'] = floor($row[2] * 1000000); - $hotspot['lon'] = floor($row[3] * 1000000); - $hotspot['distance'] = distance($row[2], $row[3], $_REQUEST['lat'], $_REQUEST['lon']); - if (!isset($_REQUEST['radius']) || $hotspot['distance'] < $radius) { - - $hotspot['actions'] = Array( - Array( - "label" => 'View more trips/information', - 'uri' => 'http://bus.lambdacomplex.org/' . 'stop.php?stopid=' . $row[0] - ) - ); - $url = $APIurl . "/json/stoptrips?stop=" . $row[0] . "&time=" . midnight_seconds() . "&service_period=" . service_period() . "&limit=4&time_range=" . strval(90 * 60); - $trips = json_decode(getPage($url)); - debug(print_r($trips, true)); - foreach ($trips as $key => $row) { - if ($key < 3) { - $hotspot['line' . strval($key + 2) ] = $row[1][1] . ' @ ' . midnight_seconds_to_time($row[0]); - } + $hotspot['lat'] = floor($stop[lat] * 1000000); + $hotspot['lon'] = floor($stop[lon] * 1000000); + $hotspot['distance'] = distance($stop[lat], $stop[lon], $_REQUEST['lat'], $_REQUEST['lon']); + $hotspot['actions'] = Array( + Array( + "label" => 'View more trips/information', + 'uri' => 'http://bus.lambdacomplex.org/' . 'stop.php?stopid=' . $stop[id] + ) + ); + + $url = $APIurl . "/json/stoptrips?stop=" . $row[0] . "&time=" . midnight_seconds() . "&service_period=" . service_period() . "&limit=4&time_range=" . strval(90 * 60); + $trips = getStopTrips($stopID); + foreach ($trips as $key => $row) { + if ($key < 3) { + $hotspot['line' . strval($key + 2) ] = $row[1][1] . ' @ ' . midnight_seconds_to_time($row[0]); } - if (sizeof($trips) == 0) $hotspot['line2'] = 'No trips in the near future.'; - $output['hotspots'][] = $hotspot; } + if (sizeof($trips) == 0) $hotspot['line2'] = 'No trips in the near future.'; + $output['hotspots'][] = $hotspot; } } if (sizeof($hotspot) > 0) { @@ -64,3 +59,4 @@ } echo json_encode($output); ?> +