Merge pull request alexreisner#160 from kongo/within_bounding_box_fix

within_bounding_box scope takes field names from options
kor6n · Jan 14, 2012 · da7db55 · da7db55
2 parents e9cd55c + e6f5662
commit da7db55
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/geocoder/stores/active_record.rb b/lib/geocoder/stores/active_record.rb
@@ -50,11 +50,11 @@ def self.included(base)
         scope :within_bounding_box, lambda{ |bounds|
           sw_lat, sw_lng, ne_lat, ne_lng = bounds.flatten if bounds
           return where(:id => false) unless sw_lat && sw_lng && ne_lat && ne_lng
-          spans = "latitude BETWEEN #{sw_lat} AND #{ne_lat} AND "
+          spans = "#{geocoder_options[:latitude]} BETWEEN #{sw_lat} AND #{ne_lat} AND "
           spans << if sw_lng > ne_lng   # Handle a box that spans 180
-            "longitude BETWEEN #{sw_lng} AND 180 OR longitude BETWEEN -180 AND #{ne_lng}"
+            "#{geocoder_options[:longitude]} BETWEEN #{sw_lng} AND 180 OR #{geocoder_options[:longitude]} BETWEEN -180 AND #{ne_lng}"
           else
-            "longitude BETWEEN #{sw_lng} AND #{ne_lng}"
+            "#{geocoder_options[:longitude]} BETWEEN #{sw_lng} AND #{ne_lng}"
           end
           { :conditions => spans }
         }