X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bed9cd00ed166ce346da4b8a9b654ddf86e64e70..669d3ed52c6f22e842c1319c242e06ee9694f615:/lib/geo_record.rb diff --git a/lib/geo_record.rb b/lib/geo_record.rb index 2740eab0c..0c261dc69 100644 --- 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,4 @@ 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 -