X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/344c5534ee328243ce8f5787e0ef6c3dcbf87b15..14086728a63933dffdceb9f5e5f25422fc288969:/app/helpers/geocoder_helper.rb diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb index 4c58d54dd..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,7 +19,10 @@ 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] + html.html_safe + end - return raw(html) + def describe_location(lat, lon, zoom = nil, language = nil) + Nominatim.describe_location(lat, lon, zoom, language) end end