Skip to content

Street number on Geocodio #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nyholm merged 1 commit into from
Oct 13, 2016
Merged

Street number on Geocodio #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/Geocoder/Provider/GeocodioProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,19 @@ protected function executeQuery($query)

$coordinates = $location['location'];
$address = $location['address_components'];
$street = $address['street'] ?: null;

//Geocodio does not always return a street, number, or suffix
if (!isset($address['street']) && isset($json['input']['address_components']['street'])) {
//Sometimes Geocodio returns parsed information in the input
$addressInput = $json['input']['address_components'];
$address['street'] = $addressInput['street'];
$address['number'] = $addressInput['number'];
$address['suffix'] = $addressInput['suffix'];
} elseif (!isset($address['street'])) {
$address['street'] = '';
$address['number'] = ''; // No Street = No Number
$address['suffix'] = '';
}

if (!empty($address['suffix'])) {
$address['street'] .= ' ' . $address['suffix'];
Expand Down
57 changes: 57 additions & 0 deletions tests/Geocoder/Tests/Provider/GeocodioProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,63 @@ public function testGetGeocodedDataWithRealAddress()
$this->assertNull($result['timezone']);
}

public function testGetGeocodedDataWithRealAddressThatDoesNotReturnStreet()
{
$api_key = $this->getApiKey('GEOCODIO_API_KEY');

if ($api_key === false) {
$this->markTestSkipped(self::MISSING_API_KEY);
}

$provider = new GeocodioProvider($this->getAdapter(), $api_key);
//Geocodio currently incorrectly parses this address, but Geocodio does know of the bug
$results = $provider->getGeocodedData('386 Branam Rd Old Fort TN 37362');

$this->assertInternalType('array', $results);

$result = $results[0];
$this->assertEquals(35.049196999999999, $result['latitude'], '', 0.01);
$this->assertEquals(-84.735365999999999, $result['longitude'], '', 0.01);
$this->assertNull($result['bounds']);
$this->assertEquals('386', $result['streetNumber']);
$this->assertEquals('Branam Rd Old Ft', $result['streetName']); // Testing bad parsing
$this->assertEquals(37362, $result['zipcode']);
$this->assertEquals('Oldfort', $result['city']);
$this->assertNull($result['county']);
$this->assertEquals('TN', $result['region']);
$this->assertEquals('US', $result['country']);
$this->assertNull($result['countryCode']);
$this->assertNull($result['timezone']);
}

public function testGetGeocodedDataWithRealAddressWithoutStreet()
{
$api_key = $this->getApiKey('GEOCODIO_API_KEY');

if ($api_key === false) {
$this->markTestSkipped(self::MISSING_API_KEY);
}

$provider = new GeocodioProvider($this->getAdapter(), $api_key);
$results = $provider->getGeocodedData('Old Fort TN 37362');

$this->assertInternalType('array', $results);

$result = $results[0];
$this->assertEquals(35.049196999999999, $result['latitude'], '', 0.01);
$this->assertEquals(-84.735365999999999, $result['longitude'], '', 0.01);
$this->assertNull($result['bounds']);
$this->assertEquals('', $result['streetNumber']);
$this->assertEquals('', $result['streetName']);
$this->assertEquals(37362, $result['zipcode']);
$this->assertEquals('Oldfort', $result['city']);
$this->assertNull($result['county']);
$this->assertEquals('TN', $result['region']);
$this->assertEquals('US', $result['country']);
$this->assertNull($result['countryCode']);
$this->assertNull($result['timezone']);
}

/**
* @expectedException \Geocoder\Exception\NoResult
*/
Expand Down