X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0166abe88a2c082500f208d6f6be1343e6d0bedd..84aa7f455ae58b4b051368e35dbc43f780b3aa0f:/app/helpers/geocoder_helper.rb diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb index 254412b51..882f2c835 100644 --- a/app/helpers/geocoder_helper.rb +++ b/app/helpers/geocoder_helper.rb @@ -1,19 +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 = "" - html << result[:prefix] if result[:prefix] - html << " " if result[:prefix] and result[:name] + html_options = { :class => "set_position stretched-link", :data => {} } + + url = if result[:type] && result[:id] + url_for(:controller => result[:type].pluralize, :action => :show, :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]}, #{result[:zoom]}, #{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] - return html + safe_join(html) + end + + def describe_location(lat, lon, zoom = nil, language = nil) + Nominatim.describe_location(lat, lon, zoom, language) end end