X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22..f412c80d3f3fbb496fcd0baa09c464fa179dd839:/lib/geo_record.rb?ds=sidebyside diff --git a/lib/geo_record.rb b/lib/geo_record.rb index 0c261dc69..09ced9729 100644 --- a/lib/geo_record.rb +++ b/lib/geo_record.rb @@ -1,20 +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.scope :bbox, lambda { |bbox| base.where(OSM.sql_for_area(bbox)) } + 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 @@ -31,17 +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)) + longitude.to_f / SCALE end end