Sort node ids in test_ways_for_node

[rails.git] / lib / osm.rb

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

+  require 'nokogiri'
+
+  if defined?(SystemTimer)
+    Timer = SystemTimer
+  else
+    require 'timeout'
+    Timer = Timeout
+  end

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


@@ -439,7 +447,7 @@ 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
       root['generator'] = GENERATOR
       doc.root = root
       return doc


@@ -447,7 +455,7 @@ module OSM
   end
 
   def self.IPToCountry(ip_address)
   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
       ipinfo = Quova::IpInfo.new(ip_address)
 
       if ipinfo.status == Quova::Success then


@@ -470,9 +478,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
 


@@ -498,20 +504,38 @@ 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
+  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)
   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
+    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
     YAML::load_file(file_name)
   end

-

 end
 end