Skip to content

Add level to Address::toArray function #622

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 3 commits into from
May 20, 2017
Merged

Add level to Address::toArray function #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1931dbe
Add level to Address::toArray function
AntoineLemaire Oct 20, 2016
b09b077
Rebased PR
Nyholm May 20, 2017
b8fcf27
cs
Nyholm May 20, 2017
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
1 change: 1 addition & 0 deletions src/Common/Model/Address.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ public function toArray()
$adminLevels[$adminLevel->getLevel()] = [
'name' => $adminLevel->getName(),
'code' => $adminLevel->getCode(),
'level' => $adminLevel->getLevel(),
];
}

Expand Down
31 changes: 31 additions & 0 deletions src/Common/Tests/Model/AddressTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
namespace Geocoder\Tests\Model;

use Geocoder\Model\Address;
use Geocoder\Model\LocationFactory;

/**
* @author Antoine Lemaire <lemaireantoine@hotmail.com>
*/
class AddressTest extends \PHPUnit_Framework_TestCase
{
public function testDumpEmptyAddress()
Expand Down Expand Up @@ -39,4 +43,31 @@ public function testDumpEmptyAddress()
$address = new Address();
$this->assertEquals($address->toArray(), $expected);
}

public function testToArray()
{
$data = [
'latitude' => 48.8631507,
'longitude' => 2.3889114,
'bounds' => [
'south' => 48.8631507,
'west' => 2.3889114,
'north' => 48.8631507,
'east' => 2.388911,
],
'streetNumber' => '10',
'streetName' => 'Avenue Gambetta',
'postalCode' => '75020',
'locality' => 'Paris',
'subLocality' => '20e Arrondissement',
'adminLevels' => [1 => ['name' => 'Ile-de-France', 'code' => 'Ile-de-France', 'level' => 1]],
'country' => 'France',
'countryCode' => 'FR',
'timezone' => null,
];

$address = LocationFactory::createLocation($data);

$this->assertSame($data, $address->toArray());
}
}