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

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

diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb
index 082f9e5304180aed93ed6a01f359f65debc4158c..f819c1ac5ca665607218f671512988a7d7466b12 100644 (file)
--- a/app/helpers/geocoder_helper.rb
+++ b/app/helpers/geocoder_helper.rb
@@ -1,25 +1,29 @@
 module GeocoderHelper
   def result_to_html(result)
-    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] = raw("?minlon=#{result[:min_lon]}&minlat=#{result[:min_lat]}&maxlon=#{result[:max_lon]}&maxlat=#{result[:max_lat]}")
-    else
-      html_options[:href] = raw("?mlat=#{result[:lat]}&mlon=#{result[:lon]}&zoom=#{result[:zoom]}")
-    end
+    html_options = { :class => "set_position stretched-link", :data => {} }
 
-    html = ""
-    html << result[:prefix] if result[:prefix]
-    html << " " if result[:prefix] and result[:name]
+    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
 
-    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]}, 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]
+    result.each do |key, value|
+      html_options[:data][key.to_s.tr("_", "-")] = value
     end
 
+    html = []
+    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]
+    safe_join(html)
+  end
 
-    return raw(html)
+  def describe_location(lat, lon, zoom = nil, language = nil)
+    Nominatim.describe_location(lat, lon, zoom, language)
   end
 end