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

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 71e12534ffe57c348d4802d81aeb40f9a4b31cbf..3e4b5dcee4b005d8b4db2bc2b7e81bf8bf9eeedc 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -494,28 +494,27 @@ module OSM
       doc = XML::Document.new
       doc.encoding = XML::Encoding::UTF_8
       root = XML::Node.new "osm"
       doc = XML::Document.new
       doc.encoding = XML::Encoding::UTF_8
       root = XML::Node.new "osm"

-      root["version"] = API_VERSION.to_s
-      root["generator"] = GENERATOR
-      root["copyright"] = COPYRIGHT_OWNER
-      root["attribution"] = ATTRIBUTION_URL
-      root["license"] = LICENSE_URL
+      xml_root_attributes.each do |k, v|
+        root[k] = v
+      end

       doc.root = root
       doc
     end
       doc.root = root
       doc
     end

+
+    def xml_root_attributes
+      { "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
 
   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("http://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
 


@@ -560,7 +559,7 @@ 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
+    file_name = Rails.root.join("config", "legales", Settings.default_legale + ".yml") unless File.exist? file_name

     YAML.load_file(file_name)
   end
 
     YAML.load_file(file_name)
   end
 


@@ -569,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