rjaswal-geokit 1.5.0.2 → 1.5.1

data/README.markdown

@@ -3,7 +3,7 @@
 The Geokit gem provides:
 
  * Distance calculations between two points on the earth. Calculate the distance in miles, kilometers, or nautical miles, with all the trigonometry abstracted away by GeoKit.
- * Geocoding from multiple providers. It supports Google, Yahoo, Geocoder.us, and Geocoder.ca geocoders, and others. It provides a uniform response structure from all of them. 
+ * Geocoding from multiple providers. It supports Google (API v2), Google (API v3), Bing, Yahoo, Geocoder.us, and Geocoder.ca geocoders, and others. It provides a uniform response structure from all of them. 
    It also provides a fail-over mechanism, in case your input fails to geocode in one service.
  * Rectangular bounds calculations: is a point within a given rectangular bounds?
  * Heading and midpoint calculations
@@ -16,7 +16,9 @@ Combine this gem with the [geokit-rails plugin](http://github.com/andre/geokit-r
 
 ## INSTALL
 
-    sudo gem install geokit
+    sudo gem install rjaswal-geokit
+    or for latest use
+    ./script/plugin install git://github.com/rjaswal/geokit-gem.git
 
 ## QUICK START
 
@@ -54,7 +56,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/mappable.rb

@@ -1,5 +1,3 @@
-#require 'forwardable'
-
 module Geokit     
   # Contains class and instance methods providing distance calcuation services.  This
   # module is meant to be mixed into classes containing lat and lng attributes where
@@ -22,12 +20,12 @@ module Geokit
     KMS_PER_LATITUDE_DEGREE = MILES_PER_LATITUDE_DEGREE * KMS_PER_MILE
     NMS_PER_LATITUDE_DEGREE = MILES_PER_LATITUDE_DEGREE * NMS_PER_MILE
     LATITUDE_DEGREES = EARTH_RADIUS_IN_MILES / MILES_PER_LATITUDE_DEGREE  
-    
+
     # Mix below class methods into the includer.
     def self.included(receiver) # :nodoc:
       receiver.extend ClassMethods
     end   
-    
+
     module ClassMethods #:nodoc:
       # Returns the distance between two points.  The from and to parameters are
       # required to have lat and lng attributes.  Valid options are:
@@ -43,15 +41,15 @@ module Geokit
         when :sphere
           begin
             units_sphere_multiplier(units) * 
-                Math.acos( Math.sin(deg2rad(from.lat)) * Math.sin(deg2rad(to.lat)) + 
-                Math.cos(deg2rad(from.lat)) * Math.cos(deg2rad(to.lat)) * 
-                Math.cos(deg2rad(to.lng) - deg2rad(from.lng)))
+              Math.acos( Math.sin(deg2rad(from.lat)) * Math.sin(deg2rad(to.lat)) + 
+                        Math.cos(deg2rad(from.lat)) * Math.cos(deg2rad(to.lat)) * 
+                        Math.cos(deg2rad(to.lng) - deg2rad(from.lng)))
           rescue Errno::EDOM
             0.0
           end
         when :flat
           Math.sqrt((units_per_latitude_degree(units)*(from.lat-to.lat))**2 + 
-              (units_per_longitude_degree(from.lat, units)*(from.lng-to.lng))**2)
+                    (units_per_longitude_degree(from.lat, units)*(from.lng-to.lng))**2)
         end
       end
 
@@ -69,23 +67,23 @@ module Geokit
         x=Math.cos(from_lat)*Math.sin(to_lat)-Math.sin(from_lat)*Math.cos(to_lat)*Math.cos(d_lng)
         heading=to_heading(Math.atan2(y,x))
       end
-  
+
       # Given a start point, distance, and heading (in degrees), provides
       # an endpoint. Returns a LatLng instance. Typically, the instance method
       # will be used instead of this method.
       def endpoint(start,heading, distance, options={})
         units = options[:units] || Geokit::default_units
         radius = case units
-          when :kms; EARTH_RADIUS_IN_KMS
-          when :nms; EARTH_RADIUS_IN_NMS
-          else EARTH_RADIUS_IN_MILES
-        end
+                 when :kms; EARTH_RADIUS_IN_KMS
+                 when :nms; EARTH_RADIUS_IN_NMS
+                 else EARTH_RADIUS_IN_MILES
+                 end
         start=Geokit::LatLng.normalize(start)        
         lat=deg2rad(start.lat)
         lng=deg2rad(start.lng)
         heading=deg2rad(heading)
         distance=distance.to_f
