Move some helper functions to better homes

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 37dcf90e09de1c97e4ae4d62dfa96fb79f0b3860..3213c5e4c41beac7312ca3a26472c5167acd60ea 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -75,38 +75,6 @@ module ApplicationHelper
     content_tag(tag, capture(&block), :class => "hide_unless_administrator")
   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}"
-
-    begin
-      response = OSM::Timer.timeout(4) do
-        REXML::Document.new(Net::HTTP.get(URI.parse(url)))
-      end
-    rescue Exception
-      response = nil
-    end
-
-    if response and 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"
-
-    image_tag user.image.url(:large), options
-  end
-
-  def user_thumbnail(user, options = {})
-    options[:class] ||= "user_thumbnail"
-
-    image_tag user.image.url(:small), options
-  end
-
   def preferred_editor
     if params[:editor]
       params[:editor]

diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb
index 4c58d54dde5f54171568d4e0b182bc05c45d532e..f5519ddc3fcd5cc0eca4d9d8ebc3638141d7eea3 100644 (file)
--- a/app/helpers/geocoder_helper.rb
+++ b/app/helpers/geocoder_helper.rb
@@ -20,4 +20,24 @@ module GeocoderHelper
 
     return raw(html)
   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}"
+
+    begin
+      response = OSM::Timer.timeout(4) do
+        REXML::Document.new(Net::HTTP.get(URI.parse(url)))
+      end
+    rescue Exception
+      response = nil
+    end
+
+    if response and result = response.get_text("reversegeocode/result")
+      result.to_s
+    else
+      "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}"
+    end
+  end
 end

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index acaecff48fdd0a59ec7ddd4c30a688fb4257bab1..6a239df5d723d02f0b02f2fa5e68e58871a94a1d 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -1,4 +1,16 @@
 module UserHelper
+  def user_image(user, options = {})
+    options[:class] ||= "user_image"
+
+    image_tag user.image.url(:large), options
+  end
+
+  def user_thumbnail(user, options = {})
+    options[:class] ||= "user_thumbnail"
+
+    image_tag user.image.url(:small), options
+  end
+
   def openid_logo
     image_tag "openid_small.png", :alt => t('user.login.openid_logo_alt'), :class => "openid_logo"
   end