darrell-geokit 1.2.4.1 → 1.4.1.1

data/lib/geokit/mappable.rb

@@ -110,9 +110,9 @@ module Geokit
       end
   
       # Geocodes a location using the multi geocoder.
-      def geocode(location)
-        res = Geocoders::MultiGeocoder.geocode(location)
-        return res if res.success
+      def geocode(location, options = {})
+        res = Geocoders::MultiGeocoder.geocode(location, options)
+        return res if res.success?
         raise Geokit::Geocoders::GeocodeError      
       end
     
@@ -251,6 +251,14 @@ module Geokit
       other.is_a?(LatLng) ? self.lat == other.lat && self.lng == other.lng : false
     end
     
+    def hash
+      lat.hash + lng.hash
+    end
+    
+    def eql?(other)
+      self == other
+    end
+    
     # A *class* method to take anything which can be inferred as a point and generate
     # a LatLng from it. You should use this anything you're not sure what the input is,
     # and want to deal with it as a LatLng if at all possible. Can take:
@@ -270,7 +278,7 @@ module Geokit
           return Geokit::LatLng.new(match[1],match[2])
         else
           res = Geokit::Geocoders::MultiGeocoder.geocode(thing)
-          return res if res.success
+          return res if res.success?
           raise Geokit::Geocoders::GeocodeError  
         end
       elsif thing.is_a?(Array) && thing.size==2
@@ -284,6 +292,30 @@ module Geokit
       raise ArgumentError.new("#{thing} (#{thing.class}) cannot be normalized to a LatLng. We tried interpreting it as an array, string, Mappable, etc., but no dice.")
     end
     
+    # Reverse geocodes a LatLng object using the MultiGeocoder (default), or optionally
+    # using a geocoder of your choosing. Returns a new Geokit::GeoLoc object
+    # 
+    # ==== Options
+    # * :using  - Specifies the geocoder to use for reverse geocoding. Defaults to
+    #             MultiGeocoder. Can be either the geocoder class (or any class that 
+    #             implements do_reverse_geocode for that matter), or the name of
+    #             the class without the "Geocoder" part (e.g. :google)
+    #
+    # ==== Examples
+    # LatLng.new(51.4578329, 7.0166848).reverse_geocode # => #<Geokit::GeoLoc:0x12dac20 @state...>
+    # LatLng.new(51.4578329, 7.0166848).reverse_geocode(:using => :google) # => #<Geokit::GeoLoc:0x12dac20 @state...>
+    # LatLng.new(51.4578329, 7.0166848).reverse_geocode(:using => Geokit::Geocoders::GoogleGeocoder) # => #<Geokit::GeoLoc:0x12dac20 @state...>
+    def reverse_geocode(options = { :using => Geokit::Geocoders::MultiGeocoder })
+      if options[:using].is_a?(String) or options[:using].is_a?(Symbol)
+        provider = Geokit::Geocoders.const_get("#{Geokit::Inflector::camelize(options[:using].to_s)}Geocoder")
+      elsif options[:using].respond_to?(:do_reverse_geocode)
+        provider = options[:using]
+      else
+        raise ArgumentError.new("#{options[:using]} is not a valid geocoder.")
+      end
+      
+      provider.send(:reverse_geocode, self)
+    end
   end
 
   # This class encapsulates the result of a geocoding call.
@@ -314,9 +346,12 @@ module Geokit
     # Attributes set upon return from geocoding.  Success will be true for successful
     # geocode lookups.  The provider will be set to the name of the providing geocoder.
     # Finally, precision is an indicator of the accuracy of the geocoding.
-    attr_accessor :success, :provider, :precision
+    attr_accessor :success, :provider, :precision, :suggested_bounds
     # Street number and street name are extracted from the street address attribute.
     attr_reader :street_number, :street_name
+    # accuracy is set for Yahoo and Google geocoders, it is a numeric value of the 
+    # precision. see http://code.google.com/apis/maps/documentation/geocoding/#GeocodingAccuracy
+    attr_accessor :accuracy
 
     # Constructor expects a hash of symbols to correspond with attributes.
     def initialize(h={})
@@ -337,6 +372,10 @@ module Geokit
     def is_us?
       country_code == 'US'
     end
