X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/64a5e21f53be132cd5fe3265230c6cdc00ccabaa..2805118a6047fa9e5814d44003d993507222fb90:/lib/geo_record.rb diff --git a/lib/geo_record.rb b/lib/geo_record.rb index 286ce69e1..0d010eb86 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 @@ -42,27 +39,10 @@ module GeoRecord return self.longitude.to_f / SCALE end - # Potlatch projections - def lon_potlatch(baselong,masterscale) - (self.lon-baselong)*masterscale - end - - def lat_potlatch(basey,masterscale) - -(lat2y(self.lat)-basey)*masterscale - 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 - end end