Send plain errors for non HTML resources

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

diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb
index c74cba28e32c062d3e9d54dc1c11fae99f1bb8aa..1826b08a4f269354e52d44f7eb8d1ca0cd50e7ff 100644 (file)
--- a/app/helpers/geocoder_helper.rb
+++ b/app/helpers/geocoder_helper.rb
@@ -2,29 +2,25 @@ 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[:min_lon] and result[:min_lat] and result[:max_lon] and result[:max_lat]
-      url = "?minlon=#{result[:min_lon]}&minlat=#{result[:min_lat]}&maxlon=#{result[:max_lon]}&maxlat=#{result[:max_lat]}"
-    else
-      url = "?mlat=#{result[:lat]}&mlon=#{result[:lon]}&zoom=#{result[:zoom]}"
-    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

     end
 
     end
 

-    html = ""
+    html = []

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

-    html << " " if result[:prefix] and result[:name]
+    html << " " if result[:prefix] && result[:name]

     html << link_to(result[:name], url, html_options) if 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 << result[:suffix] if result[:suffix]

-
-    if result[:type] and result[:id]
-      html << content_tag(:small, :class => ["deemphasize", "search_details"]) do
-        link_to(t("browse.#{result[:type]}_history.view_details"), :controller => :browse, :action => result[:type], :id => result[:id])
-      end
-    end
-
-    return raw(html)
+    safe_join(html)

   end
 
   def describe_location(lat, lon, zoom = nil, language = nil)
   end
 
   def describe_location(lat, lon, zoom = nil, language = nil)