geokit 1.8.5 → 1.9.0

data/test/test_mapbox_geocoder.rb

@@ -0,0 +1,31 @@
+require File.join(File.dirname(__FILE__), 'helper')
+
+Geokit::Geocoders::MapboxGeocoder.key = ''
+
+class MapboxGeocoderTest < BaseGeocoderTest #:nodoc: all
+  def setup
+    super
+    @address = '1714 14th Street NW, Washington, DC'
+    @latlng = Geokit::LatLng.new(38.913175, -77.032458)
+  end
+
+  def test_forward_geocode
+    VCR.use_cassette('mapbox_forward_geocode') do
+      res = Geokit::Geocoders::MapboxGeocoder.geocode(@address)
+      assert_equal res.lat, 38.899393
+      assert_equal res.lng, -76.992695
+      assert_equal res.country_code, 'US'
+      assert_equal res.state, 'District of Columbia'
+      assert_equal res.zip, '20002'
+    end
+  end
+
+  def test_reverse_geocode
+    VCR.use_cassette('mapbox_reverse_geocode') do
+      res = Geokit::Geocoders::MapboxGeocoder.reverse_geocode(@latlng)
+      assert_equal res.country_code, 'US'
+      assert_equal res.state, 'District of Columbia'
+      assert_equal res.zip, '20009'
+    end
+  end
+end

data/test/test_mappable.rb

@@ -1,6 +1,10 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
+# Test distances from http://www.csgnetwork.com/degreelenllavcalc.html
 class MappableTest < Test::Unit::TestCase #:nodoc: all
+  class TestMappable
+    include Geokit::Mappable
+  end
 
   def test_math_error_classes
     error_case = 0.49 * 180
@@ -9,4 +13,46 @@ class MappableTest < Test::Unit::TestCase #:nodoc: all
     assert_equal 0.0, Geokit::LatLng.distance_between_sphere(from, to, :kms)
   end
 
+  def test_units_sphere_multiplier
+    delta = 0.001
+    assert_in_delta 3963.190, TestMappable.units_sphere_multiplier(:miles), delta
+    assert_in_delta 6376.773, TestMappable.units_sphere_multiplier(:kms), delta
+    assert_in_delta 3443.918, TestMappable.units_sphere_multiplier(:nms), delta
+  end
+
+  def test_units_per_latitude_degree
+    delta = 0.00001
+    assert_in_delta  69.10000, TestMappable.units_per_latitude_degree(:miles), delta
+    assert_in_delta 111.18190, TestMappable.units_per_latitude_degree(:kms), delta
+    assert_in_delta  60.04625, TestMappable.units_per_latitude_degree(:nms), delta
+  end
+
+  def test_units_per_longitude_degree_miles
+    delta = 0.2
+    assert_in_delta 69.170565, TestMappable.units_per_longitude_degree(  0, :miles), delta
+    assert_in_delta 66.828621, TestMappable.units_per_longitude_degree( 15, :miles), delta
+    assert_in_delta 59.953655, TestMappable.units_per_longitude_degree( 30, :miles), delta
+    assert_in_delta 48.993036, TestMappable.units_per_longitude_degree( 45, :miles), delta
+    assert_in_delta 34.672430, TestMappable.units_per_longitude_degree( 60, :miles), delta
+    assert_in_delta 17.958830, TestMappable.units_per_longitude_degree( 75, :miles), delta
+    assert_in_delta  0.000000, TestMappable.units_per_longitude_degree( 90, :miles), delta
+  end
+
+  def test_units_per_longitude_degree_kms
+    delta = 0.2
+    assert_in_delta 111.319458, TestMappable.units_per_longitude_degree(  0, :kms), delta
+    assert_in_delta 107.550455, TestMappable.units_per_longitude_degree( 15, :kms), delta
+    assert_in_delta  96.486248, TestMappable.units_per_longitude_degree( 30, :kms), delta
+    assert_in_delta  78.846806, TestMappable.units_per_longitude_degree( 45, :kms), delta
+    assert_in_delta  55.799979, TestMappable.units_per_longitude_degree( 60, :kms), delta
+    assert_in_delta  28.901993, TestMappable.units_per_longitude_degree( 75, :kms), delta
+    assert_in_delta   0.000000, TestMappable.units_per_longitude_degree( 90, :kms), delta
+  end
+
+  def test_units_per_longitude_degree_nms
+    delta = 0.2
+    assert_in_delta 60.107578, TestMappable.units_per_longitude_degree(  0, :nms), delta
+    assert_in_delta 42.573784, TestMappable.units_per_longitude_degree( 45, :nms), delta
+    assert_in_delta  0.000000, TestMappable.units_per_longitude_degree( 90, :nms), delta
+  end
 end