+    
+    def success?
+      success == true
+    end
 
     # full_address is provided by google but not by yahoo. It is intended that the google
     # geocoding method will provide the full address, whereas for yahoo it will be derived
@@ -374,7 +413,7 @@ module Geokit
       #@street_address = Geokit::Inflector::titleize(address) if address
       @street_address = address if address
     end  
-
+    
     # Returns a comma-delimited string consisting of the street address, city, state,
     # zip, and country code.  Only includes those attributes that are non-blank.
     def to_geocodeable_s
@@ -384,12 +423,12 @@ module Geokit
     end
     
     def to_yaml_properties
-      (instance_variables - ['@results']).sort
+      (instance_variables - ['@all']).sort
     end
 
     # Returns a string representation of the instance.
     def to_s
-      "Provider: #{provider}\n Street: #{street_address}\nCity: #{city}\nState: #{state}\nZip: #{zip}\nLatitude: #{lat}\nLongitude: #{lng}\nCountry: #{country_code}\nSuccess: #{success}"
+      "Provider: #{provider}\nStreet: #{street_address}\nCity: #{city}\nState: #{state}\nZip: #{zip}\nLatitude: #{lat}\nLongitude: #{lng}\nCountry: #{country_code}\nSuccess: #{success}"
     end
   end
   
@@ -443,6 +482,16 @@ module Geokit
       other.is_a?(Bounds) ? self.sw == other.sw && self.ne == other.ne : false
     end
     
+    # Equivalent to Google Maps API's .toSpan() method on GLatLng's.
+    #
+    # Returns a LatLng object, whose coordinates represent the size of a rectangle
+    # defined by these bounds.
+    def to_span
+      lat_span = (@ne.lat - @sw.lat).abs
+      lng_span = (crosses_meridian? ? 360 + @ne.lng - @sw.lng : @ne.lng - @sw.lng).abs
+      Geokit::LatLng.new(lat_span, lng_span)
+    end
+    
     class <<self
       
       # returns an instance of bounds which completely encompases the given circle

data/test/test_base_geocoder.rb

@@ -17,25 +17,27 @@ end
 # Base class for testing geocoders.
 class BaseGeocoderTest < Test::Unit::TestCase #:nodoc: all
 
+  class Geokit::Geocoders::TestGeocoder < Geokit::Geocoders::Geocoder
+    def self.do_get(url)
+      sleep(2)
+    end    
+  end
+
   # Defines common test fixtures.
   def setup
     @address = 'San Francisco, CA'    
     @full_address = '100 Spear St, San Francisco, CA, 94105-1522, US'   
     @full_address_short_zip = '100 Spear St, San Francisco, CA, 94105, US' 
     
-    @success = Geokit::GeoLoc.new({:city=>"SAN FRANCISCO", :state=>"CA", :country_code=>"US", :lat=>37.7742, :lng=>-122.417068})
+    @latlng = Geokit::LatLng.new(37.7742, -122.417068)
+    @success = Geokit::GeoLoc.new({:city=>"SAN FRANCISCO", :state=>"CA", :country_code=>"US", :lat=>@latlng.lat, :lng=>@latlng.lng})
     @success.success = true    
   end  
   
   def test_timeout_call_web_service
-    Geokit::Geocoders::Geocoder.class_eval do
-      def self.do_get(url)
-        sleep(2)
-      end
-    end
     url = "http://www.anything.com"
     Geokit::Geocoders::timeout = 1
-    assert_nil Geokit::Geocoders::Geocoder.call_geocoder_service(url)    
+    assert_nil Geokit::Geocoders::TestGeocoder.call_geocoder_service(url)    
   end
   
   def test_successful_call_web_service

data/test/test_bounds.rb

@@ -71,4 +71,27 @@ class BoundsTest < Test::Unit::TestCase #:nodoc: all
     assert !bounds.contains?(outside)
   end
   
