X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b9c9d6c1aafdd60c72b54345b4d2dc94317298a0..34e3e51456774127d43408b7ab65c24f41373f62:/lib/geo_record.rb

diff --git a/lib/geo_record.rb b/lib/geo_record.rb
index d44227dd8..7c65e3af2 100644
--- a/lib/geo_record.rb
+++ b/lib/geo_record.rb
@@ -1,15 +1,12 @@
 module GeoRecord
-  # This scaling factor is used to convert between the float lat/lon that is 
+  # This scaling factor is used to convert between the float lat/lon that is
   # returned by the API, and the integer lat/lon equivalent that is stored in
   # the database.
   SCALE = 10000000
-  
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
 
-  def before_save
-    self.update_tile
+  def self.included(base)
+    base.scope :bbox, ->(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
@@ -43,22 +40,8 @@ module GeoRecord
   end
 
 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
-	def find_by_area_no_quadtile(minlat, minlon, maxlat, maxlon, options)
-      self.with_scope(:find => {:conditions => OSM.sql_for_area_no_quadtile(minlat, minlon, maxlat, maxlon)}) do
-        return self.find(:all, options)
-      end
-    end
-  end
 end
-