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

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 743d1b1c665cbec9d0f2b462714b31c4a0428866..3e4b5dcee4b005d8b4db2bc2b7e81bf8bf9eeedc 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -511,17 +511,10 @@ module OSM
   end
 
   def self.ip_to_country(ip_address)
-    ipinfo = geoip_database.country(ip_address) if Settings.key?(:geoip_database)
+    ipinfo = maxmind_database.lookup(ip_address) if Settings.key?(:maxmind_database)
 
-    if ipinfo
-      country = ipinfo.country_code2
-    else
-      country = http_client.get("https://api.hostip.info/country.php?ip=#{ip_address}").body
-      country = "GB" if country == "UK"
-    end
+    return ipinfo.country.iso_code if ipinfo&.found?
 
-    country
-  rescue StandardError
     nil
   end
 
@@ -575,8 +568,8 @@ module OSM
     @http_client ||= Faraday.new
   end
 
-  # Return the GeoIP database handle
-  def self.geoip_database
-    @geoip_database ||= GeoIP.new(Settings.geoip_database) if Settings.key?(:geoip_database)
+  # Return the MaxMindDB database handle
+  def self.maxmind_database
+    @maxmind_database ||= MaxMindDB.new(Settings.maxmind_database) if Settings.key?(:maxmind_database)
   end
 end