+  def test_bounds_to_span
+    sw = Geokit::LatLng.new(32, -96)
+    ne = Geokit::LatLng.new(40, -70)
+    bounds = Geokit::Bounds.new(sw, ne)
+    
+    assert_equal Geokit::LatLng.new(8, 26), bounds.to_span
+  end
+  
+  def test_bounds_to_span_with_bounds_crossing_prime_meridian
+    sw = Geokit::LatLng.new(20, -70)
+    ne = Geokit::LatLng.new(40, 100)
+    bounds = Geokit::Bounds.new(sw, ne)
+    
+    assert_equal Geokit::LatLng.new(20, 170), bounds.to_span
+  end
+  
+  def test_bounds_to_span_with_bounds_crossing_dateline
+    sw = Geokit::LatLng.new(20, 100)
+    ne = Geokit::LatLng.new(40, -70)
+    bounds = Geokit::Bounds.new(sw, ne)
+    
+    assert_equal Geokit::LatLng.new(20, 190), bounds.to_span
+  end
 end

data/test/test_geoloc.rb

@@ -13,6 +13,14 @@ class GeoLocTest < Test::Unit::TestCase #:nodoc: all
     assert @loc.is_us?
   end
   
+  def test_success
+    assert !@loc.success?
+    @loc.success = false
+    assert !@loc.success?
+    @loc.success = true
+    assert @loc.success?
+  end
+  
   def test_street_number
     @loc.street_address = '123 Spear St.'
     assert_equal '123', @loc.street_number
@@ -51,4 +59,14 @@ class GeoLocTest < Test::Unit::TestCase #:nodoc: all
     assert_equal [@loc], @loc.all
   end
   
+  def test_to_yaml
+    @loc.city = 'San Francisco'
+    @loc.state = 'CA'
+    @loc.zip = '94105'
+    @loc.country_code = 'US'
+    assert_equal( 
+      "--- !ruby/object:Geokit::GeoLoc \ncity: San Francisco\ncountry_code: US\nfull_address: \nlat: \nlng: \nprecision: unknown\nstate: CA\nstreet_address: \nsuccess: false\nzip: \"94105\"\n", 
+      @loc.to_yaml)
+  end
+  
 end

data/test/test_geoplugin_geocoder.rb

@@ -0,0 +1,59 @@
+# encoding: utf-8
+require File.join(File.dirname(__FILE__), 'test_base_geocoder')
+
+class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
+    
+  IP_SUCCESS=<<-EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<geoPlugin>
+    <geoplugin_city>Belo Horizonte</geoplugin_city>
+    <geoplugin_region>Minas Gerais</geoplugin_region>
+    <geoplugin_areaCode>0</geoplugin_areaCode>
+    <geoplugin_dmaCode>0</geoplugin_dmaCode>
+    <geoplugin_countryCode>BR</geoplugin_countryCode>
+    <geoplugin_countryName>Brazil</geoplugin_countryName>
+    <geoplugin_continentCode>SA</geoplugin_continentCode>
+    <geoplugin_latitude>-19.916700</geoplugin_latitude>
+    <geoplugin_longitude>-43.933300</geoplugin_longitude>
+    <geoplugin_currencyCode>BRL</geoplugin_currencyCode>
+    <geoplugin_currencySymbol>&#82;&#36;</geoplugin_currencySymbol>
+    <geoplugin_currencyConverter>2.2575001717</geoplugin_currencyConverter>
+</geoPlugin>
+    EOF
+
+  def setup
+    super
+    @success.provider = "geoPlugin"
+  end    
+  
+  def test_successful_lookup
+    success = MockSuccess.new
+    success.expects(:body).returns(IP_SUCCESS)
+    url = 'http://www.geoplugin.net/xml.gp?ip=200.150.38.66'
+    GeoKit::Geocoders::GeoPluginGeocoder.expects(:call_geocoder_service).with(url).returns(success)
+    location = GeoKit::Geocoders::GeoPluginGeocoder.geocode('200.150.38.66')
+    assert_not_nil location
+    assert_equal -19.916700, location.lat
+    assert_equal -43.933300, location.lng
+    assert_equal "Belo Horizonte", location.city
+    assert_equal "Minas Gerais", location.state
+    assert_equal "BR", location.country_code
+    assert_equal "geoPlugin", location.provider
+    assert location.success?
+  end
+
+  def test_invalid_ip
+    location = GeoKit::Geocoders::GeoPluginGeocoder.geocode("pixrum")
+    assert_not_nil location
+    assert !location.success?
+  end
+  
+  def test_service_unavailable
+    failure = MockFailure.new
+    url = 'http://www.geoplugin.net/xml.gp?ip=10.10.10.10'
+    GeoKit::Geocoders::GeoPluginGeocoder.expects(:call_geocoder_service).with(url).returns(failure)
+    location = GeoKit::Geocoders::GeoPluginGeocoder.geocode("10.10.10.10")
+    assert_not_nil location
+    assert !location.success?
+  end  
+end

