darrell-geokit 1.4.1.1 → 1.5.0.1

data/README.markdown

@@ -54,7 +54,7 @@ If you're using this gem by itself, here are the configuration options:
 		# This is the timeout value in seconds to be used for calls to the geocoder web
 		# services.  For no timeout at all, comment out the setting.  The timeout unit
 		# is in seconds. 
-		Geokit::Geocoders::timeout = 3
+		Geokit::Geocoders::request_timeout = 3
 		
 		# These settings are used if web service calls must be routed through a proxy.
 		# These setting can be nil if not needed, otherwise, addr and port must be 

data/lib/geokit.rb

@@ -1,5 +1,5 @@
 module Geokit
-  VERSION = '1.4.1'
+  VERSION = '1.5.0'
   # These defaults are used in Geokit::Mappable.distance_to and in acts_as_mappable
   @@default_units = :miles
   @@default_formula = :sphere

data/lib/geokit/geocoders.rb

@@ -1,10 +1,15 @@
 require 'net/http'
+require 'ipaddr'
 require 'rexml/document'
 require 'yaml'
 require 'timeout'
 require 'logger'
+require 'json'
 
 module Geokit
+
+  class TooManyQueriesError < StandardError; end
+
   module Inflector
    
     extend self
@@ -67,7 +72,7 @@ module Geokit
     @@proxy_port = nil
     @@proxy_user = nil
     @@proxy_pass = nil
-    @@timeout = nil    
+    @@request_timeout = nil    
     @@yahoo = 'REPLACE_WITH_YOUR_YAHOO_KEY'
     @@google = 'REPLACE_WITH_YOUR_GOOGLE_KEY'
     @@geocoder_us = false
@@ -133,7 +138,7 @@ module Geokit
       
       # Call the geocoder service using the timeout if configured.
       def self.call_geocoder_service(url)
-        timeout(Geokit::Geocoders::timeout) { return self.do_get(url) } if Geokit::Geocoders::timeout        
+        Timeout::timeout(Geokit::Geocoders::request_timeout) { return self.do_get(url) } if Geokit::Geocoders::request_timeout        
         return self.do_get(url)
       rescue TimeoutError
         return nil  
@@ -162,8 +167,7 @@ module Geokit
         res = Net::HTTP::Proxy(GeoKit::Geocoders::proxy_addr,
                 GeoKit::Geocoders::proxy_port,
                 GeoKit::Geocoders::proxy_user,
-                GeoKit::Geocoders::proxy_pass).start(uri.host, uri.port) { |http| http.request(req) }
-
+                GeoKit::Geocoders::proxy_pass).start(uri.host, uri.port) { |http| http.get(uri.path + "?" + uri.query) }
         return res
       end
       
@@ -463,14 +467,19 @@ module Geokit
             end  
           end
           return geoloc
-        else 
+        elsif doc.elements['//kml/Response/Status/code'].text == '620'
+           raise Geokit::TooManyQueriesError
+        else
           logger.info "Google was unable to geocode address: "+address
           return GeoLoc.new
         end
 
-        rescue
-          logger.error "Caught an error during Google geocoding call: "+$!
-          return GeoLoc.new
+      rescue Geokit::TooManyQueriesError
+        # re-raise because of other rescue
+        raise Geokit::TooManyQueriesError, "Google returned a 620 status, too many queries. The given key has gone over the requests limit in the 24 hour period or has submitted too many requests in too short a period of time. If you're sending multiple requests in parallel or in a tight loop, use a timer or pause in your code to make sure you don't send the requests too quickly."
+      rescue
+        logger.error "Caught an error during Google geocoding call: "+$!
+        return GeoLoc.new
       end  
 
       # extracts a single geoloc from a //placemark element in the google results xml
@@ -487,9 +496,12 @@ module Geokit
         #extended -- false if not not available
         res.city = doc.elements['.//LocalityName'].text if doc.elements['.//LocalityName']
         res.state = doc.elements['.//AdministrativeAreaName'].text if doc.elements['.//AdministrativeAreaName']
+        res.province = doc.elements['.//SubAdministrativeAreaName'].text if doc.elements['.//SubAdministrativeAreaName']
         res.full_address = doc.elements['.//address'].text if doc.elements['.//address'] # google provides it
         res.zip = doc.elements['.//PostalCodeNumber'].text if doc.elements['.//PostalCodeNumber']
         res.street_address = doc.elements['.//ThoroughfareName'].text if doc.elements['.//ThoroughfareName']
+        res.country = doc.elements['.//CountryName'].text if doc.elements['.//CountryName']
+        res.district = doc.elements['.//DependentLocalityName'].text if doc.elements['.//DependentLocalityName']
         # Translate accuracy into Yahoo-style token address, street, zip, zip+4, city, state, country
         # For Google, 1=low accuracy, 8=high accuracy
         address_details=doc.elements['.//*[local-name() = "AddressDetails"]']
@@ -504,12 +516,163 @@ module Geokit
         end
         
         res.success=true
-        
-        return res        
+
+        return res
       end
     end
 
+    class GoogleGeocoder3 < Geocoder
+
+      private 
+      # Template method which does the reverse-geocode lookup.
+      def self.do_reverse_geocode(latlng) 
+        latlng=LatLng.normalize(latlng)
+        res = self.call_geocoder_service("http://maps.google.com/maps/api/geocode/json?sensor=false&latlng=#{Geokit::Inflector::url_escape(latlng.ll)}")
+        return GeoLoc.new unless (res.is_a?(Net::HTTPSuccess) || res.is_a?(Net::HTTPOK))
+        json = res.body
+        logger.debug "Google reverse-geocoding. LL: #{latlng}. Result: #{json}"
+        return self.json2GeoLoc(json)        
+      end  
 
