Skip to content

Commit d6ef85c

Browse files
committed
Merge pull request #236 from toin0u/RemoveYahooProvider
Removed YahooProvider - fix #230
2 parents 4e6d4c5 + 2191d0e commit d6ef85c

File tree

4 files changed

+3
-400
lines changed

4 files changed

+3
-400
lines changed

README.md

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ Currently, there are many providers for the following APIs:
2929
* [FreeGeoIp](http://freegeoip.net/static/index.html) as IP-Based geocoding provider;
3030
* [HostIp](http://www.hostip.info/) as IP-Based geocoding provider;
3131
* [IpInfoDB](http://www.ipinfodb.com/) as IP-Based geocoding provider (city precision);
32-
* [Yahoo! PlaceFinder](http://developer.yahoo.com/geo/placefinder/) as Address-Based geocoding and reverse geocoding provider;
3332
* [Google Maps](http://code.google.com/apis/maps/documentation/geocoding/) as Address-Based geocoding and reverse geocoding provider;
3433
* [Google Maps for Business](https://developers.google.com/maps/documentation/business/webservices) as Address-Based geocoding and reverse geocoding provider;
3534
* [Bing Maps](http://msdn.microsoft.com/en-us/library/ff701715.aspx) as Address-Based geocoding and reverse geocoding provider;
@@ -135,12 +134,6 @@ The `IpInfoDbProvider` named `ip_info_db` is able to geocode **IPv4 addresses**
135134
A valid api key is required.
136135

137136

138-
### YahooProvider ###
139-
140-
The `YahooProvider` named `yahoo` is able to geocode both **IPv4 addresses** and **street addresses**. This provider can also reverse information based on coordinates (latitude, longitude).
141-
A valid api key is required.
142-
143-
144137
### GoogleMapsProvider ###
145138

146139
The `GoogleMapsProvider` named `google_maps` is able to geocode and reverse geocode **street addresses**.
@@ -279,9 +272,6 @@ That's we'll do:
279272

280273
$geocoder = new \Geocoder\Geocoder();
281274
$geocoder->registerProviders(array(
282-
new \Geocoder\Provider\YahooProvider(
283-
$adapter, '<YAHOO_API_KEY>', $locale
284-
),
285275
new \Geocoder\Provider\GoogleMapsProvider(
286276
$adapter, $locale, $region, $useSsl
287277
),
@@ -302,7 +292,7 @@ $geocoder->registerProviders(array(
302292

303293
Parameters:
304294

305-
* `$locale` is available for `YahooProvider`, `YandexProvider`, `BingMapsProvider` and `TomTomProvider`.
295+
* `$locale` is available for `YandexProvider`, `BingMapsProvider` and `TomTomProvider`.
306296
* `$region` is available for `GoogleMapsProvider` and `GoogleMapsBusinessProvider`.
307297
* `$toponym` is available for `YandexProvider`.
308298
* `$service` is available for `MaxMindProvider`.
@@ -314,7 +304,7 @@ Parameters:
314304

315305
As said it's a special provider that takes a list of providers and iterates over this list to get information. Note
316306
that it **stops** its iteration when a provider returns a result. The result is returned by `GoogleMapsProvider`
317-
because `FreeGeoIpProvider` and `HostIpProvider` cannot geocode street addresses. `YahooProvider` is ignored.
307+
because `FreeGeoIpProvider` and `HostIpProvider` cannot geocode street addresses. `BingMapsProvider` is ignored.
318308

319309
``` php
320310
$geocoder = new \Geocoder\Geocoder();
@@ -323,7 +313,7 @@ $chain = new \Geocoder\Provider\ChainProvider(array(
323313
new \Geocoder\Provider\FreeGeoIpProvider($adapter),
324314
new \Geocoder\Provider\HostIpProvider($adapter),
325315
new \Geocoder\Provider\GoogleMapsProvider($adapter, 'fr_FR', 'France', true),
326-
new \Geocoder\Provider\YahooProvider($adapter, '<API_KEY>', 'fr_FR'),
316+
new \Geocoder\Provider\BingMapsProvider($adapter, '<API_KEY>'),
327317
// ...
328318
));
329319
$geocoder->registerProvider($chain);
@@ -587,7 +577,6 @@ Rename the `phpunit.xml.dist` file to `phpunit.xml`, then uncomment the followin
587577
``` xml
588578
<php>
589579
<!-- <server name="IPINFODB_API_KEY" value="YOUR_API_KEY" /> -->
590-
<!-- <server name="YAHOO_API_KEY" value="YOUR_API_KEY" /> -->
591580
<!-- <server name="BINGMAPS_API_KEY" value="YOUR_API_KEY" /> -->
592581
<!-- <server name="CLOUDMADE_API_KEY" value="YOUR_API_KEY" /> -->
593582
<!-- <server name="IGN_WEB_API_KEY" value="YOUR_API_KEY" /> -->

phpunit.xml.dist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
>
1313
<php>
1414
<!-- <server name="IPINFODB_API_KEY" value="YOUR_API_KEY" /> -->
15-
<!-- <server name="YAHOO_API_KEY" value="YOUR_API_KEY" /> -->
1615
<!-- <server name="BINGMAPS_API_KEY" value="YOUR_API_KEY" /> -->
1716
<!-- <server name="CLOUDMADE_API_KEY" value="YOUR_API_KEY" /> -->
1817
<!-- <server name="IGN_WEB_API_KEY" value="YOUR_API_KEY" /> -->

src/Geocoder/Provider/YahooProvider.php

Lines changed: 0 additions & 158 deletions
This file was deleted.

0 commit comments

Comments
 (0)