data/test/test_google_geocoder.rb

@@ -7,6 +7,10 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
   GOOGLE_FULL=<<-EOF.strip
   <?xml version="1.0" encoding="UTF-8"?><kml xmlns="http://earth.google.com/kml/2.0"><Response><name>100 spear st, san francisco, ca</name><Status><code>200</code><request>geocode</request></Status><Placemark><address>100 Spear St, San Francisco, CA 94105, USA</address><AddressDetails Accuracy="8" xmlns="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"><Country><CountryNameCode>US</CountryNameCode><AdministrativeArea><AdministrativeAreaName>CA</AdministrativeAreaName><SubAdministrativeArea><SubAdministrativeAreaName>San Francisco</SubAdministrativeAreaName><Locality><LocalityName>San Francisco</LocalityName><Thoroughfare><ThoroughfareName>100 Spear St</ThoroughfareName></Thoroughfare><PostalCode><PostalCodeNumber>94105</PostalCodeNumber></PostalCode></Locality></SubAdministrativeArea></AdministrativeArea></Country></AddressDetails><Point><coordinates>-122.393985,37.792501,0</coordinates></Point></Placemark></Response></kml>
   EOF
+  
+  GOOGLE_RESULT_WITH_SUGGESTED_BOUNDS=<<-EOF.strip
+  <?xml version="1.0" encoding="UTF-8"?><kml xmlns="http://earth.google.com/kml/2.0"><Response><name>100 spear st, san francisco, ca</name><Status><code>200</code><request>geocode</request></Status><Placemark><address>100 Spear St, San Francisco, CA 94105, USA</address><AddressDetails Accuracy="8" xmlns="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"><Country><CountryNameCode>US</CountryNameCode><AdministrativeArea><AdministrativeAreaName>CA</AdministrativeAreaName><SubAdministrativeArea><SubAdministrativeAreaName>San Francisco</SubAdministrativeAreaName><Locality><LocalityName>San Francisco</LocalityName><Thoroughfare><ThoroughfareName>100 Spear St</ThoroughfareName></Thoroughfare><PostalCode><PostalCodeNumber>94105</PostalCodeNumber></PostalCode></Locality></SubAdministrativeArea></AdministrativeArea></Country></AddressDetails><ExtendedData><LatLonBox north="37.7956328" south="37.7893376" east="-122.3908573" west="-122.3971525" /></ExtendedData><Point><coordinates>-122.393985,37.792501,0</coordinates></Point></Placemark></Response></kml>
+  EOF
 
   GOOGLE_CITY=<<-EOF.strip
   <?xml version="1.0" encoding="UTF-8"?><kml xmlns="http://earth.google.com/kml/2.0"><Response><name>San Francisco</name><Status><code>200</code><request>geocode</request></Status><Placemark><address>San Francisco, CA, USA</address><AddressDetails Accuracy="4" xmlns="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"><Country><CountryNameCode>US</CountryNameCode><AdministrativeArea><AdministrativeAreaName>CA</AdministrativeAreaName><Locality><LocalityName>San Francisco</LocalityName></Locality></AdministrativeArea></Country></AddressDetails><Point><coordinates>-122.418333,37.775000,0</coordinates></Point></Placemark></Response></kml>