data/test/test_maxmind_geocoder.rb

@@ -1,7 +1,6 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
 class MaxmindGeocoderTest < BaseGeocoderTest #:nodoc: all
-
   def setup
     super
     @ip = '118.210.47.142'
@@ -44,5 +43,4 @@ class MaxmindGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal true, res.success
     assert res.city
   end
-
-end
+end

data/test/test_multi_geocoder.rb

@@ -1,9 +1,8 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
-Geokit::Geocoders::provider_order=[:google, :bing, :us]
+Geokit::Geocoders.provider_order = [:google, :bing, :us]
 
 class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all
-
   def setup
     super
     @failure = Geokit::GeoLoc.new
@@ -35,7 +34,7 @@ class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all
   end
 
   def test_invalid_provider
-    temp = Geokit::Geocoders::provider_order
+    temp = Geokit::Geocoders.provider_order
     Geokit::Geocoders.provider_order = [:bogus]
     assert_equal @failure, Geokit::Geocoders::MultiGeocoder.geocode(@address)
     Geokit::Geocoders.provider_order = temp
@@ -45,9 +44,9 @@ class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all
     t1, t2 = Geokit::Geocoders.provider_order, Geokit::Geocoders.ip_provider_order # will need to reset after
     Geokit::Geocoders.provider_order = [:google]
     Geokit::Geocoders.ip_provider_order = [:geo_plugin]
-    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with("").returns(@failure)
+    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with('').returns(@failure)
     Geokit::Geocoders::GeoPluginGeocoder.expects(:geocode).never
-    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.geocode("")
+    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.geocode('')
     Geokit::Geocoders.provider_order, Geokit::Geocoders.ip_provider_order = t1, t2 # reset to orig values
   end
 
@@ -77,7 +76,7 @@ class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all
   end
 
   def test_reverse_geocode_with_invalid_provider
-    temp = Geokit::Geocoders::provider_order
+    temp = Geokit::Geocoders.provider_order
     Geokit::Geocoders.provider_order = [:bogus]
     assert_raise NameError do
       Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)
@@ -88,8 +87,8 @@ class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_reverse_geocode_with_blank_latlng
     t1 = Geokit::Geocoders.provider_order # will need to reset after
     Geokit::Geocoders.provider_order = [:google]
-    Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with("").returns(@failure)
-    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.reverse_geocode("")
+    Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with('').returns(@failure)
+    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.reverse_geocode('')
     Geokit::Geocoders.provider_order = t1 # reset to orig values
   end
 
@@ -97,6 +96,6 @@ class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all
     Geokit::Geocoders::YahooGeocoder.expects(:geocode).with(@address, {}).returns(@success)
     Geokit::Geocoders::GoogleGeocoder.expects(:geocode).never
     Geokit::Geocoders::UsGeocoder.expects(:geocode).never
-    assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@address, :provider_order => [:yahoo, :google, :us])
+    assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@address, provider_order: [:yahoo, :google, :us])
   end
 end

data/test/test_multi_ip_geocoder.rb