+      # Template method which does the geocode lookup.
+      #
+      # Supports viewport/country code biasing
+      #
+      # ==== OPTIONS
+      # * :bias - This option makes the Google Geocoder return results biased to a particular
+      #           country or viewport. Country code biasing is achieved by passing the ccTLD
+      #           ('uk' for .co.uk, for example) as a :bias value. For a list of ccTLD's, 
+      #           look here: http://en.wikipedia.org/wiki/CcTLD. By default, the geocoder
+      #           will be biased to results within the US (ccTLD .com).
+      #
+      #           If you'd like the Google Geocoder to prefer results within a given viewport,
+      #           you can pass a Geokit::Bounds object as the :bias value.
+      #
+      # ==== EXAMPLES
+      # # By default, the geocoder will return Syracuse, NY
+      # Geokit::Geocoders::GoogleGeocoder.geocode('Syracuse').country_code # => 'US'
+      # # With country code biasing, it returns Syracuse in Sicily, Italy
+      # Geokit::Geocoders::GoogleGeocoder.geocode('Syracuse', :bias => :it).country_code # => 'IT'
+      #
+      # # By default, the geocoder will return Winnetka, IL
+      # Geokit::Geocoders::GoogleGeocoder.geocode('Winnetka').state # => 'IL'
+      # # When biased to an bounding box around California, it will now return the Winnetka neighbourhood, CA
+      # bounds = Geokit::Bounds.normalize([34.074081, -118.694401], [34.321129, -118.399487])
+      # Geokit::Geocoders::GoogleGeocoder.geocode('Winnetka', :bias => bounds).state # => 'CA'
+      def self.do_geocode(address, options = {})
+        bias_str = options[:bias] ? construct_bias_string_from_options(options[:bias]) : ''
+        address_str = address.is_a?(GeoLoc) ? address.to_geocodeable_s : address
+        res = self.call_geocoder_service("http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(address_str)}#{bias_str}")
+        return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
+        json = res.body
+        logger.debug "Google geocoding. Address: #{address}. Result: #{json}"
+        return self.json2GeoLoc(json, address)        
+      end
+      
+      def self.construct_bias_string_from_options(bias)
+        if bias.is_a?(String) or bias.is_a?(Symbol)
+          # country code biasing
+          "&region=#{bias.to_s.downcase}"
+        elsif bias.is_a?(Bounds)
+          # viewport biasing
+          "&bounds=#{bias.nw.to_s}|#{bias.se.to_s}"
+        end
+      end
+      
+      def self.json2GeoLoc(json, address="")
+        ret=nil
+        results=JSON.parse(json, :symbolize_names => true)
+        
+        if results[:status] == 'OVER_QUERY_LIMIT'
+          raise Geokit::TooManyQueriesError
+        end
+        if results[:status] == 'ZERO_RESULTS'
+          return GeoLoc.new
+        end
+        # this should probably be smarter.
+        if !results[:status] == 'OK'
+          raise Geokit::Geocoders::GeocodeError
+        end
+        # location_type stores additional data about the specified location.
+        # The following values are currently supported:
+        # "ROOFTOP" indicates that the returned result is a precise geocode
+        # for which we have location information accurate down to street
+        # address precision.
+        # "RANGE_INTERPOLATED" indicates that the returned result reflects an
+        # approximation (usually on a road) interpolated between two precise
+        # points (such as intersections). Interpolated results are generally
+        # returned when rooftop geocodes are unavailable for a street address.
+        # "GEOMETRIC_CENTER" indicates that the returned result is the
+        # geometric center of a result such as a polyline (for example, a
+        # street) or polygon (region).
+        # "APPROXIMATE" indicates that the returned result is approximate
+
+        # these do not map well. Perhaps we should guess better based on size
+        # of bounding box where it exists? Does it really matter?
+        accuracy = {
+          "ROOFTOP" => 9,
+          "RANGE_INTERPOLATED" => 8,
+          "GEOMETRIC_CENTER" => 5,
+          "APPROXIMATE" => 4
+        }
+        results[:results].sort_by{|a|accuracy[a[:geometry][:location_type]]}.reverse.each do |addr|
+          res=GeoLoc.new
+          res.provider = 'google3'
+          res.success = true
+          res.full_address = addr[:formatted_address]
+          addr[:address_components].each do |comp|
+            case
+            when comp[:types].include?("street_number")
+              res.street_number = comp[:short_name]
+            when comp[:types].include?("route")
+              res.street_name = comp[:long_name]
+            when comp[:types].include?("locality")
+              res.city = comp[:long_name]
+            when comp[:types].include?("administrative_area_level_1")
+              res.state = comp[:short_name]
+              res.province = comp[:short_name]
+            when comp[:types].include?("postal_code")
+              res.zip = comp[:long_name]
+            when comp[:types].include?("country")
+              res.country_code = comp[:short_name]
+              res.country = comp[:long_name]
+            when comp[:types].include?("administrative_area_level_2")
+              res.district = comp[:long_name]
+            end
+          end
+          if res.street_name
+            res.street_address=[res.street_number,res.street_name].join(' ').strip
+          end
+          res.accuracy = accuracy[addr[:geometry][:location_type]]
+          res.precision=%w{unknown country state state city zip zip+4 street address building}[res.accuracy]
+          # try a few overrides where we can
+          if res.street_name && res.precision=='city'
+            res.precision = 'street'
+            res.accuracy = 7
+          end
+            
+          res.lat=addr[:geometry][:location][:lat].to_f
+          res.lng=addr[:geometry][:location][:lng].to_f
+
+          ne=Geokit::LatLng.new(
+            addr[:geometry][:viewport][:northeast][:lat].to_f, 
+            addr[:geometry][:viewport][:northeast][:lng].to_f
+            )
+          sw=Geokit::LatLng.new(
+            addr[:geometry][:viewport][:southwest][:lat].to_f,
+            addr[:geometry][:viewport][:southwest][:lng].to_f
+          )
+          res.suggested_bounds = Geokit::Bounds.new(sw,ne)
+
+          if ret
+            ret.all.push(res)
+          else
+            ret=res
+          end
+        end
+        return ret
+      end
+    end
     # -------------------------------------------------------------------------------------------
     # IP Geocoders
     # -------------------------------------------------------------------------------------------
@@ -546,14 +709,35 @@ module Geokit
     # as community contributions.
     class IpGeocoder < Geocoder 
 
