X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..5cbd4038edb32b0304bd766e70fc680ea447b52b:/lib/osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 1d0896417..89333763f 100644
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -493,11 +493,11 @@ module OSM
     end
   end
 
-  def self.IPToCountry(ip_address)
+  def self.ip_to_country(ip_address)
     Timer.timeout(4) do
       ipinfo = Quova::IpInfo.new(ip_address)
 
-      if ipinfo.status == Quova::Success
+      if ipinfo.status == Quova::SUCCESS
         country = ipinfo.country_code
       else
         Net::HTTP.start('api.hostip.info') do |http|
@@ -510,12 +510,12 @@ module OSM
     end
 
     return nil
-  rescue Exception
+  rescue StandardError
     return nil
   end
 
-  def self.IPLocation(ip_address)
-    code = OSM.IPToCountry(ip_address)
+  def self.ip_location(ip_address)
+    code = OSM.ip_to_country(ip_address)
 
     if code && country = Country.find_by_code(code)
       return { :minlon => country.min_lon, :minlat => country.min_lat, :maxlon => country.max_lon, :maxlat => country.max_lat }