@@ -1,12 +1,11 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
-Geokit::Geocoders::ip_provider_order=[:geo_plugin,:ip]
+Geokit::Geocoders.ip_provider_order = [:geo_plugin, :ip]
 
 class MultiIpGeocoderTest < BaseGeocoderTest #:nodoc: all
-
   def setup
     @ip_address = '10.10.10.10'
-    @success = Geokit::GeoLoc.new({:city=>"SAN FRANCISCO", :state=>"CA", :country_code=>"US", :lat=>37.7742, :lng=>-122.417068})
+    @success = Geokit::GeoLoc.new({city: 'SAN FRANCISCO', state: 'CA', country_code: 'US', lat: 37.7742, lng: -122.417068})
     @success.success = true
     @failure = Geokit::GeoLoc.new
   end
@@ -29,10 +28,9 @@ class MultiIpGeocoderTest < BaseGeocoderTest #:nodoc: all
   end
 
   def test_invalid_provider
-    temp = Geokit::Geocoders::ip_provider_order
+    temp = Geokit::Geocoders.ip_provider_order
     Geokit::Geocoders.ip_provider_order = [:bogus]
     assert_equal @failure, Geokit::Geocoders::MultiGeocoder.geocode(@ip_address)
     Geokit::Geocoders.ip_provider_order = temp
   end
-
 end

data/test/test_net_adapter.rb

@@ -23,7 +23,7 @@ class NetAdapterTest < Test::Unit::TestCase #:nodoc: all
   end
 
   RESULT = '{"name":"json"}'
-  RESULT_HASH = {"name" => "json"}
+  RESULT_HASH = {'name' => 'json'}
 
   # Defines common test fixtures.
   def setup
@@ -32,8 +32,8 @@ class NetAdapterTest < Test::Unit::TestCase #:nodoc: all
   end
 
   def test_cache
-    old_adapter = Geokit::Geocoders::net_adapter
-    Geokit::Geocoders::net_adapter = Geokit::NetAdapter::Typhoeus
+    old_adapter = Geokit::Geocoders.net_adapter
+    Geokit::Geocoders.net_adapter = Geokit::NetAdapter::Typhoeus
     Typhoeus::Config.cache = SuperSimpleCache
     success = MockSuccess.new
     success.expects(:body).returns(RESULT)
@@ -41,6 +41,6 @@ class NetAdapterTest < Test::Unit::TestCase #:nodoc: all
     Geokit::NetAdapter::Typhoeus.expects(:do_get).with(@url).returns(success)
     assert_equal RESULT_HASH, Geokit::Geocoders::CachedGeocoder.process(:json, @url)
     Typhoeus::Config.cache = nil
-    Geokit::Geocoders::net_adapter = old_adapter
+    Geokit::Geocoders.net_adapter = old_adapter
   end
 end

data/test/test_opencage_geocoder.rb