@@ -14,6 +18,14 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
   
   GOOGLE_MULTI="<?xml version='1.0' encoding='UTF-8'?>\n<kml xmlns='http://earth.google.com/kml/2.0'><Response>\n  <name>via Sandro Pertini 8, Ossona, MI</name>\n  <Status>\n    <code>200</code>\n    <request>geocode</request>\n  </Status>\n  <Placemark id='p1'>\n    <address>Via Sandro Pertini, 8, 20010 Mesero MI, Italy</address>\n    <AddressDetails Accuracy='8' xmlns='urn:oasis:names:tc:ciq:xsdschema:xAL:2.0'><Country><CountryNameCode>IT</CountryNameCode><CountryName>Italy</CountryName><AdministrativeArea><AdministrativeAreaName>Lombardy</AdministrativeAreaName><SubAdministrativeArea><SubAdministrativeAreaName>Milan</SubAdministrativeAreaName><Locality><LocalityName>Mesero</LocalityName><Thoroughfare><ThoroughfareName>8 Via Sandro Pertini</ThoroughfareName></Thoroughfare><PostalCode><PostalCodeNumber>20010</PostalCodeNumber></PostalCode></Locality></SubAdministrativeArea></AdministrativeArea></Country></AddressDetails>\n    <Point><coordinates>8.8527131,45.4966243,0</coordinates></Point>\n  </Placemark>\n  <Placemark id='p2'>\n    <address>Via Sandro Pertini, 20010 Ossona MI, Italy</address>\n    <AddressDetails Accuracy='6' xmlns='urn:oasis:names:tc:ciq:xsdschema:xAL:2.0'><Country><CountryNameCode>IT</CountryNameCode><CountryName>Italy</CountryName><AdministrativeArea><AdministrativeAreaName>Lombardy</AdministrativeAreaName><SubAdministrativeArea><SubAdministrativeAreaName>Milan</SubAdministrativeAreaName><Locality><LocalityName>Ossona</LocalityName><Thoroughfare><ThoroughfareName>Via Sandro Pertini</ThoroughfareName></Thoroughfare><PostalCode><PostalCodeNumber>20010</PostalCodeNumber></PostalCode></Locality></SubAdministrativeArea></AdministrativeArea></Country></AddressDetails>\n    <Point><coordinates>8.9023200,45.5074444,0</coordinates></Point>\n  </Placemark>\n</Response></kml>\n"
   
+  GOOGLE_COUNTRY_CODE_BIASED_RESULT = <<-EOF.strip
+  <?xml version="1.0" encoding="UTF-8" ?><kml xmlns="http://earth.google.com/kml/2.0"><Response><name>Syracuse</name><Status><code>200</code><request>geocode</request></Status><Placemark id="p1"><address>Syracuse, Italy</address><AddressDetails Accuracy="3" xmlns="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"><Country><CountryNameCode>IT</CountryNameCode><CountryName>Italy</CountryName><AdministrativeArea><AdministrativeAreaName>Sicily</AdministrativeAreaName><SubAdministrativeArea><SubAdministrativeAreaName>Syracuse</SubAdministrativeAreaName></SubAdministrativeArea></AdministrativeArea></Country></AddressDetails><ExtendedData><LatLonBox north="37.4125978" south="36.6441736" east="15.3367367" west="14.7724913" /></ExtendedData><Point><coordinates>14.9856176,37.0630218,0</coordinates></Point></Placemark></Response></kml>
+  EOF
+  
+  GOOGLE_BOUNDS_BIASED_RESULT = <<-EOF.strip
+  <?xml version="1.0" encoding="UTF-8" ?><kml xmlns="http://earth.google.com/kml/2.0"><Response><name>Winnetka</name><Status><code>200</code><request>geocode</request></Status><Placemark id="p1"><address>Winnetka, California, USA</address><AddressDetails Accuracy="4" xmlns="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"><Country><CountryNameCode>US</CountryNameCode><CountryName>USA</CountryName><AdministrativeArea><AdministrativeAreaName>CA</AdministrativeAreaName><AddressLine>Winnetka</AddressLine></AdministrativeArea></Country></AddressDetails><ExtendedData><LatLonBox north="34.2353090" south="34.1791050" east="-118.5534191" west="-118.5883200" /></ExtendedData><Point><coordinates>-118.5710220,34.2131710,0</coordinates></Point></Placemark></Response></kml>
+  EOF
+  
   def setup
     super
     @google_full_hash = {:street_address=>"100 Spear St", :city=>"San Francisco", :state=>"CA", :zip=>"94105", :country_code=>"US"}
@@ -50,6 +62,15 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal "100 Spear St, San Francisco, CA 94105, USA", res.full_address #slightly different from yahoo
     assert_equal "google", res.provider
   end  
