Update bundle

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 1951e3c31287f82d1bc15929a17573834e3a0c6e..1d3700cd925edb69aefeadfef236049926a9565a 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -502,26 +502,19 @@ module OSM
     end
 
     def xml_root_attributes
     end
 
     def xml_root_attributes

-      { "version" => API_VERSION.to_s,
-        "generator" => GENERATOR,
-        "copyright" => COPYRIGHT_OWNER,
-        "attribution" => ATTRIBUTION_URL,
-        "license" => LICENSE_URL }
+      { "version" => Settings.api_version,
+        "generator" => Settings.generator,
+        "copyright" => Settings.copyright_owner,
+        "attribution" => Settings.attribution_url,
+        "license" => Settings.license_url }

     end
   end
 
   def self.ip_to_country(ip_address)
     end
   end
 
   def self.ip_to_country(ip_address)

-    ipinfo = geoip_database.country(ip_address) if defined?(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
 
     nil
   end
 


@@ -566,8 +559,8 @@ module OSM
   # Return the terms and conditions text for a given country
   def self.legal_text_for_country(country_code)
     file_name = Rails.root.join("config", "legales", country_code.to_s + ".yml")
   # Return the terms and conditions text for a given country
   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", DEFAULT_LEGALE + ".yml") unless File.exist? file_name
-    YAML.load_file(file_name)
+    file_name = Rails.root.join("config", "legales", Settings.default_legale + ".yml") unless File.exist? file_name
+    YAML.load_file(file_name).transform_values!(&:html_safe)

   end
 
   # Return the HTTP client to use
   end
 
   # Return the HTTP client to use


@@ -575,8 +568,8 @@ module OSM
     @http_client ||= Faraday.new
   end
 
     @http_client ||= Faraday.new
   end
 

-  # Return the GeoIP database handle
-  def self.geoip_database
-    @geoip_database ||= GeoIP.new(GEOIP_DATABASE) if defined?(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
   end
 end