@@ -0,0 +1,108 @@
+# encoding: utf-8
+require File.join(File.dirname(__FILE__), 'helper')
+
+class OpencageGeocoderTest < BaseGeocoderTest #:nodoc: all
+  def setup
+    super
+    @opencage_full_hash = {street_address: '100 Spear St', city: 'San Francisco', state: 'CA', zip: '94105', country_code: 'US'}
+    @opencage_city_hash = {city: 'San Francisco', state: 'CA'}
+    @opencage_full_loc = Geokit::GeoLoc.new(@opencage_full_hash)
+    @opencage_city_loc = Geokit::GeoLoc.new(@opencage_city_hash)
+
+    # Note: This is not a real key because having real keys on github
+    # is not advised
+    key = 'someopencageapikey'
+    Geokit::Geocoders::OpencageGeocoder.key = key
+  end
+
+  def test_opencage_full_address
+    VCR.use_cassette('opencage_full') do
+      url = 'https://api.opencagedata.com/geocode/v1/json?key=someopencageapikey&query=100+Spear+St%2C+San+Francisco%2C+CA%2C+94105%2C+US&no_annotations=1'
+      TestHelper.expects(:last_url).with(url)
+      res = Geokit::Geocoders::OpencageGeocoder.geocode(@opencage_full_loc)
+
+      assert_equal 'California', res.state
+      assert_equal 'San Francisco', res.city
+      assert_array_in_delta [37.7921509, -122.394], res.to_a
+      assert res.is_us?
+      assert_equal 'Spear Street 100, San Francisco, California, 94103, US', res.full_address
+      assert_equal 'opencage', res.provider
+    end
+  end
+
+  def test_opencage_city
+    VCR.use_cassette('opencage_city') do
+      url = 'https://api.opencagedata.com/geocode/v1/json?key=someopencageapikey&query=San+Francisco%2C+CA&no_annotations=1'
+      TestHelper.expects(:last_url).with(url)
+      res = Geokit::Geocoders::OpencageGeocoder.geocode(@opencage_city_loc)
+
+      assert_equal 'California', res.state
+      assert_equal 'San Francisco', res.city
+      assert_array_in_delta [37.7792768, -122.4192704], res.to_a
+      assert res.is_us?
+      assert_equal 'San Francisco, California, US', res.full_address
+      assert_equal 'opencage', res.provider
+    end
+  end
+
+  def test_opencage_reverse
+    VCR.use_cassette('opencage_reverse_madrid') do
+
+      location = Geokit::GeoLoc.new
+      location.lat, location.lng = '40.4167413', '-3.7032498'     # Madrid
+
+      url = 'https://api.opencagedata.com/geocode/v1/json?key=someopencageapikey&query=40.4167413%2C-3.7032498&no_annotations=1'
+      TestHelper.expects(:last_url).with(url)
+      res = Geokit::Geocoders::OpencageGeocoder.geocode(location.ll)
+
+      assert_equal 'ES', res.country_code
+      assert_equal 'opencage', res.provider
+
+      assert_equal 'Madrid', res.city
+      assert_equal 'Community of Madrid', res.state
+
+      assert_equal 'Spain', res.country
+      assert_equal true, res.success
+
+      assert_equal 'Calle De Zurbano, Chamberí, Madrid, Community of Madrid, 28036, ES', res.full_address
+      assert_equal 28036, res.zip
+      assert_equal 'Calle De Zurbano', res.street_address
+    end
+  end
+
+  def test_opencage_reverse2
+    VCR.use_cassette('opencage_reverse_prilep') do
+
+      location = Geokit::GeoLoc.new
+      location.lat, location.lng = '41.3527177', '21.5497808'
+
+      url = 'https://api.opencagedata.com/geocode/v1/json?key=someopencageapikey&query=41.3527177%2C21.5497808&no_annotations=1'
+      TestHelper.expects(:last_url).with(url)
+      res = Geokit::Geocoders::OpencageGeocoder.geocode(location.ll)
+
+      assert_equal 'MK', res.country_code
+      assert_equal 'opencage', res.provider
+
+      assert_equal 'Prilep', res.city
+      assert_equal 'Pelagonia Region', res.state
+
+      assert_equal 'Macedonia', res.country
+      assert_equal 10, res.precision
+      assert_equal true, res.success
+
+      assert_equal 'Прилепски Бранители, Prilep, Pelagonia Region, MK', res.full_address
+      assert_equal 'Прилепски Бранители', res.street_address
+    end
+  end
+
+  # check if the results are in Spanish if &language=es
+  def test_language_response
+    VCR.use_cassette('opencage_language_response_es') do
+      url = 'https://api.opencagedata.com/geocode/v1/json?key=someopencageapikey&language=es&query=London&no_annotations=1'
+      TestHelper.expects(:last_url).with(url)
+      language_result = Geokit::Geocoders::OpencageGeocoder.geocode('London', language: 'es')
+
+      assert_equal 'Londres', language_result.city
+    end
+  end
+end