+      # A number of non-routable IP ranges.
+      #
+      # --
+      # Sources for these:
+      #   RFC 3330: Special-Use IPv4 Addresses
+      #   The bogon list: http://www.cymru.com/Documents/bogon-list.html
+
+      NON_ROUTABLE_IP_RANGES = [
+	IPAddr.new('0.0.0.0/8'),      # "This" Network
+	IPAddr.new('10.0.0.0/8'),     # Private-Use Networks
+	IPAddr.new('14.0.0.0/8'),     # Public-Data Networks
+	IPAddr.new('127.0.0.0/8'),    # Loopback
+	IPAddr.new('169.254.0.0/16'), # Link local
+	IPAddr.new('172.16.0.0/12'),  # Private-Use Networks
+	IPAddr.new('192.0.2.0/24'),   # Test-Net
+	IPAddr.new('192.168.0.0/16'), # Private-Use Networks
+	IPAddr.new('198.18.0.0/15'),  # Network Interconnect Device Benchmark Testing
+	IPAddr.new('224.0.0.0/4'),    # Multicast
+	IPAddr.new('240.0.0.0/4')     # Reserved for future use
+      ].freeze
+
       private 
 
       # Given an IP address, returns a GeoLoc instance which contains latitude,
       # longitude, city, and country code.  Sets the success attribute to false if the ip 
       # parameter does not match an ip address.  
       def self.do_geocode(ip, options = {})
-        return GeoLoc.new if '0.0.0.0' == ip
         return GeoLoc.new unless /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?$/.match(ip)
+        return GeoLoc.new if self.private_ip_address?(ip)
         url = "http://api.hostip.info/get_html.php?ip=#{ip}&position=true"
         response = self.call_geocoder_service(url)
         response.is_a?(Net::HTTPSuccess) ? parse_body(response.body) : GeoLoc.new
@@ -582,6 +766,15 @@ module Geokit
         res.success = !(res.city =~ /\(.+\)/)
         res
       end
+
+      # Checks whether the IP address belongs to a private address range.
+      #
+      # This function is used to reduce the number of useless queries made to
+      # the geocoding service. Such queries can occur frequently during
+      # integration tests.
+      def self.private_ip_address?(ip)
+	return NON_ROUTABLE_IP_RANGES.any? { |range| range.include?(ip) }
+      end
     end
     
     # -------------------------------------------------------------------------------------------

data/lib/geokit/mappable.rb

@@ -336,19 +336,18 @@ module Geokit
   #
   #     puts geo.full_address     # just like usual
   #     puts geo.all.size  => 3   # there's three results total
-  #     puts geo.all.first        # all is just an array or additional geolocs, 
+  #     puts geo.all.first        # all is just an array or additional geolocs,
   #                                 so do what you want with it
   class GeoLoc < LatLng
 
     # Location attributes.  Full address is a concatenation of all values.  For example:
     # 100 Spear St, San Francisco, CA, 94101, US
-    attr_accessor :street_address, :city, :state, :zip, :country_code, :full_address, :all
+    # Street number and street name are extracted from the street address attribute if they don't exist
+    attr_accessor :street_number,:street_name,:street_address, :city, :state, :zip, :country_code, :country, :full_address, :all, :district, :province
     # 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, :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
@@ -358,10 +357,13 @@ module Geokit
       @all = [self]
       
       @street_address=h[:street_address] 
+      @street_number=nil
+      @street_name=nil
       @city=h[:city] 
       @state=h[:state] 
       @zip=h[:zip] 
-      @country_code=h[:country_code] 
+      @country_code=h[:country_code]
+      @province = h[:province]
       @success=false
       @precision='unknown'
       @full_address=nil
@@ -384,21 +386,22 @@ module Geokit
       @full_address ? @full_address : to_geocodeable_s
     end
 
-    # Extracts the street number from the street address if the street address
-    # has a value.
+    # Extracts the street number from the street address where possible.
     def street_number
-      street_address[/(\d*)/] if street_address
+      @street_number ||= street_address[/(\d*)/] if street_address
+      @street_number
     end
 
-    # Returns the street name portion of the street address.
+    # Returns the street name portion of the street address where possible
     def street_name
-       street_address[street_number.length, street_address.length].strip if street_address
+      @street_name||=street_address[street_number.length, street_address.length].strip if street_address
+      @street_name
     end
 
     # gives you all the important fields as key-value pairs
     def hash
       res={}
-      [:success,:lat,:lng,:country_code,:city,:state,:zip,:street_address,:provider,:full_address,:is_us?,:ll,:precision].each { |s| res[s] = self.send(s.to_s) }
+      [:success,:lat,:lng,:country_code,:city,:state,:zip,:street_address,:province,:district,:provider,:full_address,:is_us?,:ll,:precision].each { |s| res[s] = self.send(s.to_s) }
       res
     end
     alias to_hash hash
@@ -410,14 +413,17 @@ module Geokit
 
     # Sets the street address after capitalizing each word within the street address.
     def street_address=(address)
-      #@street_address = Geokit::Inflector::titleize(address) if address
-      @street_address = address if address
+      if address and not ['google','google3'].include?(self.provider)
+        @street_address = Geokit::Inflector::titleize(address) 
+      else
+        @street_address = address
+      end
     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
-      a=[street_address, city, state, zip, country_code].compact
+      a=[street_address, district, city, province, state, zip, country_code].compact
       a.delete_if { |e| !e || e == '' }
       a.join(', ')      
     end

data/test/test_base_geocoder.rb

@@ -36,7 +36,7 @@ class BaseGeocoderTest < Test::Unit::TestCase #:nodoc: all
   
   def test_timeout_call_web_service
     url = "http://www.anything.com"
-    Geokit::Geocoders::timeout = 1
+    Geokit::Geocoders::request_timeout = 1
     assert_nil Geokit::Geocoders::TestGeocoder.call_geocoder_service(url)    
   end
   

data/test/test_geoloc.rb

@@ -65,7 +65,7 @@ class GeoLocTest < Test::Unit::TestCase #:nodoc: all
     @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", 
+      "--- !ruby/object:Geokit::GeoLoc \ncity: San Francisco\ncountry_code: US\nfull_address: \nlat: \nlng: \nprecision: unknown\nprovince: \nstate: CA\nstreet_address: \nstreet_name: \nstreet_number: \nsuccess: false\nzip: \"94105\"\n", 
       @loc.to_yaml)
   end
   

data/test/test_geoplugin_geocoder.rb

