Try harder to find a name in the right language

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

diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb
index 8f662bde73d304e7944b3c1195dca1b2cf407db1..04f437a7c47b4592729f843254a570b0ffa89901 100644 (file)
--- a/app/helpers/geocoder_helper.rb
+++ b/app/helpers/geocoder_helper.rb
@@ -2,10 +2,12 @@ module GeocoderHelper
   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]}"
+    if result[:type] and result[:id]
+      url = url_for(:controller => :browse, :action => result[:type], :id => result[:id])
+    elsif result[:min_lon] and result[:min_lat] and result[:max_lon] and result[:max_lat]
+      url = "/?bbox=#{result[:min_lon]},#{result[:min_lat]},#{result[:max_lon]},#{result[:max_lat]}"
     else
-      url = "?mlat=#{result[:lat]}&mlon=#{result[:lon]}&zoom=#{result[:zoom]}"
+      url = "/#map=#{result[:zoom]}/#{result[:lat]}/#{result[:lon]}"
     end
 
     result.each do |key,value|
@@ -17,8 +19,7 @@ module GeocoderHelper
     html << " " if result[:prefix] and result[:name]
     html << link_to(result[:name], url, html_options) if result[:name]
     html << result[:suffix] if result[:suffix]
-
-    return raw(html)
+    html.html_safe
   end
 
   def describe_location(lat, lon, zoom = nil, language = nil)