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 e7d0ddf6c1d9cc8c27610ecc8d395a249036c6ca..f819c1ac5ca665607218f671512988a7d7466b12 100644 (file)
--- a/app/helpers/geocoder_helper.rb
+++ b/app/helpers/geocoder_helper.rb
@@ -1,13 +1,29 @@
 module GeocoderHelper
   def result_to_html(result)
 module GeocoderHelper
   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_options = { :class => "set_position stretched-link", :data => {} }
+
+    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
+    end
+
+    html = []

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

-    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 << " " 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 << result[:suffix] if result[:suffix]

-    return html
+    safe_join(html)
+  end
+
+  def describe_location(lat, lon, zoom = nil, language = nil)
+    Nominatim.describe_location(lat, lon, zoom, language)

   end
 end
   end
 end