Merge branch 'master' into terms

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 46b90447781b23938a6cc3820403381c8ba30272..c92655aeea207b48393645e6bb9aeb4bcf478c4c 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -447,7 +447,7 @@ module OSM
     end
   end
 
-  def self.IPLocation(ip_address)
+  def self.IPToCountry(ip_address)
     Timeout::timeout(4) do
       ipinfo = Quova::IpInfo.new(ip_address)
 
@@ -459,14 +459,24 @@ module OSM
           country = "GB" if country == "UK"
         end
       end
+      
+      return country.upcase
+    end
 
-      country = Country.find_by_code(country.upcase)
+    return nil
+  rescue Exception
+    return nil
+  end
+
+  def self.IPLocation(ip_address)
+    code = OSM.IPToCountry(ip_address)
+
+    unless code.nil?
+      country = Country.find_by_code(code)
 
       return { :minlon => country.min_lon, :minlat => country.min_lat, :maxlon => country.max_lon, :maxlat => country.max_lat }
     end
 
-    return nil
-  rescue Exception
     return nil
   end
 
@@ -519,4 +529,10 @@ module OSM
 
     return [link_proportion - 0.2, 0.0].max * 200 + link_count * 20
   end
+
+  def self.legal_text_for_country(country_code)
+    file_name = File.join(RAILS_ROOT, "config", "legales", country_code.to_s + ".yml")
+    file_name = File.join(RAILS_ROOT, "config", "legales", APP_CONFIG['default_legale'] + ".yml") unless File.exist? file_name
+    YAML::load_file(file_name)
+  end
 end