README.md in geocoder-1.4.7 vs README.md in geocoder-1.4.8

- old
+ new

@@ -325,11 +325,11 @@ Geocoding Service ("Lookup") Configuration ------------------------------------------ -Geocoder supports a variety of street and IP address geocoding services. The default lookups are `:google` for street addresses and `:freegeoip` for IP addresses. Please see the listing and comparison below for details on specific geocoding services (not all settings are supported by all services). +Geocoder supports a variety of street and IP address geocoding services. The default lookups are `:google` for street addresses and `:ipinfo_io` for IP addresses. Please see the listing and comparison below for details on specific geocoding services (not all settings are supported by all services). To create a Rails initializer with an example configuration: rails generate geocoder:config @@ -475,11 +475,11 @@ #### Nominatim (`:nominatim`) * **API key**: none * **Quota**: 1 request/second * **Region**: world -* **SSL support**: no +* **SSL support**: yes * **Languages**: ? * **Documentation**: http://wiki.openstreetmap.org/wiki/Nominatim * **Terms of Service**: http://wiki.openstreetmap.org/wiki/Nominatim_usage_policy * **Limitations**: Please limit request rate to 1 per second and include your contact information in User-Agent headers (eg: `Geocoder.configure(:http_headers => { "User-Agent" => "your contact info" })`). [Data licensed under Open Database License (ODbL) (you must provide attribution).](http://www.openstreetmap.org/copyright) @@ -751,12 +751,22 @@ - **Limitations**: Only good for non-commercial use. For commercial usage please check http://lbs.amap.com/home/terms/ - **Notes**: To use AMap set `Geocoder.configure(:lookup => :amap, :api_key => "your_api_key")`. ### IP Address Services -#### FreeGeoIP (`:freegeoip`) +#### IPInfo.io (`:ipinfo_io`) +* **API key**: optional - see http://ipinfo.io/pricing +* **Quota**: 1,000/day - more with api key +* **Region**: world +* **SSL support**: no (not without access key - see http://ipinfo.io/pricing) +* **Languages**: English +* **Documentation**: http://ipinfo.io/developers +* **Terms of Service**: http://ipinfo.io/developers + +#### FreeGeoIP (`:freegeoip`) - [DISCONTINUED](https://github.com/alexreisner/geocoder/wiki/Freegeoip-Discontinuation) + * **API key**: none * **Quota**: 15,000 requests per hour. After reaching the hourly quota, all of your requests will result in HTTP 403 (Forbidden) until it clears up on the next roll over. * **Region**: world * **SSL support**: no * **Languages**: English @@ -824,18 +834,20 @@ * **Documentation**: http://dev.maxmind.com/geoip/geoip2/web-services/ * **Terms of Service**: ? * **Limitations**: ? * **Notes**: You must specify which MaxMind service you are using in your configuration, and also basic authentication. For example: `Geocoder.configure(:maxmind_geoip2 => {:service => :country, :basic_auth => {:user => '', :password => ''}})`. -#### IPInfo.io (`:ipinfo_io`) +#### Ipstack (`:ipstack`) -* **API key**: optional - see http://ipinfo.io/pricing -* **Quota**: 1,000/day - more with api key +* **API key**: required (see https://ipstack.com/product) +* **Quota**: 10,000 requests per month (with free API Key, 50,000/day and up for paid plans) * **Region**: world -* **SSL support**: no (not without access key - see http://ipinfo.io/pricing) -* **Languages**: English -* **Documentation**: http://ipinfo.io/developers -* **Terms of Service**: http://ipinfo.io/developers +* **SSL support**: yes ( only with paid plan ) +* **Languages**: English, German, Spanish, French, Japanese, Portugues (Brazil), Russian, Chinese +* **Documentation**: https://ipstack.com/documentation +* **Terms of Service**: ? +* **Limitations**: ? +* **Notes**: To use Ipstack set `Geocoder.configure(:ip_lookup => :ipstack, :api_key => "your_ipstack_api_key")`. Supports the optional params: `:hostname`, `:security`, `:fields`, `:language` (see API documentation for details). #### IP-API.com (`:ipapi_com`) * **API key**: optional - see http://ip-api.com/docs/#usage_limits * **Quota**: 150/minute - unlimited with api key