Merge remote-tracking branch 'upstream/pull/1836'

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 40027991a036ea7611bda63dbba35b357772ebcb..71e12534ffe57c348d4802d81aeb40f9a4b31cbf 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -480,7 +480,7 @@ module OSM
       minlon = [(@lon - lonradius) * 180 / PI, -180].max
       maxlon = [(@lon + lonradius) * 180 / PI, 180].min
 
-      { :minlat => minlat, :maxlat => maxlat, :minlon => minlon, :maxlon => maxlon }
+      BoundingBox.new(minlon, minlat, maxlon, maxlat)
     end
 
     # get the SQL to use to calculate distance
@@ -514,9 +514,9 @@ module OSM
       country = "GB" if country == "UK"
     end
 
-    return country
+    country
   rescue StandardError
-    return nil
+    nil
   end
 
   def self.ip_location(ip_address)