data/test/test_openstreetmap_geocoder.rb

@@ -2,27 +2,26 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
 class OSMGeocoderTest < BaseGeocoderTest #:nodoc: all
-  OSM_FULL=<<-EOF.strip
+  OSM_FULL = <<-EOF.strip
       [{"place_id":"425554497","licence":"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.","boundingbox":["37.792341","37.792441","-122.394074","-122.393974"],"lat":"37.792391","lon":"-122.394024","display_name":"100, Spear Street, Financial District, San Francisco, California, 94105, United States of America","class":"place","type":"house","address":{"house_number":"100","road":"Spear Street","place":"Financial District","city":"San Francisco","county":"San Francisco","state":"California","postcode":"94105","country":"United States of America","country_code":"us"}}]
   EOF
 
-
-  OSM_CITY=<<-EOF.strip
+  OSM_CITY = <<-EOF.strip
       [{"place_id":"1586484","licence":"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.","osm_type":"node","osm_id":"316944780","boundingbox":["37.7240965271","37.744100341797","-122.40126586914","-122.38125823975"],"lat":"37.7340974","lon":"-122.3912596","display_name":"San Francisco, California, United States of America","class":"place","type":"county","icon":"http://nominatim.openstreetmap.org/images/mapicons/poi_boundary_administrative.p.20.png","address":{"county":"San Francisco","state":"California","country":"United States of America","country_code":"us"}},{"place_id":"42109083","licence":"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.","osm_type":"way","osm_id":"33090874","boundingbox":["37.6398277282715","37.8230590820312","-123.173828125","-122.935707092285"],"lat":"37.7333682068208","lon":"-123.051926367593","display_name":"San Francisco, Marin, California, United States of America","class":"place","type":"city","icon":"http://nominatim.openstreetmap.org/images/mapicons/poi_place_city.p.20.png","address":{"city":"San Francisco","county":"Marin","state":"California","country":"United States of America","country_code":"us"}},{"place_id":"145970","licence":"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.","osm_type":"node","osm_id":"26819236","boundingbox":["37.768957366943","37.788961181641","-122.42920471191","-122.40919708252"],"lat":"37.7789601","lon":"-122.419199","display_name":"San Francisco, San Francisco County, California, United States of America, North America","class":"place","type":"city","icon":"http://nominatim.openstreetmap.org/images/mapicons/poi_place_city.p.20.png","address":{"city":"San Francisco","county":"San Francisco County","state":"California","country":"United States of America","country_code":"us","place":"North America"}},{"place_id":"42108900","licence":"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.","osm_type":"way","osm_id":"33090814","boundingbox":["37.7067184448242","37.9298248291016","-122.612289428711","-122.281776428223"],"lat":"37.7782304646168","lon":"-122.442503042395","display_name":"San Francisco, San Francisco County, California, United States of America","class":"place","type":"city","icon":"http://nominatim.openstreetmap.org/images/mapicons/poi_place_city.p.20.png","address":{"city":"San Francisco","county":"San Francisco County","state":"California","country":"United States of America","country_code":"us"}}]
   EOF
 
-  OSM_REVERSE_MADRID=<<-EOF.strip
+  OSM_REVERSE_MADRID = <<-EOF.strip
       {"place_id":"41067113","licence":"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.","osm_type":"way","osm_id":"31822457","lat":"40.3787537310091","lon":"-3.70187699287946","display_name":"Línea 3, Calle del Doctor Tolosa Latour, Usera, Madrid, 28026, Spain","address":{"subway":"Línea 3","road":"Calle del Doctor Tolosa Latour","suburb":"Usera","city_district":"Usera","city":"Madrid","county":"Madrid","state":"Madrid","postcode":"28026","country":"Spain","country_code":"es"}}
   EOF
 
