X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/160429e62d88810ec49ccc9c504edee675dca080..f412c80d3f3fbb496fcd0baa09c464fa179dd839:/lib/geo_record.rb?ds=sidebyside diff --git a/lib/geo_record.rb b/lib/geo_record.rb index d44227dd8..09ced9729 100644 --- a/lib/geo_record.rb +++ b/lib/geo_record.rb @@ -1,23 +1,20 @@ 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 - - def self.included(base) - base.extend(ClassMethods) - end - def before_save - self.update_tile + def self.included(base) + base.scope :bbox, ->(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 # * returns true/false def in_world? - return false if self.lat < -90 or self.lat > 90 - return false if self.lon < -180 or self.lon > 180 - return true + return false if lat < -90 || lat > 90 + return false if lon < -180 || lon > 180 + true end def update_tile @@ -34,31 +31,11 @@ module GeoRecord # Return WGS84 latitude def lat - return self.latitude.to_f / SCALE + latitude.to_f / SCALE end # Return WGS84 longitude def lon - return self.longitude.to_f / SCALE - 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 - 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 + longitude.to_f / SCALE end end -