X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/34e3e51456774127d43408b7ab65c24f41373f62..ef7f3d800cbdd49b692df10d312e5fd880e2e938:/lib/geo_record.rb diff --git a/lib/geo_record.rb b/lib/geo_record.rb index 7c65e3af2..61185a314 100644 --- a/lib/geo_record.rb +++ b/lib/geo_record.rb @@ -12,9 +12,9 @@ module GeoRecord # 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,17 @@ 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 + longitude.to_f / SCALE end -private + private def lat2y(a) - 180/Math::PI * Math.log(Math.tan(Math::PI/4+a*(Math::PI/180)/2)) + 180 / Math::PI * Math.log(Math.tan(Math::PI / 4 + a * (Math::PI / 180) / 2)) end end