Merge branch 'notes'

[rails.git] / lib / geo_record.rb

diff --git a/lib/geo_record.rb b/lib/geo_record.rb
index 0728a6aa1e7610cb4ccf04c5f5310915c5d23015..0c261dc69c8d3330f5ad4ea17b603e8a848dd9e1 100644 (file)
--- a/lib/geo_record.rb
+++ b/lib/geo_record.rb
@@ -5,7 +5,7 @@ module GeoRecord
   SCALE = 10000000
   
   def self.included(base)
-    base.extend(ClassMethods)
+    base.scope :bbox, lambda { |bbox| base.where(OSM.sql_for_area(bbox)) }
     base.before_save :update_tile
   end
 
@@ -44,13 +44,4 @@ private
   def lat2y(a)
     180/Math::PI * Math.log(Math.tan(Math::PI/4+a*(Math::PI/180)/2))
   end
-
-  module ClassMethods
-    def find_by_area(minlat, minlon, maxlat, maxlon, options)
-      self.with_scope(:find => {:conditions => OSM.sql_for_area(minlat, minlon, maxlat, maxlon)}) do
-        return self.find(:all, options)
-      end
-    end
-  end
 end
-