README.markdown in geokit-1.11.0 vs README.markdown in geokit-1.12.0

- old
+ new

@@ -60,11 +60,13 @@ * IP - geocodes an IP address using hostip.info's web service. * Geoplugin.net -- another IP address geocoder * Geobytes * RIPE * MaxMind -* freegeoip.net +* Ipstack +* freegeoip.net (deprecated, now Ipstack) +* IP-API.com ### HTTPS-supporting geocoders * Google * Yahoo * Bing @@ -167,10 +169,15 @@ # This is your username key for geonames. # To use this service either free or premium, you must register a key. # See http://www.geonames.org Geokit::Geocoders::GeonamesGeocoder.key = 'KEY' + # This is your access key for ipstack. + # To use this service either free or premium, you must register a key. + # See https://ipstack.com + Geokit::Geocoders::IpstackGeocoder.api_key = 'API_KEY' + # Most other geocoders need either no setup or a key Geokit::Geocoders::BingGeocoder.key = '' Geokit::Geocoders::MapQuestGeocoder.key = '' Geokit::Geocoders::YandexGeocoder.key = '' Geokit::Geocoders::MapboxGeocoder.key = 'ACCESS_TOKEN' @@ -185,16 +192,22 @@ # Please see the section "writing your own geocoders" for more information. # Geokit::Geocoders::external_key = 'REPLACE_WITH_YOUR_API_KEY' # This is the order in which the geocoders are called in a failover scenario # If you only want to use a single geocoder, put a single symbol in the array. - # Valid symbols are :google, :yahoo, :us, and :ca. + # + # Valid symbols are: :bing, :ca, :fcc, :geocodio, :geonames, :google, + # :map_quest, :mapbox, :maxmind, :opencage, :osm, :us, :yahoo, and :yandex. + # # Be aware that there are Terms of Use restrictions on how you can use the # various geocoders. Make sure you read up on relevant Terms of Use for each # geocoder you are going to use. Geokit::Geocoders::provider_order = [:google,:us] - # The IP provider order. Valid symbols are :ip,:geo_plugin. + # The IP provider order. + # + # Valid symbols are :ipstack, :geo_plugin, :geobytes, :ip, and :ripe. + # # As before, make sure you read up on relevant Terms of Use for each. # Geokit::Geocoders::ip_provider_order = [:external,:geo_plugin,:ip] # Disable HTTPS globally. This option can also be set on individual # geocoder classes.