Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Addok.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ final class Addok extends AbstractHttpProvider implements Provider
*/
public static function withBANServer(ClientInterface $client)
{
return new self($client, 'https://api-adresse.data.gouv.fr');
return new self($client, 'https://data.geopf.fr/geocodage');
}

/**
Expand Down
25 changes: 12 additions & 13 deletions Tests/AddokTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,9 @@ public function testGeocodeWithRealIPv6()
public function testReverseQuery()
{
$provider = Addok::withBANServer($this->getHttpClient());
$results = $provider->reverseQuery(ReverseQuery::fromCoordinates(49.031407, 2.060204));
$results = $provider->reverseQuery(ReverseQuery::fromCoordinates(49.031526, 2.060164));

$this->assertInstanceOf('Geocoder\Model\AddressCollection', $results);
$this->assertCount(1, $results);

/** @var \Geocoder\Model\Address $result */
$result = $results->first();
Expand All @@ -79,8 +78,8 @@ public function testGeocodeQuery()
/** @var \Geocoder\Model\Address $result */
$result = $results->first();
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
$this->assertEqualsWithDelta(49.031407, $result->getCoordinates()->getLatitude(), 0.00001);
$this->assertEqualsWithDelta(2.060204, $result->getCoordinates()->getLongitude(), 0.00001);
$this->assertEqualsWithDelta(49.031526, $result->getCoordinates()->getLatitude(), 0.00001);
$this->assertEqualsWithDelta(2.060164, $result->getCoordinates()->getLongitude(), 0.00001);
$this->assertEquals('6', $result->getStreetNumber());
$this->assertEquals('Quai de la Tourelle', $result->getStreetName());
$this->assertEquals('95000', $result->getPostalCode());
Expand All @@ -90,19 +89,19 @@ public function testGeocodeQuery()
public function testGeocodeOnlyCityQuery()
{
$provider = Addok::withBANServer($this->getHttpClient());
$results = $provider->geocodeQuery(GeocodeQuery::create('Meaux'));
$results = $provider->geocodeQuery(GeocodeQuery::create('Grenoble'));

$this->assertInstanceOf('Geocoder\Model\AddressCollection', $results);

/** @var \Geocoder\Model\Address $result */
$result = $results->first();
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
$this->assertEqualsWithDelta(48.95732, $result->getCoordinates()->getLatitude(), 0.00001);
$this->assertEqualsWithDelta(2.902793, $result->getCoordinates()->getLongitude(), 0.00001);
$this->assertEqualsWithDelta(45.182828, $result->getCoordinates()->getLatitude(), 0.00001);
$this->assertEqualsWithDelta(5.724369, $result->getCoordinates()->getLongitude(), 0.00001);
$this->assertNull($result->getStreetNumber());
$this->assertNull($result->getStreetName());
$this->assertEquals('77100', $result->getPostalCode());
$this->assertEquals('Meaux', $result->getLocality());
$this->assertEquals('38000', $result->getPostalCode());
$this->assertEquals('Grenoble', $result->getLocality());
}

public function testGeocodeHouseNumberTypeQuery()
Expand Down Expand Up @@ -155,9 +154,9 @@ public function testGeocodeLocalityQuery()
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
$this->assertNull($result->getStreetNumber());
$this->assertNull($result->getStreetName());
$this->assertEqualsWithDelta(48.871759, $result->getCoordinates()->getLatitude(), 0.00001);
$this->assertEqualsWithDelta(2.294253, $result->getCoordinates()->getLongitude(), 0.00001);
$this->assertEquals('75016', $result->getPostalCode());
$this->assertEquals('Paris', $result->getLocality());
$this->assertEqualsWithDelta(43.631962, $result->getCoordinates()->getLatitude(), 0.00001);
$this->assertEqualsWithDelta(1.380094, $result->getCoordinates()->getLongitude(), 0.00001);
$this->assertEquals('31700', $result->getPostalCode());
$this->assertEquals('Blagnac', $result->getLocality());
}
}