X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/226c41be692452129227f30d67f2d847e510015c..1096bccf980fa7df3dd1144bca92b057363df40a:/lib/geo_record.rb?ds=sidebyside

diff --git a/lib/geo_record.rb b/lib/geo_record.rb
index d338f1b66..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 { |minlat,minlon,maxlat,maxlon| base.where(OSM.sql_for_area(minlat, minlon, maxlat, maxlon)) }
+    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,18 +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
-