-        
+
         end_lat=Math.asin(Math.sin(lat)*Math.cos(distance/radius) +
                           Math.cos(lat)*Math.sin(distance/radius)*Math.cos(heading))
 
@@ -103,29 +101,29 @@ module Geokit
         from=Geokit::LatLng.normalize(from)
 
         units = options[:units] || Geokit::default_units
-        
+
         heading=from.heading_to(to)
         distance=from.distance_to(to,options)
         midpoint=from.endpoint(heading,distance/2,options)
       end
-  
+
       # Geocodes a location using the multi geocoder.
       def geocode(location, options = {})
         res = Geocoders::MultiGeocoder.geocode(location, options)
         return res if res.success?
         raise Geokit::Geocoders::GeocodeError      
       end
-    
+
       protected
-    
+
       def deg2rad(degrees)
         degrees.to_f / 180.0 * Math::PI
       end
-      
+
       def rad2deg(rad)
         rad.to_f * 180.0 / Math::PI 
       end
-      
+
       def to_heading(rad)
         (rad2deg(rad)+360)%360
       end
@@ -133,36 +131,36 @@ module Geokit
       # Returns the multiplier used to obtain the correct distance units.
       def units_sphere_multiplier(units)
         case units
-          when :kms; EARTH_RADIUS_IN_KMS
-          when :nms; EARTH_RADIUS_IN_NMS
-          else EARTH_RADIUS_IN_MILES
+        when :kms; EARTH_RADIUS_IN_KMS
+        when :nms; EARTH_RADIUS_IN_NMS
+        else EARTH_RADIUS_IN_MILES
         end
       end
 
       # Returns the number of units per latitude degree.
       def units_per_latitude_degree(units)
         case units
-          when :kms; KMS_PER_LATITUDE_DEGREE
-          when :nms; NMS_PER_LATITUDE_DEGREE
-          else MILES_PER_LATITUDE_DEGREE
+        when :kms; KMS_PER_LATITUDE_DEGREE
+        when :nms; NMS_PER_LATITUDE_DEGREE
+        else MILES_PER_LATITUDE_DEGREE
         end
       end
-    
+
       # Returns the number units per longitude degree.
       def units_per_longitude_degree(lat, units)
         miles_per_longitude_degree = (LATITUDE_DEGREES * Math.cos(lat * PI_DIV_RAD)).abs
         case units
-          when :kms; miles_per_longitude_degree * KMS_PER_MILE
-          when :nms; miles_per_longitude_degree * NMS_PER_MILE
-          else miles_per_longitude_degree
+        when :kms; miles_per_longitude_degree * KMS_PER_MILE
+        when :nms; miles_per_longitude_degree * NMS_PER_MILE
+        else miles_per_longitude_degree
         end
       end  
     end
-  
+
     # -----------------------------------------------------------------------------------------------
     # Instance methods below here
     # -----------------------------------------------------------------------------------------------
-  
+
     # Extracts a LatLng instance. Use with models that are acts_as_mappable
     def to_lat_lng
       return self if instance_of?(Geokit::LatLng) || instance_of?(Geokit::GeoLoc)
@@ -190,7 +188,7 @@ module Geokit
     def heading_from(other)
       self.class.heading_between(other,self)
     end
- 
+
     # Returns the endpoint, given a heading (in degrees) and distance.  
     # Valid option:
     # :units - valid values are :miles, :kms, or :nms (:miles is the default)
@@ -204,7 +202,7 @@ module Geokit
     def midpoint_to(other, options={})
       self.class.midpoint_between(self,other,options)
     end
-    
+
   end
 
   class LatLng 
@@ -235,12 +233,12 @@ module Geokit
     def ll
       "#{lat},#{lng}"
     end
-    
+
     #returns a string with comma-separated lat,lng values
     def to_s
       ll
     end
-  
+
     #returns a two-element array
     def to_a
       [lat,lng]
@@ -250,15 +248,15 @@ module Geokit
     def ==(other)
       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:
@@ -271,7 +269,7 @@ module Geokit
     def self.normalize(thing,other=nil)
       # if an 'other' thing is supplied, normalize the input by creating an array of two elements
       thing=[thing,other] if other
