X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/34e3e51456774127d43408b7ab65c24f41373f62..c555c912047c8d0d23123093a729aa87ca642aee:/lib/geo_record.rb?ds=inline

diff --git a/lib/geo_record.rb b/lib/geo_record.rb
index 7c65e3af2..e4a66f932 100644
--- a/lib/geo_record.rb
+++ b/lib/geo_record.rb
@@ -1,4 +1,19 @@
+require "delegate"
+
 module GeoRecord
+  # Ensure that when coordinates are printed that they are always in decimal degrees,
+  # and not e.g. 4.0e-05
+  # Unfortunately you can't extend Numeric classes directly (e.g. `Coord < Float`).
+  class Coord < DelegateClass(Float)
+    def initialize(obj)
+      super(obj)
+    end
+
+    def to_s
+      format("%.7f", self)
+    end
+  end
+
   # 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.
@@ -12,9 +27,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 +46,11 @@ module GeoRecord
 
   # Return WGS84 latitude
   def lat
-    return self.latitude.to_f / SCALE
+    Coord.new(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))
+    Coord.new(longitude.to_f / SCALE)
   end
 end