X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/20a861392e1ee7970da5d95b546aa8551faaf27b..edd49e85823079d6de19cbc9f89c6abc0568382b:/app/helpers/geocoder_helper.rb?ds=sidebyside diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb index e7d0ddf6c..161bb2d6d 100644 --- a/app/helpers/geocoder_helper.rb +++ b/app/helpers/geocoder_helper.rb @@ -1,13 +1,29 @@ 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_options = { :class => "set_position", :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 << " " 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] - return html + html.html_safe + end + + def describe_location(lat, lon, zoom = nil, language = nil) + Nominatim.describe_location(lat, lon, zoom, language) end end