@@ -33,8 +33,8 @@ class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
     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(-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

data/test/test_google_geocoder.rb

@@ -18,6 +18,8 @@ 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_REVERSE_MADRID="<?xml version='1.0' encoding='UTF-8' ?><kml xmlns='http://earth.google.com/kml/2.0'><Response><name>40.416741,-3.703250</name><Status><code>200</code><request>geocode</request></Status><Placemark id='p1'><address>Plaza de la Puerta del Sol, 28013, Madrid, Spain</address><AddressDetails Accuracy='6' xmlns='urn:oasis:names:tc:ciq:xsdschema:xAL:2.0'><Country><CountryNameCode>ES</CountryNameCode><CountryName>Spain</CountryName><AdministrativeArea><AdministrativeAreaName>Madrid</AdministrativeAreaName><SubAdministrativeArea><SubAdministrativeAreaName>Madrid</SubAdministrativeAreaName><Locality><LocalityName>Madrid</LocalityName><Thoroughfare><ThoroughfareName>Plaza de la Puerta del Sol</ThoroughfareName></Thoroughfare><PostalCode><PostalCodeNumber>28013</PostalCodeNumber></PostalCode></Locality></SubAdministrativeArea></AdministrativeArea></Country></AddressDetails><ExtendedData><LatLonBox north='40.4199522' south='40.4136570' east='-3.7001138' west='-3.7064091' /></ExtendedData><Point><coordinates>-3.7032537,40.4168023,0</coordinates></Point></Placemark><Placemark id='p2'><address>28013, Madrid, Spain</address><AddressDetails Accuracy='5' xmlns='urn:oasis:names:tc:ciq:xsdschema:xAL:2.0'><Country><CountryNameCode>ES</CountryNameCode><CountryName>Spain</CountryName><AdministrativeArea><AdministrativeAreaName>Madrid</AdministrativeAreaName><SubAdministrativeArea><SubAdministrativeAreaName>Madrid</SubAdministrativeAreaName><Locality><LocalityName>Madrid</LocalityName><PostalCode><PostalCodeNumber>28013</PostalCodeNumber></PostalCode></Locality></SubAdministrativeArea></AdministrativeArea></Country></AddressDetails><ExtendedData><LatLonBox north='40.4244113' south='40.4142840' east='-3.6969862' west='-3.7224820' /></ExtendedData><Point><coordinates>-3.7117806,40.4189645,0</coordinates></Point></Placemark><Placemark id='p3'><address>Madrid, Spain</address><AddressDetails Accuracy='4' xmlns='urn:oasis:names:tc:ciq:xsdschema:xAL:2.0'><Country><CountryNameCode>ES</CountryNameCode><CountryName>Spain</CountryName><AdministrativeArea><AdministrativeAreaName>Madrid</AdministrativeAreaName><SubAdministrativeArea><SubAdministrativeAreaName>Madrid</SubAdministrativeAreaName><Locality><LocalityName>Madrid</LocalityName></Locality></SubAdministrativeArea></AdministrativeArea></Country></AddressDetails><ExtendedData><LatLonBox north='40.6435181' south='40.3120713' east='-3.5180102' west='-3.8890049' /></ExtendedData><Point><coordinates>-3.7032498,40.4167413,0</coordinates></Point></Placemark><Placemark id='p4'><address>Madrid, Spain</address><AddressDetails Accuracy='2' xmlns='urn:oasis:names:tc:ciq:xsdschema:xAL:2.0'><Country><CountryNameCode>ES</CountryNameCode><CountryName>Spain</CountryName><AdministrativeArea><AdministrativeAreaName>Madrid</AdministrativeAreaName></AdministrativeArea></Country></AddressDetails><ExtendedData><LatLonBox north='41.1649106' south='39.8845366' east='-3.0531322' west='-4.5791745' /></ExtendedData><Point><coordinates>-3.5812692,40.4167088,0</coordinates></Point></Placemark><Placemark id='p5'><address>Madrid, Spain</address><AddressDetails Accuracy='3' xmlns='urn:oasis:names:tc:ciq:xsdschema:xAL:2.0'><Country><CountryNameCode>ES</CountryNameCode><CountryName>Spain</CountryName><AdministrativeArea><AdministrativeAreaName>Madrid</AdministrativeAreaName><SubAdministrativeArea><SubAdministrativeAreaName>Madrid</SubAdministrativeAreaName></SubAdministrativeArea></AdministrativeArea></Country></AddressDetails><ExtendedData><LatLonBox north='41.1649106' south='39.8845366' east='-3.0531322' west='-4.5791745' /></ExtendedData><Point><coordinates>-3.5812692,40.4167088,0</coordinates></Point></Placemark><Placemark id='p6'><address>Spain</address><AddressDetails Accuracy='1' xmlns='urn:oasis:names:tc:ciq:xsdschema:xAL:2.0'><Country><CountryNameCode>ES</CountryNameCode><CountryName>Spain</CountryName></Country></AddressDetails><ExtendedData><LatLonBox north='43.7903881' south='27.6377504' east='4.3279851' west='-18.1606948' /></ExtendedData><Point><coordinates>-3.7492200,40.4636670,0</coordinates></Point></Placemark></Response></kml>"
+   
   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
@@ -25,6 +27,10 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
   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
+
+  GOOGLE_TOO_MANY=<<-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>620</code><request>geocode</request></Status></Response></kml>
+  EOF
   
   def setup
     super
@@ -154,6 +160,34 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal "Via Sandro Pertini", res.street_address
     assert_equal "google", res.provider
   end
+
+  def test_reverse_geocode
+    #Geokit::Geocoders::GoogleGeocoder.do_reverse_geocode("40.4167413, -3.7032498")
+    madrid = Geokit::GeoLoc.new
+    madrid.lat, madrid.lng = "40.4167413", "-3.7032498"
+    response = MockSuccess.new
+    response.expects(:body).returns(GOOGLE_REVERSE_MADRID)
+    url = "http://maps.google.com/maps/geo?ll=#{Geokit::Inflector::url_escape(madrid.ll)}&output=xml&key=#{Geokit::Geocoders::google}&oe=utf-8"
+    Geokit::Geocoders::GoogleGeocoder.expects(:call_geocoder_service).with(url).
+      returns(response)
+    res=Geokit::Geocoders::GoogleGeocoder.do_reverse_geocode(madrid.ll)
+
+    assert_equal madrid.lat.to_s.slice(1..5), res.lat.to_s.slice(1..5)
+    assert_equal madrid.lng.to_s.slice(1..5), res.lng.to_s.slice(1..5)
+    assert_equal "ES", res.country_code
+    assert_equal "google", res.provider
+
+    assert_equal "Madrid", res.city
+    assert_equal "Madrid", res.state
+
+    assert_equal "Spain", res.country
+    assert_equal "zip+4", res.precision
+    assert_equal true, res.success
+
+    assert_equal "Plaza de la Puerta del Sol, 28013, Madrid, Spain", res.full_address
+    assert_equal "28013", res.zip
+    assert_equal "Plaza de la Puerta del Sol", res.street_address
+  end  
   
   def test_country_code_biasing
     response = MockSuccess.new
@@ -180,4 +214,14 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal 'US', biased_result.country_code
     assert_equal 'CA', biased_result.state
   end
+
+  def test_too_many_queries
+    response = MockSuccess.new
+    response.expects(:body).returns(GOOGLE_TOO_MANY)
+    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)
+    assert_raise Geokit::TooManyQueriesError do
+      res=Geokit::Geocoders::GoogleGeocoder.geocode(@address)
+    end
+  end
 end

