Don't escape HTML in text/plain message notification emails

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 46b90447781b23938a6cc3820403381c8ba30272..02c51df7809b599debb11810cb6350ee7048bfc8 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -440,14 +440,14 @@ 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
+      root['version'] = API_VERSION.to_s

       root['generator'] = GENERATOR
       doc.root = root
       return doc
     end
   end
 
       root['generator'] = GENERATOR
       doc.root = root
       return doc
     end
   end
 

-  def self.IPLocation(ip_address)
+  def self.IPToCountry(ip_address)

     Timeout::timeout(4) do
       ipinfo = Quova::IpInfo.new(ip_address)
 
     Timeout::timeout(4) do
       ipinfo = Quova::IpInfo.new(ip_address)
 


@@ -459,14 +459,22 @@ module OSM
           country = "GB" if country == "UK"
         end
       end
           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)
+
+    if code and 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 { :minlon => country.min_lon, :minlat => country.min_lat, :maxlon => country.max_lon, :maxlat => country.max_lat }
     end
 

-    return nil
-  rescue Exception

     return nil
   end
 
     return nil
   end
 


@@ -489,14 +497,12 @@ module OSM
   end
 
   # Return an SQL fragment to select a given area of the globe
   end
 
   # Return an SQL fragment to select a given area of the globe

-  def self.sql_for_area(minlat, minlon, maxlat, maxlon, prefix = nil)
-    tilesql = QuadTile.sql_for_area(minlat, minlon, maxlat, maxlon, prefix)
-    minlat = (minlat * 10000000).round
-    minlon = (minlon * 10000000).round
-    maxlat = (maxlat * 10000000).round
-    maxlon = (maxlon * 10000000).round
-
-    return "#{tilesql} AND #{prefix}latitude BETWEEN #{minlat} AND #{maxlat} AND #{prefix}longitude BETWEEN #{minlon} AND #{maxlon}"
+  def self.sql_for_area(bbox, prefix = nil)
+    tilesql = QuadTile.sql_for_area(bbox, prefix)
+    bbox = bbox.to_scaled
+
+    return "#{tilesql} AND #{prefix}latitude BETWEEN #{bbox.min_lat} AND #{bbox.max_lat} " +
+                      "AND #{prefix}longitude BETWEEN #{bbox.min_lon} AND #{bbox.max_lon}"

   end
 
   # Return a spam score for a chunk of text
   end
 
   # Return a spam score for a chunk of text


@@ -519,4 +525,10 @@ module OSM
 
     return [link_proportion - 0.2, 0.0].max * 200 + link_count * 20
   end
 
     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", DEFAULT_LEGALE + ".yml") unless File.exist? file_name
+    YAML::load_file(file_name)
+  end

 end
 end