diff --git a/lib/geocoder.rb b/lib/geocoder.rb index d2e4eeef4be29516dc37592e4f9e4ab7169e42d3..d1157aa6ed4c07f6cb4b7daf88ec10f7d3e7a113 100644 --- a/lib/geocoder.rb +++ b/lib/geocoder.rb @@ -110,12 +110,16 @@ module Geocoder conditions = \ ["#{lat_attr} BETWEEN ? AND ? AND #{lon_attr} BETWEEN ? AND ?"] + coordinate_bounds(latitude, longitude, radius) + if obj = options[:exclude] + conditions[0] << " AND id != ?" + conditions << obj.id + end { :group => columns.map{ |c| c.name}.join(','), :order => options[:order], :limit => options[:limit], :offset => options[:offset], - :conditions => (obj = options[:exclude]) ? ["id != ?", obj.id] : nil + :conditions => conditions } end