Fix incorrect interpolation variables

[rails.git] / lib / geo_record.rb

diff --git a/lib/geo_record.rb b/lib/geo_record.rb
index 2740eab0c5472da4c76d95128c5f8253dd440cbb..0d010eb869b6f6116c5024e2fa8bff300acf8d68 100644 (file)
--- a/lib/geo_record.rb
+++ b/lib/geo_record.rb
@@ -5,11 +5,8 @@ module GeoRecord
   SCALE = 10000000
   
   def self.included(base)
-    base.extend(ClassMethods)
-  end
-
-  def before_save
-    self.update_tile
+    base.scope :bbox, lambda { |bbox| base.where(OSM.sql_for_area(bbox)) }
+    base.before_save :update_tile
   end
 
   # Is this node within -90 >= latitude >= 90 and -180 >= longitude >= 180
@@ -47,13 +44,5 @@ 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