data/test/test_google_geocoder3.rb

@@ -0,0 +1,536 @@
+require File.join(File.dirname(__FILE__), 'test_base_geocoder')
+
+Geokit::Geocoders::google = 'Google'
+
+class GoogleGeocoder3Test < BaseGeocoderTest #:nodoc: all
+  
+  GOOGLE3_FULL=%q/
+  {
+    "status": "OK",
+    "results": [ {
+      "types": [ "street_address" ],
+      "formatted_address": "100 Spear St, San Francisco, CA 94105, USA",
+      "address_components": [ {
+        "long_name": "100",
+        "short_name": "100",
+        "types": [ "street_number" ]
+      }, {
+        "long_name": "Spear St",
+        "short_name": "Spear St",
+        "types": [ "route" ]
+      }, {
+        "long_name": "San Francisco",
+        "short_name": "San Francisco",
+        "types": [ "locality", "political" ]
+      }, {
+        "long_name": "San Francisco",
+        "short_name": "San Francisco",
+        "types": [ "administrative_area_level_3", "political" ]
+      }, {
+        "long_name": "San Francisco",
+        "short_name": "San Francisco",
+        "types": [ "administrative_area_level_2", "political" ]
+      }, {
+        "long_name": "California",
+        "short_name": "CA",
+        "types": [ "administrative_area_level_1", "political" ]
+      }, {
+        "long_name": "United States",
+        "short_name": "US",
+        "types": [ "country", "political" ]
+      }, {
+        "long_name": "94105",
+        "short_name": "94105",
+        "types": [ "postal_code" ]
+      } ],
+      "geometry": {
+        "location": {
+          "lat": 37.7921509,
+          "lng": -122.3940000
+        },
+        "location_type": "ROOFTOP",
+        "viewport": {
+          "southwest": {
+            "lat": 37.7890033,
+            "lng": -122.3971476
+          },
+          "northeast": {
+            "lat": 37.7952985,
+            "lng": -122.3908524
+          }
+        }
+      }
+    } ]
+  }
+  /.strip
+
+  GOOGLE3_CITY=%q/
+  {
+    "status": "OK",
+    "results": [ {
+      "types": [ "locality", "political" ],
+      "formatted_address": "San Francisco, CA, USA",
+      "address_components": [ {
+        "long_name": "San Francisco",
+        "short_name": "San Francisco",
+        "types": [ "locality", "political" ]
+      }, {
+        "long_name": "San Francisco",
+        "short_name": "San Francisco",
+        "types": [ "administrative_area_level_2", "political" ]
+      }, {
+        "long_name": "California",
+        "short_name": "CA",
+        "types": [ "administrative_area_level_1", "political" ]
+      }, {
+        "long_name": "United States",
+        "short_name": "US",
+        "types": [ "country", "political" ]
+      } ],
+      "geometry": {
+        "location": {
+          "lat": 37.7749295,
+          "lng": -122.4194155
+        },
+        "location_type": "APPROXIMATE",
+        "viewport": {
+          "southwest": {
+            "lat": 37.7043396,
+            "lng": -122.5474749
+          },
+          "northeast": {
+            "lat": 37.8454521,
+            "lng": -122.2913561
+          }
+        },
+        "bounds": {
+          "southwest": {
+            "lat": 37.7034000,
+            "lng": -122.5270000
+          },
+          "northeast": {
+            "lat": 37.8120000,
+            "lng": -122.3482000
+          }
+        }
+      }
+    } ]
+  }
+  /.strip
+  GOOGLE3_MULTI=%q/
+    {
+      "status": "OK",
+      "results": [ {
+        "types": [ "street_address" ],
+        "formatted_address": "Via Sandro Pertini, 8, 20010 Mesero MI, Italy",
+        "address_components": [ {
+          "long_name": "8",
+          "short_name": "8",
+          "types": [ "street_number" ]
+        }, {
+          "long_name": "Via Sandro Pertini",
+          "short_name": "Via Sandro Pertini",
+          "types": [ "route" ]
+        }, {
+          "long_name": "Mesero",
+          "short_name": "Mesero",
+          "types": [ "locality", "political" ]
+        }, {
+          "long_name": "Milan",
+          "short_name": "MI",
+          "types": [ "administrative_area_level_2", "political" ]
+        }, {
+          "long_name": "Lombardy",
+          "short_name": "Lombardy",
+          "types": [ "administrative_area_level_1", "political" ]
+        }, {
+          "long_name": "Italy",
+          "short_name": "IT",
+          "types": [ "country", "political" ]
+        }, {
+          "long_name": "20010",
+          "short_name": "20010",
+          "types": [ "postal_code" ]
+        } ],
+        "geometry": {
+          "location": {
+            "lat": 45.4966218,
+            "lng": 8.8526940
+          },
+          "location_type": "RANGE_INTERPOLATED",
+          "viewport": {
+            "southwest": {
+              "lat": 45.4934754,
+              "lng": 8.8495559
+            },
+            "northeast": {
+              "lat": 45.4997707,
+              "lng": 8.8558512
+            }
+          },
+          "bounds": {
+            "southwest": {
+              "lat": 45.4966218,
+              "lng": 8.8526940
+            },
+            "northeast": {
+              "lat": 45.4966243,
+              "lng": 8.8527131
+            }
+          }
+        },
+        "partial_match": true
+      },
+      {
+         "types": [ "route" ],
+         "formatted_address": "Via Sandro Pertini, 20010 Ossona MI, Italy",
+         "address_components": [ {
+           "long_name": "Via Sandro Pertini",
+           "short_name": "Via Sandro Pertini",
+           "types": [ "route" ]
+         }, {
+           "long_name": "Ossona",
+           "short_name": "Ossona",
+           "types": [ "locality", "political" ]
+         }, {
+           "long_name": "Milan",
+           "short_name": "MI",
+           "types": [ "administrative_area_level_2", "political" ]
+         }, {
+           "long_name": "Lombardy",
+           "short_name": "Lombardy",
+           "types": [ "administrative_area_level_1", "political" ]
+         }, {
+           "long_name": "Italy",
+           "short_name": "IT",
+           "types": [ "country", "political" ]
+         }, {
+           "long_name": "20010",
+           "short_name": "20010",
+           "types": [ "postal_code" ]
+         } ],
+         "geometry": {
+           "location": {
+             "lat": 45.5074444,
+             "lng": 8.9023200
+           },
+           "location_type": "GEOMETRIC_CENTER",
+           "viewport": {
+             "southwest": {
+               "lat": 45.5043320,
+               "lng": 8.8990670
+             },
+             "northeast": {
+               "lat": 45.5106273,
+               "lng": 8.9053622
+             }
+           },
+           "bounds": {
+             "southwest": {
+               "lat": 45.5064427,
+               "lng": 8.9020024
+             },
+             "northeast": {
+               "lat": 45.5085166,
+               "lng": 8.9024268
+             }
+           }
+         }
+       }
+      ]
+    }
+  /.strip
+  GOOGLE3_REVERSE_MADRID=%q/
+  {
+    "status": "OK",
+    "results": [ {
+      "types": [ ],
+      "formatted_address": "Calle de las Carretas, 28013 Madrid, Spain",
+      "address_components": [ {
+        "long_name": "Calle de las Carretas",
+        "short_name": "Calle de las Carretas",
+        "types": [ "route" ]
+      }, {
+        "long_name": "Madrid",
+        "short_name": "Madrid",
+        "types": [ "locality", "political" ]
+      }, {
+        "long_name": "Madrid",
+        "short_name": "M",
+        "types": [ "administrative_area_level_2", "political" ]
+      }, {
+        "long_name": "Madrid",
+        "short_name": "Madrid",
+        "types": [ "administrative_area_level_1", "political" ]
+      }, {
+        "long_name": "Spain",
+        "short_name": "ES",
+        "types": [ "country", "political" ]
+      }, {
+        "long_name": "28013",
+        "short_name": "28013",
+        "types": [ "postal_code" ]
+      } ],
+      "geometry": {
+        "location": {
+          "lat": 40.4166824,
+          "lng": -3.7033411
+        },
+        "location_type": "APPROXIMATE",
+        "viewport": {
+          "southwest": {
+            "lat": 40.4135351,
+            "lng": -3.7064880
+          },
+          "northeast": {
+            "lat": 40.4198303,
+            "lng": -3.7001927
+          }
+        },
+        "bounds": {
+          "southwest": {
+            "lat": 40.4166419,
+            "lng": -3.7033685
+          },
+          "northeast": {
+            "lat": 40.4167235,
+            "lng": -3.7033122
+          }
+        }
+      }
+    } ]
+  }
+  /
+  GOOGLE3_COUNTRY_CODE_BIASED_RESULT=%q/
+  {
+    "status": "OK",
+    "results": [ {
+      "types": [ "administrative_area_level_2", "political" ],
+      "formatted_address": "Syracuse, Italy",
+      "address_components": [ {
+        "long_name": "Syracuse",
+        "short_name": "SR",
+        "types": [ "administrative_area_level_2", "political" ]
+      }, {
+        "long_name": "Sicily",
+        "short_name": "Sicily",
+        "types": [ "administrative_area_level_1", "political" ]
+      }, {
+        "long_name": "Italy",
+        "short_name": "IT",
+        "types": [ "country", "political" ]
+      } ],
+      "geometry": {
+        "location": {
+          "lat": 37.0630218,
+          "lng": 14.9856176
+        },
+        "location_type": "APPROXIMATE",
+        "viewport": {
+          "southwest": {
+            "lat": 36.7775664,
+            "lng": 14.4733800
+          },
+          "northeast": {
+            "lat": 37.3474070,
+            "lng": 15.4978552
+          }
+        },
+        "bounds": {
+          "southwest": {
+            "lat": 36.6441736,
+            "lng": 14.7724913
+          },
+          "northeast": {
+            "lat": 37.4125978,
+            "lng": 15.3367367
+          }
+        }
+      }
+    } ]
+  }
+  /
+  GOOGLE3_TOO_MANY=%q/
+    {
+       "status": "OVER_QUERY_LIMIT"
+    }
+  /
+  def setup
+    super
+    @google_full_hash = {:street_address=>"100 Spear St", :city=>"San Francisco", :state=>"CA", :zip=>"94105", :country_code=>"US"}
+    @google_city_hash = {:city=>"San Francisco", :state=>"CA"}
+
+    @google_full_loc = Geokit::GeoLoc.new(@google_full_hash)
+    @google_city_loc = Geokit::GeoLoc.new(@google_city_hash)
+  end  
+
+  def test_google3_full_address
+    response = MockSuccess.new
+    response.expects(:body).returns(GOOGLE3_FULL)
+    url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@address)}"
+    Geokit::Geocoders::GoogleGeocoder3.expects(:call_geocoder_service).with(url).returns(response)
+    res=Geokit::Geocoders::GoogleGeocoder3.geocode(@address)
+    assert_equal "CA", res.state
+    assert_equal "San Francisco", res.city 
+    assert_equal "37.7921509,-122.394", res.ll # slightly dif from yahoo
+    assert res.is_us?
+    assert_equal "100 Spear St, San Francisco, CA 94105, USA", res.full_address #slightly different from yahoo
+    assert_equal "google3", res.provider
+  end
+  
+  def test_google3_full_address_with_geo_loc
+     response = MockSuccess.new
+     response.expects(:body).returns(GOOGLE3_FULL)
+     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@full_address_short_zip)}"
+     Geokit::Geocoders::GoogleGeocoder3.expects(:call_geocoder_service).with(url).returns(response)
+     res=Geokit::Geocoders::GoogleGeocoder3.geocode(@google_full_loc)
+     assert_equal "CA", res.state
+     assert_equal "San Francisco", res.city 
+     assert_equal "37.7921509,-122.394", res.ll # slightly dif from yahoo
+     assert res.is_us?
+     assert_equal "100 Spear St, San Francisco, CA 94105, USA", res.full_address #slightly different from yahoo
+     assert_equal "google3", res.provider
+   end  
+   
+   def test_google3_full_address_accuracy
+     response = MockSuccess.new
+     response.expects(:body).returns(GOOGLE3_FULL)
+     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@full_address_short_zip)}"
+     Geokit::Geocoders::GoogleGeocoder3.expects(:call_geocoder_service).with(url).returns(response)
+     res=Geokit::Geocoders::GoogleGeocoder3.geocode(@google_full_loc)
+     assert_equal 9, res.accuracy
+   end
+  
+   def test_google3_city
+     response = MockSuccess.new
+     response.expects(:body).returns(GOOGLE3_CITY)
+     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@address)}"
+     Geokit::Geocoders::GoogleGeocoder3.expects(:call_geocoder_service).with(url).returns(response)
+     res=Geokit::Geocoders::GoogleGeocoder3.do_geocode(@address)
+     assert_nil res.street_address
+     assert_equal "CA", res.state
+     assert_equal "San Francisco", res.city
+     assert_equal "37.7749295,-122.4194155", res.ll
+     assert res.is_us?
+     assert_equal "San Francisco, CA, USA", res.full_address
+     assert_equal "google3", res.provider
+   end  
+   
+   def test_google3_city_accuracy
+     response = MockSuccess.new
+     response.expects(:body).returns(GOOGLE3_CITY)
+     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@address)}"
+     Geokit::Geocoders::GoogleGeocoder3.expects(:call_geocoder_service).with(url).returns(response)
+     res=Geokit::Geocoders::GoogleGeocoder3.geocode(@address)
+     assert_equal 4, res.accuracy
+   end
+   
+   def test_google3_city_with_geo_loc
+     response = MockSuccess.new
+     response.expects(:body).returns(GOOGLE3_CITY)
+     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@address)}"
+     Geokit::Geocoders::GoogleGeocoder3.expects(:call_geocoder_service).with(url).returns(response)
+     res=Geokit::Geocoders::GoogleGeocoder3.geocode(@google_city_loc)
+     assert_equal "CA", res.state
+     assert_equal "San Francisco", res.city
+     assert_equal "37.7749295,-122.4194155", res.ll
+     assert res.is_us?
+     assert_equal "San Francisco, CA, USA", res.full_address
+     assert_nil res.street_address
+     assert_equal "google3", res.provider
+   end  
+
+   def test_google3_suggested_bounds
+     response = MockSuccess.new
+     response.expects(:body).returns(GOOGLE3_FULL)
+     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@full_address_short_zip)}"
+     Geokit::Geocoders::GoogleGeocoder3.expects(:call_geocoder_service).with(url).returns(response)
+     res = Geokit::Geocoders::GoogleGeocoder3.geocode(@google_full_loc)
+     
+     assert_instance_of Geokit::Bounds, res.suggested_bounds
+     assert_equal Geokit::Bounds.new(Geokit::LatLng.new(37.7890033, -122.3971476), Geokit::LatLng.new(37.7952985, -122.3908524)), res.suggested_bounds
+   end
+   
+   def test_service_unavailable
+     response = MockFailure.new
+     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@address)}"
+     Geokit::Geocoders::GoogleGeocoder3.expects(:call_geocoder_service).with(url).returns(response)
+     assert !Geokit::Geocoders::GoogleGeocoder3.geocode(@google_city_loc).success
+   end 
+   
+   def test_multiple_results
+     #Geokit::Geocoders::GoogleGeocoder3.do_geocode('via Sandro Pertini 8, Ossona, MI')
+     response = MockSuccess.new
+     response.expects(:body).returns(GOOGLE3_MULTI)
+     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector.url_escape('via Sandro Pertini 8, Ossona, MI')}"
+     Geokit::Geocoders::GoogleGeocoder3.expects(:call_geocoder_service).with(url).returns(response)
+     res=Geokit::Geocoders::GoogleGeocoder3.geocode('via Sandro Pertini 8, Ossona, MI')
+     assert_equal "Lombardy", res.state
+     assert_equal "Mesero", res.city
+     assert_equal "45.4966218,8.852694", res.ll
+     assert !res.is_us?
+     assert_equal "Via Sandro Pertini, 8, 20010 Mesero MI, Italy", res.full_address
+     assert_equal "8 Via Sandro Pertini", res.street_address
+     assert_equal "google3", res.provider
+  
+     assert_equal 2, res.all.size
+     res = res.all[1]
+     assert_equal "Lombardy", res.state
+     assert_equal "Ossona", res.city
+     assert_equal "45.5074444,8.90232", res.ll
+     assert !res.is_us?
+     assert_equal "Via Sandro Pertini, 20010 Ossona MI, Italy", res.full_address
+     assert_equal "Via Sandro Pertini", res.street_address
+     assert_equal "google3", res.provider
+   end
+  # 
+   def test_reverse_geocode
+     #Geokit::Geocoders::GoogleGeocoder3.do_reverse_geocode("40.4167413, -3.7032498")
+     madrid = Geokit::GeoLoc.new
+     madrid.lat, madrid.lng = "40.4167413", "-3.7032498"
+     response = MockSuccess.new
+     response.expects(:body).returns(GOOGLE3_REVERSE_MADRID)
+     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&latlng=#{Geokit::Inflector::url_escape(madrid.ll)}"
+     Geokit::Geocoders::GoogleGeocoder3.expects(:call_geocoder_service).with(url).
+       returns(response)
+     res=Geokit::Geocoders::GoogleGeocoder3.do_reverse_geocode(madrid.ll)
+  
+     assert_equal madrid.lat.to_s.slice(1..5), res.lat.to_s.slice(1..5)
+     assert_equal madrid.lng.to_s.slice(1..5), res.lng.to_s.slice(1..5)
+     assert_equal "ES", res.country_code
+     assert_equal "google3", res.provider
+  
+     assert_equal "Madrid", res.city
+     assert_equal "Madrid", res.state
+  
+     assert_equal "Spain", res.country
+     assert_equal "street", res.precision
+     assert_equal true, res.success
+  
+     assert_equal "Calle de las Carretas, 28013 Madrid, Spain", res.full_address
+     assert_equal "28013", res.zip
+     assert_equal "Calle de las Carretas", res.street_address
+   end  
+
+   def test_country_code_biasing
+     response = MockSuccess.new
+     response.expects(:body).returns(GOOGLE3_COUNTRY_CODE_BIASED_RESULT)
+     
+     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=Syracuse&region=it"
+     Geokit::Geocoders::GoogleGeocoder3.expects(:call_geocoder_service).with(url).returns(response)
+     biased_result = Geokit::Geocoders::GoogleGeocoder3.geocode('Syracuse', :bias => 'it')
+     
+     assert_equal 'IT', biased_result.country_code
+     assert_equal 'Sicily', biased_result.state
+   end
+  
+   def test_too_many_queries
+     response = MockSuccess.new
+     response.expects(:body).returns(GOOGLE3_TOO_MANY)
+     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector.url_escape(@address)}"
+     Geokit::Geocoders::GoogleGeocoder3.expects(:call_geocoder_service).with(url).returns(response)
+     assert_raise Geokit::TooManyQueriesError do
+       res=Geokit::Geocoders::GoogleGeocoder3.geocode(@address)
+     end
+   end
+end

