X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d102c9aaf478a4bad52a72b1b72470ba35ba464e..ea59d95f4aad7cafe3a0d0b4d5ef533b0662e365:/lib/osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 743d1b1c6..1d3700cd9 100644
--- 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
 
@@ -567,7 +560,7 @@ module OSM
   def self.legal_text_for_country(country_code)
     file_name = Rails.root.join("config", "legales", country_code.to_s + ".yml")
     file_name = Rails.root.join("config", "legales", Settings.default_legale + ".yml") unless File.exist? file_name
-    YAML.load_file(file_name)
+    YAML.load_file(file_name).transform_values!(&:html_safe)
   end
 
   # Return the HTTP client to use
@@ -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