+  
+  def test_google_full_address_accuracy
+    response = MockSuccess.new
+    response.expects(:body).returns(GOOGLE_FULL)
+    url = "http://maps.google.com/maps/geo?q=#{Geokit::Inflector.url_escape(@full_address_short_zip)}&output=xml&key=Google&oe=utf-8"
+    Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    res=Geokit::Geocoders::GoogleGeocoder.geocode(@google_full_loc)
+    assert_equal 8, res.accuracy
+  end
 
   def test_google_city
     response = MockSuccess.new
@@ -66,6 +87,15 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal "google", res.provider
   end  
   
+  def test_google_city_accuracy
+    response = MockSuccess.new
+    response.expects(:body).returns(GOOGLE_CITY)
+    url = "http://maps.google.com/maps/geo?q=#{Geokit::Inflector.url_escape(@address)}&output=xml&key=Google&oe=utf-8"
+    Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    res=Geokit::Geocoders::GoogleGeocoder.geocode(@address)
+    assert_equal 4, res.accuracy
+  end
+  
   def test_google_city_with_geo_loc
     response = MockSuccess.new
     response.expects(:body).returns(GOOGLE_CITY)
@@ -81,6 +111,17 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal "google", res.provider
   end  
   
+  def test_google_suggested_bounds
+    response = MockSuccess.new
+    response.expects(:body).returns(GOOGLE_RESULT_WITH_SUGGESTED_BOUNDS)
+    url = "http://maps.google.com/maps/geo?q=#{Geokit::Inflector.url_escape(@full_address_short_zip)}&output=xml&key=Google&oe=utf-8"
+    Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    res = Geokit::Geocoders::GoogleGeocoder.geocode(@google_full_loc)
+    
+    assert_instance_of Geokit::Bounds, res.suggested_bounds
+    assert_equal Geokit::Bounds.new(Geokit::LatLng.new(37.7893376, -122.3971525), Geokit::LatLng.new(37.7956328, -122.3908573)), res.suggested_bounds
+  end
+  
   def test_service_unavailable
     response = MockFailure.new
     url = "http://maps.google.com/maps/geo?q=#{Geokit::Inflector.url_escape(@address)}&output=xml&key=Google&oe=utf-8"
@@ -113,4 +154,30 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal "Via Sandro Pertini", res.street_address
     assert_equal "google", res.provider
   end
+  
+  def test_country_code_biasing
+    response = MockSuccess.new
+    response.expects(:body).returns(GOOGLE_COUNTRY_CODE_BIASED_RESULT)
+    
+    url = "http://maps.google.com/maps/geo?q=Syracuse&output=xml&gl=it&key=Google&oe=utf-8"
+    Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    biased_result = Geokit::Geocoders::GoogleGeocoder.geocode('Syracuse', :bias => 'it')
+    
+    assert_equal 'IT', biased_result.country_code
+    assert_equal 'Sicily', biased_result.state
+  end
+  
+  def test_bounds_biasing
+    response = MockSuccess.new
+    response.expects(:body).returns(GOOGLE_BOUNDS_BIASED_RESULT)
+    
+    url = "http://maps.google.com/maps/geo?q=Winnetka&output=xml&ll=34.197693208849,-118.547160027785&spn=0.247047999999999,0.294914000000006&key=Google&oe=utf-8"
+    Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    
+    bounds = Geokit::Bounds.normalize([34.074081, -118.694401], [34.321129, -118.399487])
+    biased_result = Geokit::Geocoders::GoogleGeocoder.geocode('Winnetka', :bias => bounds)
+    
+    assert_equal 'US', biased_result.country_code
+    assert_equal 'CA', biased_result.state
+  end
 end

data/test/test_google_reverse_geocoder.rb

