Move generation of role icons into a helper

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

diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb
index 0e5181026fc45365f5bd5cf3464463832c138766..082f9e5304180aed93ed6a01f359f65debc4158c 100644 (file)
--- a/app/helpers/geocoder_helper.rb
+++ b/app/helpers/geocoder_helper.rb
@@ -3,9 +3,9 @@ module GeocoderHelper
     html_options = {}
     #html_options[:title] = strip_tags(result[:description]) if result[:description]
     if result[:min_lon] and result[:min_lat] and result[:max_lon] and result[:max_lat]
-      html_options[:href] = "?minlon=#{result[:min_lon]}&minlat=#{result[:min_lat]}&maxlon=#{result[:max_lon]}&maxlat=#{result[:max_lat]}"
+      html_options[:href] = raw("?minlon=#{result[:min_lon]}&minlat=#{result[:min_lat]}&maxlon=#{result[:max_lon]}&maxlat=#{result[:max_lat]}")
     else
-      html_options[:href] = "?mlat=#{result[:lat]}&mlon=#{result[:lon]}&zoom=#{result[:zoom]}"
+      html_options[:href] = raw("?mlat=#{result[:lat]}&mlon=#{result[:lon]}&zoom=#{result[:zoom]}")
     end
 
     html = ""
@@ -13,12 +13,13 @@ module GeocoderHelper
     html << " " if result[:prefix] and result[:name]
 
     if result[:min_lon] and result[:min_lat] and result[:max_lon] and result[:max_lat]
-      html << link_to_function(result[:name],"setPosition(#{result[:lat]}, #{result[:lon]}, #{result[:zoom]}, #{result[:min_lon]}, #{result[:min_lat]}, #{result[:max_lon]}, #{result[:max_lat]})", html_options)  if result[:name]
+      html << link_to_function(result[:name],"setPosition(#{result[:lat]}, #{result[:lon]}, null, #{result[:min_lon]}, #{result[:min_lat]}, #{result[:max_lon]}, #{result[:max_lat]})", html_options)  if result[:name]
     else
       html << link_to_function(result[:name],"setPosition(#{result[:lat]}, #{result[:lon]}, #{result[:zoom]})", html_options)  if result[:name]
     end
 
     html << result[:suffix] if result[:suffix]
-    return html
+
+    return raw(html)
   end
 end