-  OSM_REVERSE_PRILEP=<<-EOF.strip
+  OSM_REVERSE_PRILEP = <<-EOF.strip
       {"place_id":"46960069","licence":"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.","osm_type":"way","osm_id":"39757255","lat":"41.3508581896005","lon":"21.549896984439","display_name":"Gimnasium  Mirche Acev, Marksova, Prilep, Macedonia","address":{"school":"Gimnasium  Mirche Acev","road":"Marksova","city":"Prilep","country":"Macedonia","country_code":"mk"}}
   EOF
 
   def setup
     super
-    @osm_full_hash = {:street_address=>"100 Spear St", :city=>"San Francisco", :state=>"CA", :zip=>"94105", :country_code=>"US"}
-    @osm_city_hash = {:city=>"San Francisco", :state=>"CA"}
+    @osm_full_hash = {street_address: '100 Spear St', city: 'San Francisco', state: 'CA', zip: '94105', country_code: 'US'}
+    @osm_city_hash = {city: 'San Francisco', state: 'CA'}
     @osm_full_loc = Geokit::GeoLoc.new(@osm_full_hash)
     @osm_city_loc = Geokit::GeoLoc.new(@osm_city_hash)
   end
@@ -31,7 +30,7 @@ class OSMGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_osm_full_address
     response = MockSuccess.new
     response.expects(:body).returns(OSM_FULL)
-    url="http://nominatim.openstreetmap.org/search?format=json&polygon=0&addressdetails=1&q=#{Geokit::Inflector.url_escape(@full_address_short_zip)}"
+    url = "http://nominatim.openstreetmap.org/search?format=json&polygon=0&addressdetails=1&q=#{Geokit::Inflector.url_escape(@full_address_short_zip)}"
     Geokit::Geocoders::OSMGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     do_full_address_assertions(Geokit::Geocoders::OSMGeocoder.geocode(@full_address_short_zip))
   end
@@ -39,7 +38,7 @@ class OSMGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_osm_full_address_accuracy
     response = MockSuccess.new
     response.expects(:body).returns(OSM_FULL)
-    url="http://nominatim.openstreetmap.org/search?format=json&polygon=0&addressdetails=1&q=#{Geokit::Inflector.url_escape(@full_address_short_zip)}"
+    url = "http://nominatim.openstreetmap.org/search?format=json&polygon=0&addressdetails=1&q=#{Geokit::Inflector.url_escape(@full_address_short_zip)}"
     Geokit::Geocoders::OSMGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     res = Geokit::Geocoders::OSMGeocoder.geocode(@full_address_short_zip)
     assert_equal 'house', res.accuracy
@@ -48,7 +47,7 @@ class OSMGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_osm_full_address_with_geo_loc
     response = MockSuccess.new
     response.expects(:body).returns(OSM_FULL)
-    url="http://nominatim.openstreetmap.org/search?format=json&polygon=0&addressdetails=1&q=#{Geokit::Inflector.url_escape(@full_address_short_zip)}"
+    url = "http://nominatim.openstreetmap.org/search?format=json&polygon=0&addressdetails=1&q=#{Geokit::Inflector.url_escape(@full_address_short_zip)}"
     Geokit::Geocoders::OSMGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     do_full_address_assertions(Geokit::Geocoders::OSMGeocoder.geocode(@osm_full_loc))
   end
@@ -56,24 +55,32 @@ class OSMGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_osm_city
     response = MockSuccess.new
     response.expects(:body).returns(OSM_CITY)
-    url="http://nominatim.openstreetmap.org/search?format=json&polygon=0&addressdetails=1&q=#{Geokit::Inflector.url_escape(@address)}"
+    url = "http://nominatim.openstreetmap.org/search?format=json&polygon=0&addressdetails=1&q=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::OSMGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     do_city_assertions(Geokit::Geocoders::OSMGeocoder.geocode(@address))
   end
 
