Merge 8381:8390 from trunk.

diff --git a/lib/geo_record.rb b/lib/geo_record.rb
index d5604d4d36db5882aafd2cff00d25816294dcb16..025bbe4a87b38b13a960751bdc2e63304e75e762 100644 (file)
--- a/lib/geo_record.rb
+++ b/lib/geo_record.rb
@@ -1,4 +1,8 @@
 module GeoRecord
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+
   def before_save
     self.update_tile
   end
@@ -11,12 +15,6 @@ module GeoRecord
     return true
   end
 
-  def self.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
-
   def update_tile
     self.tile = QuadTile.tile_for_point(lat, lon)
   end
@@ -48,11 +46,18 @@ module GeoRecord
     -(lat2y(self.lat)-basey)*masterscale
   end
   
-  private
+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