Merge r17285 from the oauth branch - allow flash access to set headers, even when...

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

diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb
index 75e81665126375a65884743fd790e5138992d8e8..e7d0ddf6c1d9cc8c27610ecc8d395a249036c6ca 100644 (file)
--- a/app/helpers/geocoder_helper.rb
+++ b/app/helpers/geocoder_helper.rb
@@ -2,9 +2,11 @@ module GeocoderHelper
   def result_to_html(result)
     html_options = {}
     #html_options[:title] = strip_tags(result[:description]) if result[:description]
   def result_to_html(result)
     html_options = {}
     #html_options[:title] = strip_tags(result[:description]) if result[:description]

+    html_options[:href] = "?mlat=#{result[:lat]}&mlon=#{result[:lon]}&zoom=#{result[:zoom]}"

     html = ""
     html << result[:prefix] if result[:prefix]
     html = ""
     html << result[:prefix] if result[:prefix]

-    html << link_to_function(result[:name], "setPosition(#{result[:lat]}, #{result[:lon]}, #{result[:zoom]})", html_options)  if result[:name]
+    html << " " if result[:prefix] and result[:name]
+    html << link_to_function(result[:name],"setPosition(#{result[:lat]}, #{result[:lon]}, #{result[:zoom]})", html_options)  if result[:name]

     html << result[:suffix] if result[:suffix]
     return html
   end
     html << result[:suffix] if result[:suffix]
     return html
   end