-      
+
       if thing.is_a?(String)
         thing.strip!
         if match=thing.match(/(\-?\d+\.?\d*)[, ] ?(\-?\d+\.?\d*)$/)
@@ -288,10 +286,10 @@ module Geokit
       elsif thing.class.respond_to?(:acts_as_mappable) && thing.class.respond_to?(:distance_column_name)
         return thing.to_lat_lng
       end
-      
+
       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
     # 
@@ -313,7 +311,7 @@ module Geokit
       else
         raise ArgumentError.new("#{options[:using]} is not a valid geocoder.")
       end
-      
+
       provider.send(:reverse_geocode, self)
     end
   end
@@ -355,7 +353,7 @@ module Geokit
     # Constructor expects a hash of symbols to correspond with attributes.
     def initialize(h={})
       @all = [self]
-      
+
       @street_address=h[:street_address] 
       @street_number=nil
       @street_name=nil
@@ -374,7 +372,7 @@ module Geokit
     def is_us?
       country_code == 'US'
     end
-    
+
     def success?
       success == true
     end
@@ -419,7 +417,7 @@ module Geokit
         @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
@@ -427,7 +425,7 @@ module Geokit
       a.delete_if { |e| !e || e == '' }
       a.join(', ')      
     end
-    
+
     def to_yaml_properties
       (instance_variables - ['@all']).sort
     end
@@ -437,33 +435,33 @@ module Geokit
       "Provider: #{provider}\nStreet: #{street_address}\nCity: #{city}\nState: #{state}\nZip: #{zip}\nLatitude: #{lat}\nLongitude: #{lng}\nCountry: #{country_code}\nSuccess: #{success}"
     end
   end
-  
+
   # Bounds represents a rectangular bounds, defined by the SW and NE corners
   class Bounds
     # sw and ne are LatLng objects
     attr_accessor :sw, :ne
-    
+
     # provide sw and ne to instantiate a new Bounds instance
     def initialize(sw,ne)
       raise ArgumentError if !(sw.is_a?(Geokit::LatLng) && ne.is_a?(Geokit::LatLng))
       @sw,@ne=sw,ne
     end
-    
+
     #returns the a single point which is the center of the rectangular bounds
     def center
       @sw.midpoint_to(@ne)
     end
-  
+
     # a simple string representation:sw,ne
     def to_s
       "#{@sw.to_s},#{@ne.to_s}"   
     end
-    
+
     # a two-element array of two-element arrays: sw,ne
     def to_a
       [@sw.to_a, @ne.to_a]
     end
-    
+
     # Returns true if the bounds contain the passed point.
     # allows for bounds which cross the meridian
     def contains?(point)
@@ -476,7 +474,7 @@ module Geokit
       end
       res
     end
-    
+
     # returns true if the bounds crosses the international dateline
     def crosses_meridian?
       @sw.lng > @ne.lng 
@@ -487,7 +485,7 @@ module Geokit
     def ==(other)
       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
@@ -497,9 +495,9 @@ module Geokit
       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
       def from_point_and_radius(point,radius,options={})
         point=LatLng.normalize(point)
@@ -511,7 +509,7 @@ module Geokit
         ne=Geokit::LatLng.new(p0.lat,p90.lng)
         Geokit::Bounds.new(sw,ne)
       end
-      
+
       # Takes two main combinations of arguments to create a bounds:
       # point,point   (this is the only one which takes two arguments
       # [point,point]
@@ -521,7 +519,7 @@ module Geokit
       def normalize (thing,other=nil)   
         # maybe this will be simple -- an actual bounds object is passed, and we can all go home
         return thing if thing.is_a? Bounds
-        
+
         # no? OK, if there's no "other," the thing better be a two-element array        
         thing,other=thing if !other && thing.is_a?(Array) && thing.size==2
 

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\nprovince: \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

@@ -186,7 +186,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
 
     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
+    assert_equal "Plaza de la Puerta del Sol", res.street_address
   end  
   
   def test_country_code_biasing

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  

data/test/test_yahoo_geocoder.rb

@@ -4,15 +4,15 @@ Geokit::Geocoders::yahoo = 'Yahoo'
 
 class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
     YAHOO_FULL=<<-EOF.strip