+  def test_osm_city_with_accept_language
+    response = MockSuccess.new
+    response.expects(:body).returns(OSM_CITY)
+    url = "http://nominatim.openstreetmap.org/search?format=json&polygon=0&accept-language=pt-br&addressdetails=1&q=#{Geokit::Inflector.url_escape(@address)}"
+    Geokit::Geocoders::OSMGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    do_city_assertions(Geokit::Geocoders::OSMGeocoder.geocode(@address, {:'accept-language' => 'pt-br'}))
+  end
+
   def test_osm_city_accuracy
     response = MockSuccess.new
     response.expects(:body).returns(OSM_CITY)
-    url="http://nominatim.openstreetmap.org/search?format=json&polygon=0&addressdetails=1&q=#{Geokit::Inflector.url_escape(@address)}"
+    url = "http://nominatim.openstreetmap.org/search?format=json&polygon=0&addressdetails=1&q=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::OSMGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     res = Geokit::Geocoders::OSMGeocoder.geocode(@address)
-    assert_equal "county", res.accuracy
+    assert_equal 'county', res.accuracy
   end
 
   def test_osm_city_with_geo_loc
     response = MockSuccess.new
     response.expects(:body).returns(OSM_CITY)
-    url="http://nominatim.openstreetmap.org/search?format=json&polygon=0&addressdetails=1&q=#{Geokit::Inflector.url_escape(@address)}"
+    url = "http://nominatim.openstreetmap.org/search?format=json&polygon=0&addressdetails=1&q=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::OSMGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     do_city_assertions(Geokit::Geocoders::OSMGeocoder.geocode(@osm_city_loc))
   end
@@ -82,26 +89,26 @@ class OSMGeocoderTest < BaseGeocoderTest #:nodoc: all
     response = MockSuccess.new
     response.expects(:body).returns(OSM_REVERSE_PRILEP)
     prilep = Geokit::GeoLoc.new
-    prilep.lat, prilep.lng = "41.3527177", "21.5497808"
+    prilep.lat, prilep.lng = '41.3527177', '21.5497808'
     url = "http://nominatim.openstreetmap.org/reverse?format=json&addressdetails=1&lat=#{prilep.lat}&lon=#{prilep.lng}"
     Geokit::Geocoders::OSMGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     res = Geokit::Geocoders::OSMGeocoder.do_reverse_geocode(prilep.ll)
 
-      #OSM does not return the exast lat lng in response
-      #assert_equal prilep.lat.to_s.slice(1..5), res.lat.to_s.slice(1..5)
-      #assert_equal prilep.lng.to_s.slice(1..5), res.lng.to_s.slice(1..5)
-      assert_equal "MK", res.country_code
-      assert_equal "osm", res.provider
+      # OSM does not return the exast lat lng in response
+      # assert_equal prilep.lat.to_s.slice(1..5), res.lat.to_s.slice(1..5)
+      # assert_equal prilep.lng.to_s.slice(1..5), res.lng.to_s.slice(1..5)
+      assert_equal 'MK', res.country_code
+      assert_equal 'osm', res.provider
 
-      assert_equal "Prilep", res.city
+      assert_equal 'Prilep', res.city
       assert_nil res.state
 
-      assert_equal "Macedonia", res.country
+      assert_equal 'Macedonia', res.country
       assert_nil res.precision
       assert_equal true, res.success
 
-      assert_equal "Marksova, Prilep, MK", res.full_address
-      assert_equal "Marksova", res.street_address
+      assert_equal 'Marksova, Prilep, MK', res.full_address
+      assert_equal 'Marksova', res.street_address
   end
 
   def test_reverse_geo_code
@@ -109,28 +116,39 @@ class OSMGeocoderTest < BaseGeocoderTest #:nodoc: all
     response.expects(:body).returns(OSM_REVERSE_MADRID)
     location = Geokit::GeoLoc.new
     # Madrid
