Skip to content

Add level to Address::toArray function #543

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

Closed
AntoineLemaire wants to merge 1 commit into from
Closed

Add level to Address::toArray function #543

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
7 changes: 4 additions & 3 deletions src/Geocoder/Model/Address.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,12 @@ public function toArray()
foreach ($this->adminLevels as $adminLevel) {
$adminLevels[$adminLevel->getLevel()] = [
'name' => $adminLevel->getName(),
'code' => $adminLevel->getCode()
'code' => $adminLevel->getCode(),
'level' => $adminLevel->getLevel(),
];
}

return array(
return [
'latitude' => $this->getLatitude(),
'longitude' => $this->getLongitude(),
'bounds' => $this->bounds->toArray(),
Expand All @@ -263,6 +264,6 @@ public function toArray()
'country' => $this->country->getName(),
'countryCode' => $this->country->getCode(),
'timezone' => $this->timezone,
);
];
}
}
70 changes: 70 additions & 0 deletions tests/Geocoder/Tests/Model/AddressTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?php

namespace Geocoder\Tests\Model;

use Geocoder\Model\AddressFactory;
use Geocoder\Tests\TestCase;

/**
* @author Antoine Lemaire <lemaireantoine@hotmail.com>
*/
class AddressTest extends TestCase
{
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 = $this->createAddress($data);

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

public function testCreateFromArrayFromToArray()
{
$factory = new AddressFactory();

$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 = $this->createAddress($data);
$array = $address->toArray();
$addresses = $factory->createFromArray([$array]);

$this->assertEquals($address, $addresses->get(0));
}
}