data/test/test_ipgeocoder.rb

@@ -4,8 +4,8 @@ require File.join(File.dirname(__FILE__), 'test_base_geocoder')
 class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
     
   IP_FAILURE=<<-EOF
-    Country: (Private Address) (XX)
-    City: (Private Address)
+    Country: SWITZERLAND (CH)
+    City: (Unknown City)
     Latitude: 
     Longitude:
     EOF
@@ -24,10 +24,22 @@ class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
     Longitude: 12.9167
     EOF
     
-    def setup
-      super
-      @success.provider = "hostip"
-    end    
+  PRIVATE_IPS_TO_TEST = [
+    '10.10.10.10',
+    '172.16.1.3',
+    '172.22.3.42',
+    '172.30.254.164',
+    '192.168.1.1',
+    '0.0.0.0',
+    '127.0.0.1',
+    '240.3.4.5',
+    '225.1.6.55'
+  ].freeze
+
+  def setup
+    super
+    @success.provider = "hostip"
+  end    
   
   def test_successful_lookup
     success = MockSuccess.new
@@ -64,14 +76,24 @@ class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_failed_lookup
     failure = MockSuccess.new
     failure.expects(:body).returns(IP_FAILURE)
-    url = 'http://api.hostip.info/get_html.php?ip=10.10.10.10&position=true'
+    url = 'http://api.hostip.info/get_html.php?ip=128.178.0.0&position=true'
     GeoKit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(failure)
