Skip to content

Commit f09d3df

Browse files
willdurandwilldurand
committed
Rename OpenStreetMaps => OpenStreetMap
1 parent 21e562a commit f09d3df

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Currently, there are many providers for the following APIs:
3232
* [Google Maps](http://code.google.com/apis/maps/documentation/geocoding/) as Address-Based geocoding and reverse geocoding provider;
3333
* [Google Maps for Business](https://developers.google.com/maps/documentation/business/webservices) as Address-Based geocoding and reverse geocoding provider;
3434
* [Bing Maps](http://msdn.microsoft.com/en-us/library/ff701715.aspx) as Address-Based geocoding and reverse geocoding provider;
35-
* [OpenStreetMaps](http://nominatim.openstreetmap.org/) as Address-Based geocoding and reverse geocoding provider (based on the Nominatim provider);
35+
* [OpenStreetMap](http://nominatim.openstreetmap.org/) as Address-Based geocoding and reverse geocoding provider (based on the Nominatim provider);
3636
* [Nominatim](http://wiki.openstreetmap.org/wiki/Nominatim) as Address-Based geocoding and reverse geocoding provider;
3737
* [CloudMade](http://developers.cloudmade.com/projects/show/geocoding-http-api) as Address-Based geocoding and reverse geocoding provider;
3838
* [Geoip](http://php.net/manual/book.geoip.php), the PHP extension, as IP-Based geocoding provider;
@@ -152,9 +152,9 @@ The `BingMapsProvider` named `bing_maps` is able to geocode and reverse geocode
152152
A valid api key is required.
153153

154154

155-
### OpenStreetMapsProvider ###
155+
### OpenStreetMapProvider ###
156156

157-
The `OpenStreetMapsProvider` named `openstreetmaps` is able to geocode and reverse geocode **street addresses**.
157+
The `OpenStreetMapProvider` named `openstreetmap` is able to geocode and reverse geocode **street addresses**.
158158

159159
### NominatimProvider ###
160160

‎src/Geocoder/Provider/NominatimProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public function getReversedData(array $coordinates)
132132
*/
133133
public function getName()
134134
{
135-
return 'openstreetmaps';
135+
return 'openstreetmap';
136136
}
137137

138138
/**

‎src/Geocoder/Provider/OpenStreetMapsProvider.php renamed to ‎src/Geocoder/Provider/OpenStreetMapProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
/**
1616
* @author Niklas Närhinen <[email protected]>
1717
*/
18-
class OpenStreetMapsProvider extends NominatimProvider
18+
class OpenStreetMapProvider extends NominatimProvider
1919
{
2020
/**
2121
* @var string

‎tests/Geocoder/Tests/Provider/OpenStreetMapsProviderTest.php renamed to ‎tests/Geocoder/Tests/Provider/OpenStreetMapProviderTest.php

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
namespace Geocoder\Tests\Provider;
44

55
use Geocoder\Tests\TestCase;
6-
use Geocoder\Provider\OpenStreetMapsProvider;
6+
use Geocoder\Provider\OpenStreetMapProvider;
77

8-
class OpenStreetMapsProviderTest extends TestCase
8+
class OpenStreetMapProviderTest extends TestCase
99
{
1010
public function testGetName()
1111
{
12-
$provider = new OpenStreetMapsProvider($this->getMockAdapter($this->never()));
13-
$this->assertEquals('openstreetmaps', $provider->getName());
12+
$provider = new OpenStreetMapProvider($this->getMockAdapter($this->never()));
13+
$this->assertEquals('openstreetmap', $provider->getName());
1414
}
1515

1616
public function testGetGeocodedDataWithRealAddress()
1717
{
18-
$provider = new OpenStreetMapsProvider($this->getAdapter());
18+
$provider = new OpenStreetMapProvider($this->getAdapter());
1919
$results = $provider->getGeocodedData('Paris');
2020

2121
$this->assertInternalType('array', $results);
@@ -134,7 +134,7 @@ public function testGetGeocodedDataWithRealAddress()
134134

135135
public function testGetGeocodedDataWithRealAddressWithLocale()
136136
{
137-
$provider = new OpenStreetMapsProvider($this->getAdapter(), 'fr_FR');
137+
$provider = new OpenStreetMapProvider($this->getAdapter(), 'fr_FR');
138138
$results = $provider->getGeocodedData('10 allée Evariste Galois, Clermont ferrand');
139139

140140
$this->assertInternalType('array', $results);
@@ -187,7 +187,7 @@ public function testGetGeocodedDataWithRealAddressWithLocale()
187187

188188
public function testGetReversedDataWithRealCoordinates()
189189
{
190-
$provider = new OpenStreetMapsProvider($this->getAdapter());
190+
$provider = new OpenStreetMapProvider($this->getAdapter());
191191
$results = $provider->getReversedData(array('60.4539471728726', '22.2567841926781'));
192192

193193
$this->assertInternalType('array', $results);
@@ -214,13 +214,13 @@ public function testGetReversedDataWithRealCoordinates()
214214
*/
215215
public function testGetGeocodedDataWithUnknownCity()
216216
{
217-
$provider = new OpenStreetMapsProvider($this->getAdapter());
217+
$provider = new OpenStreetMapProvider($this->getAdapter());
218218
$provider->getGeocodedData('Hammm');
219219
}
220220

221221
public function testGetReversedDataWithRealCoordinatesWithLocale()
222222
{
223-
$provider = new OpenStreetMapsProvider($this->getAdapter(), 'de_DE');
223+
$provider = new OpenStreetMapProvider($this->getAdapter(), 'de_DE');
224224
$results = $provider->getGeocodedData('Kalbacher Hauptstraße, 60437 Frankfurt, Germany');
225225

226226
$this->assertInternalType('array', $results);
@@ -317,7 +317,7 @@ public function testGetReversedDataWithRealCoordinatesWithLocale()
317317

318318
public function testGetGeocodedDataWithLocalhostIPv4()
319319
{
320-
$provider = new OpenStreetMapsProvider($this->getMockAdapter($this->never()));
320+
$provider = new OpenStreetMapProvider($this->getMockAdapter($this->never()));
321321
$result = $provider->getGeocodedData('127.0.0.1');
322322

323323
$this->assertInternalType('array', $result);
@@ -342,13 +342,13 @@ public function testGetGeocodedDataWithLocalhostIPv4()
342342
*/
343343
public function testGetGeocodedDataWithLocalhostIPv6()
344344
{
345-
$provider = new OpenStreetMapsProvider($this->getMockAdapter($this->never()));
345+
$provider = new OpenStreetMapProvider($this->getMockAdapter($this->never()));
346346
$provider->getGeocodedData('::1');
347347
}
348348

349349
public function testGetGeocodedDataWithRealIPv4()
350350
{
351-
$provider = new OpenStreetMapsProvider($this->getAdapter());
351+
$provider = new OpenStreetMapProvider($this->getAdapter());
352352
$results = $provider->getGeocodedData('88.188.221.14');
353353

354354
$this->assertInternalType('array', $results);
@@ -384,7 +384,7 @@ public function testGetGeocodedDataWithRealIPv4()
384384

385385
public function testGetGeocodedDataWithRealIPv4WithLocale()
386386
{
387-
$provider = new OpenStreetMapsProvider($this->getAdapter(), 'da_DK');
387+
$provider = new OpenStreetMapProvider($this->getAdapter(), 'da_DK');
388388
$results = $provider->getGeocodedData('88.188.221.14');
389389

390390
$this->assertInternalType('array', $results);
@@ -424,7 +424,7 @@ public function testGetGeocodedDataWithRealIPv4WithLocale()
424424
*/
425425
public function testGetGeocodedDataWithRealIPv6()
426426
{
427-
$provider = new OpenStreetMapsProvider($this->getAdapter());
427+
$provider = new OpenStreetMapProvider($this->getAdapter());
428428
$provider->getGeocodedData('::ffff:88.188.221.14');
429429
}
430430

@@ -434,7 +434,7 @@ public function testGetGeocodedDataWithRealIPv6()
434434
*/
435435
public function testGetGeocodedDataWithAddressGetsNullContent()
436436
{
437-
$provider = new OpenStreetMapsProvider($this->getMockAdapterReturns(null));
437+
$provider = new OpenStreetMapProvider($this->getMockAdapterReturns(null));
438438
$provider->getGeocodedData('Läntinen Pitkäkatu 35, Turku');
439439
}
440440

@@ -444,7 +444,7 @@ public function testGetGeocodedDataWithAddressGetsNullContent()
444444
*/
445445
public function testGetGeocodedDataWithAddressGetsEmptyContent()
446446
{
447-
$provider = new OpenStreetMapsProvider($this->getMockAdapterReturns(''));
447+
$provider = new OpenStreetMapProvider($this->getMockAdapterReturns(''));
448448
$provider->getGeocodedData('Läntinen Pitkäkatu 35, Turku');
449449
}
450450

@@ -457,7 +457,7 @@ public function testGetGeocodedDataWithAddressGetsEmptyXML()
457457
$emptyXML = <<<XML
458458
<?xml version="1.0" encoding="utf-8"?><searchresults_empty></searchresults_empty>
459459
XML;
460-
$provider = new OpenStreetMapsProvider($this->getMockAdapterReturns($emptyXML));
460+
$provider = new OpenStreetMapProvider($this->getMockAdapterReturns($emptyXML));
461461
$provider->getGeocodedData('Läntinen Pitkäkatu 35, Turku');
462462
}
463463

@@ -467,7 +467,7 @@ public function testGetGeocodedDataWithAddressGetsEmptyXML()
467467
*/
468468
public function testGetReversedDataWithCoordinatesGetsNullContent()
469469
{
470-
$provider = new OpenStreetMapsProvider($this->getMockAdapterReturns(null));
470+
$provider = new OpenStreetMapProvider($this->getMockAdapterReturns(null));
471471
$provider->getReversedData(array('60.4539471728726', '22.2567841926781'));
472472
}
473473

@@ -477,7 +477,7 @@ public function testGetReversedDataWithCoordinatesGetsNullContent()
477477
*/
478478
public function testGetReversedDataWithCoordinatesGetsEmptyContent()
479479
{
480-
$provider = new OpenStreetMapsProvider($this->getMockAdapterReturns(''));
480+
$provider = new OpenStreetMapProvider($this->getMockAdapterReturns(''));
481481
$provider->getReversedData(array('60.4539471728726', '22.2567841926781'));
482482
}
483483

@@ -493,13 +493,13 @@ public function testGetReversedDataWithCoordinatesGetsError()
493493
<error>Unable to geocode</error>
494494
</reversegeocode>
495495
XML;
496-
$provider = new OpenStreetMapsProvider($this->getMockAdapterReturns($errorXml));
496+
$provider = new OpenStreetMapProvider($this->getMockAdapterReturns($errorXml));
497497
$provider->getReversedData(array('-80.000000', '-170.000000'));
498498
}
499499

500500
public function testGetNodeStreetName()
501501
{
502-
$provider = new OpenStreetMapsProvider($this->getAdapter(), 'fr_FR');
502+
$provider = new OpenStreetMapProvider($this->getAdapter(), 'fr_FR');
503503
$results = $provider->getReversedData(array(48.86, 2.35));
504504

505505
$this->assertEquals('Rue Quincampoix', $results[0]['streetName']);

0 commit comments

Comments
 (0)