Fix path for icons in the leaflet images directory

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

diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb
index 879b1dca1c3a989db6483615cea50396d23d6096..d8dc8c5582088fee816a3580f00725955a2d8d26 100644 (file)
--- a/app/helpers/geocoder_helper.rb
+++ b/app/helpers/geocoder_helper.rb
@@ -1,11 +1,28 @@
 module GeocoderHelper
   def result_to_html(result)
-    html_options = {}
-    #html_options[:title] = strip_tags(result[:description]) if result[:description]
+    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
+
+    result.each do |key, value|
+      html_options[:data][key.to_s.tr("_", "-")] = value
+    end
+
     html = ""
     html << result[:prefix] if result[:prefix]
-    html << link_to_function(result[:name], "setPosition(#{result[:lat]}, #{result[:lon]}, #{result[:zoom]})", html_options) 
+    html << " " if result[:prefix] && result[:name]
+    html << link_to(result[:name], url, html_options) if result[:name]
     html << result[:suffix] if result[:suffix]
-    return html
+    html.html_safe
+  end
+
+  def describe_location(lat, lon, zoom = nil, language = nil)
+    Nominatim.describe_location(lat, lon, zoom, language)
   end
 end