-  <?xml version="1.0"?>
-  <ResultSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:yahoo:maps" xsi:schemaLocation="urn:yahoo:maps http://api.local.yahoo.com/MapsService/V1/GeocodeResponse.xsd"><Result precision="address"><Latitude>37.792406</Latitude><Longitude>-122.39411</Longitude><Address>100 SPEAR ST</Address><City>SAN FRANCISCO</City><State>CA</State><Zip>94105-1522</Zip><Country>US</Country></Result></ResultSet>
-  <!-- ws01.search.scd.yahoo.com uncompressed/chunked Mon Jan 29 16:23:43 PST 2007 -->
+      <?xml version="1.0" encoding="UTF-8"?>
+      <ResultSet version="1.0"><Error>0</Error><ErrorMessage>No error</ErrorMessage><Locale>us_US</Locale><Quality>87</Quality><Found>1</Found><Result><quality>87</quality><latitude>37.792418</latitude><longitude>-122.393913</longitude><offsetlat>37.792332</offsetlat><offsetlon>-122.394027</offsetlon><radius>500</radius><name></name><line1>100 Spear St</line1><line2>San Francisco, CA  94105-1578</line2><line3></line3><line4>United States</line4><house>100</house><street>Spear St</street><xstreet></xstreet><unittype></unittype><unit></unit><postal>94105-1578</postal><neighborhood></neighborhood><city>San Francisco</city><county>San Francisco County</county><state>California</state><country>United States</country><countrycode>US</countrycode><statecode>CA</statecode><countycode></countycode><uzip>94105</uzip><hash>0FA06819B5F53E75</hash><woeid>12797156</woeid><woetype>11</woetype></Result></ResultSet>
+      <!-- gws17.maps.sp1.yahoo.com uncompressed/chunked Fri Feb 11 13:41:03 PST 2011 -->
     EOF
 
     YAHOO_CITY=<<-EOF.strip
-  <?xml version="1.0"?>
-  <ResultSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:yahoo:maps" xsi:schemaLocation="urn:yahoo:maps http://api.local.yahoo.com/MapsService/V1/GeocodeResponse.xsd"><Result precision="city"><Latitude>37.7742</Latitude><Longitude>-122.417068</Longitude><Address></Address><City>SAN FRANCISCO</City><State>CA</State><Zip></Zip><Country>US</Country></Result></ResultSet>
-  <!-- ws02.search.scd.yahoo.com uncompressed/chunked Mon Jan 29 18:00:28 PST 2007 -->
+      <?xml version="1.0" encoding="UTF-8"?>
+      <ResultSet version="1.0"><Error>0</Error><ErrorMessage>No error</ErrorMessage><Locale>us_US</Locale><Quality>40</Quality><Found>1</Found><Result><quality>40</quality><latitude>37.777125</latitude><longitude>-122.419644</longitude><offsetlat>37.777125</offsetlat><offsetlon>-122.419644</offsetlon><radius>10700</radius><name></name><line1></line1><line2>San Francisco, CA</line2><line3></line3><line4>United States</line4><house></house><street></street><xstreet></xstreet><unittype></unittype><unit></unit><postal></postal><neighborhood></neighborhood><city>San Francisco</city><county>San Francisco County</county><state>California</state><country>United States</country><countrycode>US</countrycode><statecode>CA</statecode><countycode></countycode><uzip>94102</uzip><hash></hash><woeid>2487956</woeid><woetype>7</woetype></Result></ResultSet>
+      <!-- gws31.maps.sp1.yahoo.com uncompressed/chunked Fri Feb 11 13:38:19 PST 2011 -->
     EOF
     
   def setup
@@ -27,7 +27,7 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_yahoo_full_address
     response = MockSuccess.new
     response.expects(:body).returns(YAHOO_FULL)
-    url = "http://api.local.yahoo.com/MapsService/V1/geocode?appid=Yahoo&location=#{Geokit::Inflector.url_escape(@address)}"
+    url = "http://where.yahooapis.com/geocode?appid=Yahoo&count=100&location=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     do_full_address_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@address))
   end 
@@ -35,16 +35,25 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_yahoo_full_address_accuracy
     response = MockSuccess.new
     response.expects(:body).returns(YAHOO_FULL)
-    url = "http://api.local.yahoo.com/MapsService/V1/geocode?appid=Yahoo&location=#{Geokit::Inflector.url_escape(@address)}"
+    url = "http://where.yahooapis.com/geocode?appid=Yahoo&count=100&location=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     res = Geokit::Geocoders::YahooGeocoder.geocode(@address)
     assert_equal 8, res.accuracy
   end
   
