Merge branch 'master' into openstreetbugs

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 50e31a7ff8a3c3679833184aae7568470dba0fd3..9ee36e0c7aa6b26db8b085b152d2acf73d52eeec 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -7,6 +7,7 @@ module OSM
   require 'xml/libxml'
   require 'digest/md5'
   require 'RMagick'
   require 'xml/libxml'
   require 'digest/md5'
   require 'RMagick'

+  require 'nokogiri'

 
   # The base class for API Errors.
   class APIError < RuntimeError
 
   # The base class for API Errors.
   class APIError < RuntimeError


@@ -470,9 +471,7 @@ module OSM
   def self.IPLocation(ip_address)
     code = OSM.IPToCountry(ip_address)
 
   def self.IPLocation(ip_address)
     code = OSM.IPToCountry(ip_address)
 

-    unless code.nil?
-      country = Country.find_by_code(code)
-
+    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
 


@@ -500,6 +499,7 @@ module OSM
   # 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)
   # 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
     minlat = (minlat * 10000000).round
     minlon = (minlon * 10000000).round
     maxlat = (maxlat * 10000000).round


@@ -508,10 +508,30 @@ module OSM
     return "#{tilesql} AND #{prefix}latitude BETWEEN #{minlat} AND #{maxlat} AND #{prefix}longitude BETWEEN #{minlon} AND #{maxlon}"
   end
 
     return "#{tilesql} AND #{prefix}latitude BETWEEN #{minlat} AND #{maxlat} AND #{prefix}longitude BETWEEN #{minlon} AND #{maxlon}"
   end
 

+  # Return a spam score for a chunk of text
+  def self.spam_score(text)
+    link_count = 0
+    link_size = 0
+
+    doc = Nokogiri::HTML(text)
+
+    if doc.content.length > 0
+      doc.xpath("//a").each do |link|
+        link_count += 1
+        link_size += link.content.length
+      end
+
+      link_proportion = link_size.to_f / doc.content.length.to_f
+    else
+      link_proportion = 0
+    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")
   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", "GB.yml") unless File.exist? file_name
+    file_name = File.join(RAILS_ROOT, "config", "legales", DEFAULT_LEGALE + ".yml") unless File.exist? file_name

     YAML::load_file(file_name)
   end
     YAML::load_file(file_name)
   end

-

 end
 end