-    location = GeoKit::Geocoders::IpGeocoder.geocode("10.10.10.10")
+    location = GeoKit::Geocoders::IpGeocoder.geocode("128.178.0.0")
     assert_not_nil location
     assert !location.success?
   end
   
+  def test_private_ips
+    GeoKit::Geocoders::IpGeocoder.expects(:call_geocoder_service).never
+    PRIVATE_IPS_TO_TEST.each do |ip|
+      location = GeoKit::Geocoders::IpGeocoder.geocode(ip)
+      assert_not_nil location
+      assert !location.success?
+    end
+  end
+  
   def test_invalid_ip
+    GeoKit::Geocoders::IpGeocoder.expects(:call_geocoder_service).never
     location = GeoKit::Geocoders::IpGeocoder.geocode("blah")
     assert_not_nil location
     assert !location.success?
@@ -79,9 +101,9 @@ class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
   
   def test_service_unavailable
     failure = MockFailure.new
-    url = 'http://api.hostip.info/get_html.php?ip=10.10.10.10&position=true'
+    url = 'http://api.hostip.info/get_html.php?ip=12.215.42.19&position=true'
     GeoKit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(failure)
-    location = GeoKit::Geocoders::IpGeocoder.geocode("10.10.10.10")
+    location = GeoKit::Geocoders::IpGeocoder.geocode("12.215.42.19")
     assert_not_nil location
     assert !location.success?
   end  

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: darrell-geokit
 version: !ruby/object:Gem::Version 
