X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fc891d9caae886cedf864dce7e1ec7754bac6def..bf9dd8f350ca1b54afb79dda79506d980ccb5738:/app/helpers/geocoder_helper.rb?ds=inline diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb index 04f437a7c..161bb2d6d 100644 --- a/app/helpers/geocoder_helper.rb +++ b/app/helpers/geocoder_helper.rb @@ -2,22 +2,23 @@ module GeocoderHelper def result_to_html(result) html_options = { :class => "set_position", :data => {} } - if result[:type] and result[:id] - url = url_for(:controller => :browse, :action => result[:type], :id => result[:id]) - elsif result[:min_lon] and result[:min_lat] and result[:max_lon] and 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 + 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 + 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 << " " 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.html_safe end