Merge branch 'master' into openstreetbugs

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 2a1ca089eb70ca681af2b7b3c2e1259d72e3de11..c85abc0f3cf5c426a11f2f7b337d414192161caa 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -6,9 +6,15 @@ module OSM
   require 'rexml/text'
   require 'xml/libxml'
   require 'digest/md5'
   require 'rexml/text'
   require 'xml/libxml'
   require 'digest/md5'

-  require 'RMagick'

   require 'nokogiri'
 
   require 'nokogiri'
 

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

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


@@ -440,15 +446,15 @@ 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)
-    Timeout::timeout(4) do
+  def self.IPToCountry(ip_address)
+    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


@@ -459,14 +465,22 @@ module OSM
           country = "GB" if country == "UK"
         end
       end
           country = "GB" if country == "UK"
         end
       end

+      
+      return country.upcase
+    end
+
+    return nil
+  rescue Exception
+    return nil
+  end

 
 

-      country = Country.find_by_code(country.upcase)
+  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,24 +503,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}"
-  end
-
-  # Return an SQL fragment to select a given area of the globe without using the quadtile index
-  def self.sql_for_area_no_quadtile(minlat, minlon, maxlat, maxlon, prefix = nil, without_quadtile = :false)
-    minlat = (minlat * 10000000).round
-    minlon = (minlon * 10000000).round
-    maxlat = (maxlat * 10000000).round
-    maxlon = (maxlon * 10000000).round
+  def self.sql_for_area(bbox, prefix = nil)
+    tilesql = QuadTile.sql_for_area(bbox, prefix)
+    bbox = bbox.to_scaled

 
 

-    return "#{prefix}latitude BETWEEN #{minlat} AND #{maxlat} AND #{prefix}longitude BETWEEN #{minlon} AND #{maxlon}"
+    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


@@ -514,7 +516,7 @@ module OSM
     link_count = 0
     link_size = 0
 
     link_count = 0
     link_size = 0
 

-    doc = Nokogiri::HTML(text)
+    doc = Nokogiri::HTML(Rinku.auto_link(text, :urls))

 
     if doc.content.length > 0
       doc.xpath("//a").each do |link|
 
     if doc.content.length > 0
       doc.xpath("//a").each do |link|


@@ -529,4 +531,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