+  def test_yahoo_full_address_precision
+    response = MockSuccess.new
+    response.expects(:body).returns(YAHOO_FULL)
+    url = "http://where.yahooapis.com/geocode?appid=Yahoo&count=100&location=#{Geokit::Inflector.url_escape(@address)}"
+    Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    res = Geokit::Geocoders::YahooGeocoder.geocode(@address)
+    assert_equal 'address', res.precision
+  end
+  
   def test_yahoo_full_address_with_geo_loc
     response = MockSuccess.new
     response.expects(:body).returns(YAHOO_FULL)
-    url = "http://api.local.yahoo.com/MapsService/V1/geocode?appid=Yahoo&location=#{Geokit::Inflector.url_escape(@full_address)}"
+    url = "http://where.yahooapis.com/geocode?appid=Yahoo&count=100&location=#{Geokit::Inflector.url_escape(@full_address)}"
     Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     do_full_address_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@yahoo_full_loc))
   end  
@@ -52,7 +61,7 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_yahoo_city
     response = MockSuccess.new
     response.expects(:body).returns(YAHOO_CITY)
-    url = "http://api.local.yahoo.com/MapsService/V1/geocode?appid=Yahoo&location=#{Geokit::Inflector.url_escape(@address)}"
+    url = "http://where.yahooapis.com/geocode?appid=Yahoo&count=100&location=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     do_city_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@address))
   end
@@ -60,23 +69,32 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_yahoo_city_accuracy
     response = MockSuccess.new
     response.expects(:body).returns(YAHOO_CITY)
-    url = "http://api.local.yahoo.com/MapsService/V1/geocode?appid=Yahoo&location=#{Geokit::Inflector.url_escape(@address)}"
+    url = "http://where.yahooapis.com/geocode?appid=Yahoo&count=100&location=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     res = Geokit::Geocoders::YahooGeocoder.geocode(@address)
     assert_equal 4, res.accuracy
   end
   
+  def test_yahoo_city_precision
+    response = MockSuccess.new
+    response.expects(:body).returns(YAHOO_CITY)
+    url = "http://where.yahooapis.com/geocode?appid=Yahoo&count=100&location=#{Geokit::Inflector.url_escape(@address)}"
+    Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    res = Geokit::Geocoders::YahooGeocoder.geocode(@address)
+    assert_equal 'city', res.precision
+  end
+  
   def test_yahoo_city_with_geo_loc
     response = MockSuccess.new
     response.expects(:body).returns(YAHOO_CITY)
-    url = "http://api.local.yahoo.com/MapsService/V1/geocode?appid=Yahoo&location=#{Geokit::Inflector.url_escape(@address)}"  
+    url = "http://where.yahooapis.com/geocode?appid=Yahoo&count=100&location=#{Geokit::Inflector.url_escape(@address)}"  
     Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     do_city_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@yahoo_city_loc))
   end  
   
   def test_service_unavailable
     response = MockFailure.new
-    url = "http://api.local.yahoo.com/MapsService/V1/geocode?appid=Yahoo&location=#{Geokit::Inflector.url_escape(@address)}"
+    url = "http://where.yahooapis.com/geocode?appid=Yahoo&count=100&location=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     assert !Geokit::Geocoders::YahooGeocoder.geocode(@yahoo_city_loc).success
   end  
@@ -87,16 +105,16 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
   def do_full_address_assertions(res)
     assert_equal "CA", res.state
     assert_equal "San Francisco", res.city
-    assert_equal "37.792406,-122.39411", res.ll
+    assert_equal "37.792418,-122.393913", res.ll
     assert res.is_us?
-    assert_equal "100 Spear St, San Francisco, CA, 94105-1522, US", res.full_address
+    assert_equal "100 Spear St, San Francisco, CA 94105-1578", res.full_address
     assert_equal "yahoo", res.provider
   end
   
   def do_city_assertions(res)
     assert_equal "CA", res.state
     assert_equal "San Francisco", res.city 
-    assert_equal "37.7742,-122.417068", res.ll
+    assert_equal "37.777125,-122.419644", res.ll
     assert res.is_us?
     assert_equal "San Francisco, CA, US", res.full_address 
     assert_nil res.street_address

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 0
-  - 2
-  version: 1.5.0.2
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Andre Lewis and Bill Eisenhauer
@@ -17,8 +16,19 @@ cert_chain: []
 
 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
@@ -40,6 +50,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
@@ -82,6 +93,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