Make GeoRecord inject class methods correctly when included.

This commit is contained in:
Tom Hughes 2008-06-22 15:22:13 +00:00
parent b72fedb162
commit cfc14f1ddc

View file

@ -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