Replace note markers with ones styled like the other markers

[rails.git] / lib / geo_record.rb

diff --git a/lib/geo_record.rb b/lib/geo_record.rb
index d44227dd85d77d07ec30db995041595d6dea3c92..0c261dc69c8d3330f5ad4ea17b603e8a848dd9e1 100644 (file)
--- a/lib/geo_record.rb
+++ b/lib/geo_record.rb
@@ -5,11 +5,8 @@ module GeoRecord
   SCALE = 10000000
   
   def self.included(base)
   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
   end
 
   # Is this node within -90 >= latitude >= 90 and -180 >= longitude >= 180


@@ -47,18 +44,4 @@ 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
-       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
 end

-