graticule 0.2.1 → 0.2.2

data/CHANGELOG.txt

@@ -1,3 +1,6 @@
+0.2.2 (2007-03-27)
+* fixed LocalSearchMaps
+
 0.2.1 (2007-03-19)
 * fixed error in command line interface
 

data/lib/graticule/geocoder/local_search_maps.rb

@@ -20,10 +20,10 @@ module Graticule #:nodoc:
     private
     
       def map_attributes(location)
-        #mapping = {:street => :address, :locality => :city, :region => :state, :postal_code => :zip}
-        mapping = {}
+        mapping = {:street => :address, :locality => :city, :region => :state, :postal_code => :zip}
         mapping.keys.inject({}) do |result,attribute|
           result[mapping[attribute]] = location.attributes[attribute]
+          result
         end
       end
     

data/lib/graticule/location.rb

@@ -16,7 +16,7 @@ module Graticule
     
     def attributes
       [:latitude, :longitude, :street, :locality, :region, :postal_code, :country].inject({}) do |result,attr|
-        result[attr] = self.send(attr) if self.send(attr)
+        result[attr] = self.send(attr) unless self.send(attr).blank?
         result
       end
     end
@@ -26,16 +26,15 @@ module Graticule
       [latitude, longitude]
     end
     
-    def ==(object)
-      super(object) || [:latitude, :longitude, :street, :locality, :region, :postal_code, :country, :precision].all? do |m|
-        object.respond_to?(m) && self.send(m) == object.send(m)
-      end
+    def ==(other)
+      other.respond_to?(:attributes) ? attributes == other.attributes : false
     end
     
     # Calculate the distance to another location.  See the various Distance formulas
     # for more information
-    def distance_to(destination, units = :miles, formula = :haversine)
-      "Graticule::Distance::#{formula.to_s.titleize}".constantize.distance(self, destination)
+    def distance_to(destination, options = {})
+      options = {:formula => :haversine, :units => :miles}.merge(options)
+      "Graticule::Distance::#{options[:formula].to_s.titleize}".constantize.distance(self, destination, options[:units])
     end
     
     # Where would I be if I dug through the center of the earth?

data/lib/graticule/version.rb

@@ -2,7 +2,7 @@ module Graticule #:nodoc:
   module Version #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY = 1
+    TINY = 2
   
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: graticule
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2007-03-19 00:00:00 -04:00
+  version: 0.2.2
+date: 2007-03-27 00:00:00 -04:00
 summary: API for using all the popular geocoding services.
 require_paths: 
 - lib