Merge remote-tracking branch 'upstream/pull/2642'

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

diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb
index d8dc8c5582088fee816a3580f00725955a2d8d26..161bb2d6de57369c322c0e30ba5d50dc37c14850 100644 (file)
--- a/app/helpers/geocoder_helper.rb
+++ b/app/helpers/geocoder_helper.rb
@@ -2,13 +2,13 @@ module GeocoderHelper
   def result_to_html(result)
     html_options = { :class => "set_position", :data => {} }
 
   def result_to_html(result)
     html_options = { :class => "set_position", :data => {} }
 

-    if result[:type] && result[:id]
-      url = url_for(:controller => :browse, :action => result[:type], :id => result[:id])
-    elsif result[:min_lon] && result[:min_lat] && result[:max_lon] && result[:max_lat]
-      url = "/?bbox=#{result[:min_lon]},#{result[:min_lat]},#{result[:max_lon]},#{result[:max_lat]}"
-    else
-      url = "/#map=#{result[:zoom]}/#{result[:lat]}/#{result[:lon]}"
-    end
+    url = if result[:type] && result[:id]
+            url_for(:controller => :browse, :action => result[:type], :id => result[:id])
+          elsif result[:min_lon] && result[:min_lat] && result[:max_lon] && result[:max_lat]
+            "/?bbox=#{result[:min_lon]},#{result[:min_lat]},#{result[:max_lon]},#{result[:max_lat]}"
+          else
+            "/#map=#{result[:zoom]}/#{result[:lat]}/#{result[:lon]}"
+          end

 
     result.each do |key, value|
       html_options[:data][key.to_s.tr("_", "-")] = value
 
     result.each do |key, value|
       html_options[:data][key.to_s.tr("_", "-")] = value


@@ -18,6 +18,7 @@ module GeocoderHelper
     html << result[:prefix] if result[:prefix]
     html << " " if result[:prefix] && result[:name]
     html << link_to(result[:name], url, html_options) if result[:name]
     html << result[:prefix] if result[:prefix]
     html << " " if result[:prefix] && result[:name]
     html << link_to(result[:name], url, html_options) if result[:name]

+    html << " " if result[:suffix] && result[:name]

     html << result[:suffix] if result[:suffix]
     html.html_safe
   end
     html << result[:suffix] if result[:suffix]
     html.html_safe
   end