X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/00a605a2a877528ec3d4eabc6562e262c427b839..584806af9239154f3af22da3e66a054c2d8e147f:/lib/osm.rb diff --git a/lib/osm.rb b/lib/osm.rb index a85a7dfec..1a22af93a 100644 --- a/lib/osm.rb +++ b/lib/osm.rb @@ -6,8 +6,6 @@ module OSM require 'rexml/text' require 'xml/libxml' require 'digest/md5' - require 'RMagick' - require 'nokogiri' if defined?(SystemTimer) Timer = SystemTimer @@ -455,7 +453,7 @@ module OSM end def self.IPToCountry(ip_address) - Timeout::timeout(4) do + Timer.timeout(4) do ipinfo = Quova::IpInfo.new(ip_address) if ipinfo.status == Quova::Success then @@ -512,27 +510,6 @@ module OSM "AND #{prefix}longitude BETWEEN #{bbox.min_lon} AND #{bbox.max_lon}" 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") file_name = File.join(Rails.root, "config", "legales", DEFAULT_LEGALE + ".yml") unless File.exist? file_name