X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1779347849622ade2abf4926a2db867d69f72033..691352136ab17e4a84394a5b80e758c8a1ce92a0:/app/helpers/geocoder_helper.rb diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb index c74cba28e..04f437a7c 100644 --- a/app/helpers/geocoder_helper.rb +++ b/app/helpers/geocoder_helper.rb @@ -2,10 +2,12 @@ module GeocoderHelper def result_to_html(result) html_options = { :class => "set_position", :data => {} } - if result[:min_lon] and result[:min_lat] and result[:max_lon] and result[:max_lat] - url = "?minlon=#{result[:min_lon]}&minlat=#{result[:min_lat]}&maxlon=#{result[:max_lon]}&maxlat=#{result[:max_lat]}" + 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 = "?mlat=#{result[:lat]}&mlon=#{result[:lon]}&zoom=#{result[:zoom]}" + url = "/#map=#{result[:zoom]}/#{result[:lat]}/#{result[:lon]}" end result.each do |key,value| @@ -17,14 +19,7 @@ module GeocoderHelper html << " " if result[:prefix] and result[:name] html << link_to(result[:name], url, html_options) if result[:name] html << result[:suffix] if result[:suffix] - - if result[:type] and result[:id] - html << content_tag(:small, :class => ["deemphasize", "search_details"]) do - link_to(t("browse.#{result[:type]}_history.view_details"), :controller => :browse, :action => result[:type], :id => result[:id]) - end - end - - return raw(html) + html.html_safe end def describe_location(lat, lon, zoom = nil, language = nil)