@@ -0,0 +1,49 @@
+require File.join(File.dirname(__FILE__), 'test_base_geocoder')
+
+Geokit::Geocoders::google = 'Google'
+
+class GoogleReverseGeocoderTest < BaseGeocoderTest #:nodoc: all
+  
+  GOOGLE_REVERSE_FULL=<<-EOF.strip  
+  <?xml version="1.0" encoding="UTF-8" ?><kml xmlns="http://earth.google.com/kml/2.0"><Response><name>51.457833,7.016685</name><Status><code>200</code><request>geocode</request></Status><Placemark id="p1"><address>Porscheplatz 1, 45127 Essen, Deutschland</address><AddressDetails Accuracy="8" xmlns="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"><Country><CountryNameCode>DE</CountryNameCode><CountryName>Deutschland</CountryName><AdministrativeArea><AdministrativeAreaName>Nordrhein-Westfalen</AdministrativeAreaName><SubAdministrativeArea><SubAdministrativeAreaName>Essen</SubAdministrativeAreaName><Locality><LocalityName>Essen</LocalityName><DependentLocality><DependentLocalityName>Stadtkern</DependentLocalityName><Thoroughfare><ThoroughfareName>Porscheplatz 1</ThoroughfareName></Thoroughfare><PostalCode><PostalCodeNumber>45127</PostalCodeNumber></PostalCode></DependentLocality></Locality></SubAdministrativeArea></AdministrativeArea></Country></AddressDetails><ExtendedData><LatLonBox north="51.4609805" south="51.4546853" east="7.0198324" west="7.0135372" /></ExtendedData><Point><coordinates>7.0166848,51.4578329,0</coordinates></Point></Placemark><Placemark id="p2"><address>Stadtkern, Essen, Deutschland</address><AddressDetails Accuracy="4" xmlns="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"><Country><CountryNameCode>DE</CountryNameCode><CountryName>Deutschland</CountryName><AdministrativeArea><AdministrativeAreaName>Nordrhein-Westfalen</AdministrativeAreaName><SubAdministrativeArea><SubAdministrativeAreaName>Essen</SubAdministrativeAreaName><Locality><LocalityName>Essen</LocalityName><DependentLocality><DependentLocalityName>Stadtkern</DependentLocalityName></DependentLocality></Locality></SubAdministrativeArea></AdministrativeArea></Country></AddressDetails><ExtendedData><LatLonBox north="51.4630710" south="51.4506320" east="7.0193200" west="7.0026170" /></ExtendedData><Point><coordinates>7.0124328,51.4568201,0</coordinates></Point></Placemark><Placemark id="p3"><address>45127 Essen, Deutschland</address><AddressDetails Accuracy="5" xmlns="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"><Country><CountryNameCode>DE</CountryNameCode><CountryName>Deutschland</CountryName><AdministrativeArea><AdministrativeAreaName>Nordrhein-Westfalen</AdministrativeAreaName><SubAdministrativeArea><SubAdministrativeAreaName>Essen</SubAdministrativeAreaName><Locality><LocalityName>Essen</LocalityName><PostalCode><PostalCodeNumber>45127</PostalCodeNumber></PostalCode></Locality></SubAdministrativeArea></AdministrativeArea></Country></AddressDetails><ExtendedData><LatLonBox north="51.4637808" south="51.4503125" east="7.0231080" west="6.9965454" /></ExtendedData><Point><coordinates>7.0104543,51.4556194,0</coordinates></Point></Placemark><Placemark id="p4"><address>Essen, Deutschland</address><AddressDetails Accuracy="4" xmlns="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"><Country><CountryNameCode>DE</CountryNameCode><CountryName>Deutschland</CountryName><AdministrativeArea><AdministrativeAreaName>Nordrhein-Westfalen</AdministrativeAreaName><SubAdministrativeArea><SubAdministrativeAreaName>Essen</SubAdministrativeAreaName><Locality><LocalityName>Essen</LocalityName></Locality></SubAdministrativeArea></AdministrativeArea></Country></AddressDetails><ExtendedData><LatLonBox north="51.5342070" south="51.3475730" east="7.1376530" west="6.8943470" /></ExtendedData><Point><coordinates>7.0147614,51.4580686,0</coordinates></Point></Placemark><Placemark id="p5"><address>Essen, Deutschland</address><AddressDetails Accuracy="3" xmlns="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"><Country><CountryNameCode>DE</CountryNameCode><CountryName>Deutschland</CountryName><AdministrativeArea><AdministrativeAreaName>Nordrhein-Westfalen</AdministrativeAreaName><SubAdministrativeArea><SubAdministrativeAreaName>Essen</SubAdministrativeAreaName></SubAdministrativeArea></AdministrativeArea></Country></AddressDetails><ExtendedData><LatLonBox north="51.5342070" south="51.3475730" east="7.1376530" west="6.8943470" /></ExtendedData><Point><coordinates>7.0461136,51.4508381,0</coordinates></Point></Placemark><Placemark id="p6"><address>Nordrhein-Westfalen, Deutschland</address><AddressDetails Accuracy="2" xmlns="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"><Country><CountryNameCode>DE</CountryNameCode><CountryName>Deutschland</CountryName><AdministrativeArea><AdministrativeAreaName>Nordrhein-Westfalen</AdministrativeAreaName></AdministrativeArea></Country></AddressDetails><ExtendedData><LatLonBox north="52.5314170" south="50.3225720" east="9.4615950" west="5.8663566" /></ExtendedData><Point><coordinates>7.6615938,51.4332367,0</coordinates></Point></Placemark><Placemark id="p7"><address>Deutschland</address><AddressDetails Accuracy="1" xmlns="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"><Country><CountryNameCode>DE</CountryNameCode><CountryName>Deutschland</CountryName></Country></AddressDetails><ExtendedData><LatLonBox north="55.0568230" south="47.2701270" east="15.0418536" west="5.8663566" /></ExtendedData><Point><coordinates>10.4515260,51.1656910,0</coordinates></Point></Placemark></Response></kml>
+  EOF
+  
+  
+  def test_google_full_address
+    response = MockSuccess.new
+    response.expects(:body).returns(GOOGLE_REVERSE_FULL)
+    
+    
+    # http://maps.google.com/maps/geo?output=xml&oe=utf-8&ll=51.4578329,7.0166848&key=asdad
+    
+    # #<Geokit::GeoLoc:0x10ec7ec
+    #      @city="Essen",
+    #      @country_code="DE",
+    #      @full_address="Porscheplatz 1, 45127 Essen, Germany",
+    #      @lat=51.4578329,
+    #      @lng=7.0166848,
+    #      @precision="address",
+    #      @provider="google",
+    #      @state="Nordrhein-Westfalen",
+    #      @street_address="Porscheplatz 1",
+    #      @success=true,
+    #      @zip="45127">
+    #     
+    
+    
+    @latlng = "51.4578329,7.0166848"
+    
+    url = "http://maps.google.com/maps/geo?ll=#{Geokit::Inflector.url_escape(@latlng)}&output=xml&key=Google&oe=utf-8"
+    Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    res=Geokit::Geocoders::GoogleGeocoder.reverse_geocode(@latlng) 
+    assert_equal "Nordrhein-Westfalen", res.state
+    assert_equal "Essen", res.city 
+    assert_equal "45127", res.zip
+    assert_equal "51.4578329,7.0166848", res.ll # slightly dif from yahoo
+    assert res.is_us? == false
+    assert_equal "Porscheplatz 1, 45127 Essen, Deutschland", res.full_address #slightly different from yahoo
+    assert_equal "google", res.provider
+  end
+  
+  
+end

data/test/test_inflector.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+require 'test/unit'
+require 'lib/geokit'
+
+class InflectorTest < Test::Unit::TestCase #:nodoc: all
+  
+  def test_titleize
+    assert_equal 'Sugar Grove', Geokit::Inflector.titleize('Sugar Grove')
+    assert_equal 'Sugar Grove', Geokit::Inflector.titleize('Sugar grove')
+    assert_equal 'Sugar Grove', Geokit::Inflector.titleize('sugar Grove')
+    assert_equal 'Sugar Grove', Geokit::Inflector.titleize('sugar grove')
+  end
+  
+  def test_titleize_with_unicode
+    assert_equal 'Borås', Geokit::Inflector.titleize('Borås')
+    assert_equal 'Borås', Geokit::Inflector.titleize('borås')
+    assert_equal 'Borås (Abc)', Geokit::Inflector.titleize('Borås (Abc)')
+    assert_equal 'Borås (Abc)', Geokit::Inflector.titleize('Borås (abc)')
+    assert_equal 'Borås (Abc)', Geokit::Inflector.titleize('borås (Abc)')
+    assert_equal 'Borås (Abc)', Geokit::Inflector.titleize('borås (abc)')
+  end
+   
+end