joshtronic/php-googleplaces
1
0
Fork 0
Code Issues 2 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Added namespace, moved library to src

Browse source 
Also cleaned up some stray whitespace and formatted the latest functionality to
be in line with the rest of the file.
This commit is contained in:
Josh Sherman 2014-05-14 12:09:18 -04:00
parent 34506d71db
commit e8d8689ce3
2 changed files with 61 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

20
composer.json
View file

@ -1,14 +1,16 @@
{ {
"name": "joshtronic/php-googleplaces", "name": "joshtronic/php-loremipsum",
"description": "PHP Wrapper for the Google Places API ", "description": "PHP Wrapper for the Google Places API",
"license": "MIT", "license": "MIT",
"authors": [ "authors": [{
{ "name": "Josh Sherman",
"name": "Joshua Sherman", "email": "josh@gravityblvd.com",
"email": "josh@gravityblvd.com" "homepage": "https://github.com/joshtronic/php-googleplaces"
} }],
],
"autoload": { "autoload": {
"classmap": ["GooglePlaces.php"] "classmap": ["src/"]
},
"require-dev": {
"satooshi/php-coveralls": "dev-master"
} }
} }

76
GooglePlaces.php → src/GooglePlaces.php
View file

@ -1,5 +1,7 @@
<?php <?php
namespace joshtronic;
class GooglePlaces class GooglePlaces
{ {
private $key = ''; private $key = '';
@ -54,7 +56,8 @@ class GooglePlaces
/** /**
* Loops through all of our variables to make a parameter list * Loops through all of our variables to make a parameter list
*/ */
private function parameterBuilder($parameters){ private function parameterBuilder($parameters)
{
foreach (get_object_vars($this) as $variable => $value) foreach (get_object_vars($this) as $variable => $value)
{ {
// Except these variables // Except these variables
@ -121,7 +124,8 @@ class GooglePlaces
* takes the parameters and method to throw exceptions or modify parameters as needed * takes the parameters and method to throw exceptions or modify parameters as needed
* @todo Method to sanity check passed types * @todo Method to sanity check passed types
*/ */
private function methodChecker($parameters, $method){ private function methodChecker($parameters, $method)
{
if (!isset($parameters['pagetoken'])) if (!isset($parameters['pagetoken']))
{ {
switch ($method) switch ($method)
@ -145,7 +149,6 @@ class GooglePlaces
{ {
unset($parameters['radius']); unset($parameters['radius']);
} }
break; break;
case 'prominence': case 'prominence':
@ -153,7 +156,6 @@ class GooglePlaces
{ {
throw new Exception('You must specify a radius.'); throw new Exception('You must specify a radius.');
} }
break; break;
} }
} }
@ -201,7 +203,8 @@ class GooglePlaces
/** /**
* Submits request via curl, sets the response, then returns the response * Submits request via curl, sets the response, then returns the response
*/ */
private function queryGoogle($url, $parameters){ private function queryGoogle($url, $parameters)
{
if ($this->pagetoken !== null) if ($this->pagetoken !== null)
{ {
$parameters['pagetoken'] = $this->pagetoken; $parameters['pagetoken'] = $this->pagetoken;
@ -263,53 +266,70 @@ class GooglePlaces
/** /**
* Returns the longitude equal to a given distance (meters) at a given latitude * Returns the longitude equal to a given distance (meters) at a given latitude
*/ */
public function meters2lng($meters,$latitude){ public function meters2lng($meters, $latitude)
return $meters/(cos(deg2rad($latitude))*40075160/360); {
return $meters / (cos(deg2rad($latitude)) * 40075160 / 360);
} }
/** /**
* Returns the latitude equal to a given distance (meters) * Returns the latitude equal to a given distance (meters)
*/ */
public function meters2lat($meters){ public function meters2lat($meters)
return $meters/(40075160/360); {
return $meters / (40075160 / 360);
} }
/** /**
* Returns the aggregated responses for a subdivided search * Returns the aggregated responses for a subdivided search
*/ */
private function subdivide($url, $parameters){ private function subdivide($url, $parameters)
if (($this->radius % $this->subradius) || ($this->subradius < 200) || (($this->radius/$this->subradius)%2)) { {
throw new Exception('Subradius should divide evenly into radius. Also, subradius should be 200 meters or so. (ex: 2000/200 = 10x10 grid. NOT 2000/33 = 60.6x60.6 grid. NOT 2000/16 = 125x125 grid)'); if (($this->radius % $this->subradius) || ($this->subradius < 200) || (($this->radius / $this->subradius) % 2))
{
throw new Exception('Subradius should divide evenly into radius. Also, subradius should be 200 meters or so. (ex: 2000/200 = 10x10 grid. NOT 2000/33 = 60.6x60.6 grid. NOT 2000/16 = 125x125 grid)');
} }
$center = explode(',', $this->location);
$center = explode(',', $this->location);
$centerlat = $center[0]; $centerlat = $center[0];
$centerlng = $center[1]; $centerlng = $center[1];
$count = $this->radius / $this->subradius; $count = $this->radius / $this->subradius;
$lati = $this->meters2lat($this->subradius*2); $lati = $this->meters2lat($this->subradius * 2);
$this->grid['results'] = array(); $this->grid['results'] = array();
for ($i=$count/2*-1; $i <= $count/2; $i++) {
$lat = $centerlat + $i*$lati; for ($i = $count / 2 * -1; $i <= $count / 2; $i++)
$lngi = $this->meters2lng($this->subradius*2,$lat); {
for ($j=$count/2*-1; $j <= $count/2; $j++) { $lat = $centerlat + $i * $lati;
$lng = $centerlng + $j*$lngi; $lngi = $this->meters2lng($this->subradius * 2, $lat);
for ($j = $count / 2 * -1; $j <= $count / 2; $j++)
{
$lng = $centerlng + $j * $lngi;
$loc = $lat . ',' . $lng; $loc = $lat . ',' . $lng;
$parameters['location'] = $loc; $parameters['location'] = $loc;
$parameters['radius'] = $this->subradius; $parameters['radius'] = $this->subradius;
$this->queryGoogle($url, $parameters); $this->queryGoogle($url, $parameters);
$this->grid[$i][$j] = $this->response;
$this->grid['results'] = array_merge($this->grid['results'],$this->response['results']); $this->grid[$i][$j] = $this->response;
while ($this->response['next_page_token']) { $this->grid['results'] = array_merge($this->grid['results'], $this->response['results']);
while ($this->response['next_page_token'])
{
$this->pagetoken = $this->response['next_page_token']; $this->pagetoken = $this->response['next_page_token'];
$this->queryGoogle($url, $parameters); $this->queryGoogle($url, $parameters);
$this->grid[$i][$j] = array_merge($this->grid[$i][$j],$this->response);
$this->grid['results'] = array_merge($this->grid['results'],$this->response['results']); $this->grid[$i][$j] = array_merge($this->grid[$i][$j], $this->response);
$this->pagetoken = null; $this->grid['results'] = array_merge($this->grid['results'], $this->response['results']);
$this->pagetoken = null;
} }
} }
} }
return $this->grid; return $this->grid;
} }
} }
?> ?>