Merge branch 'master' into openstreetbugs

[rails.git] / app / helpers / application_helper.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e10650ada1fa3cde95956725f5e679f146446156..2ed50216ff257d22ed58ed50a0b7eb3cd1c3bac7 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,6 +1,16 @@
 module ApplicationHelper
 module ApplicationHelper

+  require 'rexml/document'
+
+  def sanitize(text)
+    Sanitize.clean(text, Sanitize::Config::OSM)
+  end
+

   def htmlize(text)
   def htmlize(text)

-    return auto_link(sanitize(simple_format(text)), :link => :urls, :html => { :rel => "nofollow" })
+    return linkify(sanitize(simple_format(text)))
+  end
+
+  def linkify(text)
+    return auto_link(text, :link => :urls, :html => { :rel => "nofollow" })

   end
 
   def html_escape_unicode(text)
   end
 
   def html_escape_unicode(text)


@@ -30,6 +40,39 @@ module ApplicationHelper
     return js
   end
 
     return js
   end
 

+  def describe_location(lat, lon, zoom = nil, language = nil)
+    zoom = zoom || 14
+    language = language || request.user_preferred_languages.join(',')
+    url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
+    response = REXML::Document.new(Net::HTTP.get(URI.parse(url)))
+
+    if result = response.get_text("reversegeocode/result")
+      result.to_s
+    else
+      "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}"
+    end
+  end
+
+  def user_image(user, options = {})
+    options[:class] ||= "user_image"
+
+    if user.image
+      image_tag url_for_file_column(user, "image"), options
+    else
+      image_tag "anon_large.png", options
+    end
+  end
+
+  def user_thumbnail(user, options = {})
+    options[:class] ||= "user_thumbnail"
+
+    if user.image
+      image_tag url_for_file_column(user, "image"), options
+    else
+      image_tag "anon_small.png", options
+    end
+  end
+

 private
 
   def javascript_strings_for_key(key)
 private
 
   def javascript_strings_for_key(key)