-  version: 1.4.1.1
+  prerelease: false
+  segments: 
+  - 1
+  - 5
+  - 0
+  - 1
+  version: 1.5.0.1
 platform: ruby
 authors: 
 - Andre Lewis and Bill Eisenhauer
@@ -9,10 +15,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-15 00:00:00 -07:00
+date: 2009-08-02 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: json_pure
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: Geokit Gem
 email: 
 - andre@earthcode.com / bill_eisenhauer@yahoo.com
@@ -34,6 +51,7 @@ files:
 - test/test_bounds.rb
 - test/test_ca_geocoder.rb
 - test/test_geoloc.rb
+- test/test_google_geocoder3.rb
 - test/test_google_geocoder.rb
 - test/test_latlng.rb
 - test/test_multi_geocoder.rb
@@ -41,7 +59,8 @@ files:
 - test/test_yahoo_geocoder.rb
 has_rdoc: true
 homepage: http://geokit.rubyforge.org
-licenses: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -52,18 +71,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: geokit
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: none
@@ -73,6 +94,7 @@ test_files:
 - test/test_ca_geocoder.rb
 - test/test_geoloc.rb
 - test/test_geoplugin_geocoder.rb
+- test/test_google_geocoder3.rb
 - test/test_google_geocoder.rb
 - test/test_google_reverse_geocoder.rb
 - test/test_inflector.rb