-    location.lat, location.lng = "40.4167413", "-3.7032498"
+    location.lat, location.lng = '40.4167413', '-3.7032498'
     url = "http://nominatim.openstreetmap.org/reverse?format=json&addressdetails=1&lat=#{location.lat}&lon=#{location.lng}"
     Geokit::Geocoders::OSMGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     res = Geokit::Geocoders::OSMGeocoder.do_reverse_geocode(location.ll)
 
-    assert_equal "ES", res.country_code
-    assert_equal "osm", res.provider
+    assert_equal 'ES', res.country_code
+    assert_equal 'osm', res.provider
 
-    assert_equal "Madrid", res.city
-    assert_equal "Madrid", res.state
+    assert_equal 'Madrid', res.city
+    assert_equal 'Madrid', res.state
 
-    assert_equal "Spain", res.country
+    assert_equal 'Spain', res.country
     assert_equal true, res.success
 
-    assert_equal "Calle Del Doctor Tolosa Latour, Usera, Madrid, Madrid, 28026, ES", res.full_address
-    assert_equal "28026", res.zip
-    assert_equal "Calle Del Doctor Tolosa Latour", res.street_address
+    assert_equal 'Calle Del Doctor Tolosa Latour, Usera, Madrid, Madrid, 28026, ES', res.full_address
+    assert_equal '28026', res.zip
+    assert_equal 'Calle Del Doctor Tolosa Latour', res.street_address
+  end
+
+  def test_reverse_geo_code_with_accept_language
+    response = MockSuccess.new
+    response.expects(:body).returns(OSM_REVERSE_MADRID)
+    location = Geokit::GeoLoc.new
+    # Madrid
+    location.lat, location.lng = '40.4167413', '-3.7032498'
+    url = "http://nominatim.openstreetmap.org/reverse?format=json&addressdetails=1&lat=#{location.lat}&lon=#{location.lng}&accept-language=pt-br"
+    Geokit::Geocoders::OSMGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    Geokit::Geocoders::OSMGeocoder.do_reverse_geocode(location.ll, {:'accept-language' => 'pt-br'})
   end
 
   def test_service_unavailable
     response = MockFailure.new
-    url = url="http://nominatim.openstreetmap.org/search?format=json&polygon=0&addressdetails=1&q=#{Geokit::Inflector.url_escape(@address)}"
+    url = url = "http://nominatim.openstreetmap.org/search?format=json&polygon=0&addressdetails=1&q=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::OSMGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     assert !Geokit::Geocoders::OSMGeocoder.geocode(@osm_city_loc).success
   end
@@ -139,21 +157,21 @@ class OSMGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   # next two methods do the assertions for both address-level and city-level lookups
   def do_full_address_assertions(res)
-    assert_equal "California", res.state
-    assert_equal "San Francisco", res.city
-    assert_equal "37.792391,-122.394024", res.ll
+    assert_equal 'California', res.state
+    assert_equal 'San Francisco', res.city
+    assert_equal '37.792391,-122.394024', res.ll
     assert res.is_us?
-    assert_equal "Spear Street 100, San Francisco, California, 94105, US", res.full_address
-    assert_equal "osm", res.provider
+    assert_equal 'Spear Street 100, San Francisco, California, 94105, US', res.full_address
+    assert_equal 'osm', res.provider
   end
 
   def do_city_assertions(res)
-    assert_equal "California", res.state
-    assert_equal "San Francisco", res.city
-    assert_equal "37.7340974,-122.3912596", res.ll
+    assert_equal 'California', res.state
+    assert_equal 'San Francisco', res.city
+    assert_equal '37.7340974,-122.3912596', res.ll
     assert res.is_us?
-    assert_equal "San Francisco, California, US", res.full_address
+    assert_equal 'San Francisco, California, US', res.full_address
     assert_nil res.street_address
-    assert_equal "osm", res.provider
+    assert_equal 'osm', res.provider
   end
 end