Cleanup trailing whitespace

[rails.git] / lib / geo_record.rb

diff --git a/lib/geo_record.rb b/lib/geo_record.rb
index 0728a6aa1e7610cb4ccf04c5f5310915c5d23015..7c65e3af2757774cb7e8e64890796717c8d65e55 100644 (file)
--- a/lib/geo_record.rb
+++ b/lib/geo_record.rb
@@ -1,11 +1,11 @@
 module GeoRecord
 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
   # returned by the API, and the integer lat/lon equivalent that is stored in
   # the database.
   SCALE = 10000000

-  
+

   def self.included(base)
   def self.included(base)

-    base.extend(ClassMethods)
+    base.scope :bbox, ->(bbox) { base.where(OSM.sql_for_area(bbox)) }

     base.before_save :update_tile
   end
 
     base.before_save :update_tile
   end
 


@@ -40,17 +40,8 @@ module GeoRecord
   end
 
 private
   end
 
 private

-  
+

   def lat2y(a)
     180/Math::PI * Math.log(Math.tan(Math::PI/4+a*(Math::PI/180)/2))
   end
   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
 end

-