X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fe8d5c05731841436657b0bef359575fc4b2fe51..bf9dd8f350ca1b54afb79dda79506d980ccb5738:/app/helpers/geocoder_helper.rb

diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb
index f5519ddc3..161bb2d6d 100644
--- a/app/helpers/geocoder_helper.rb
+++ b/app/helpers/geocoder_helper.rb
@@ -2,42 +2,28 @@ 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]}"
-    else
-      url = "?mlat=#{result[:lat]}&mlon=#{result[:lon]}&zoom=#{result[:zoom]}"
-    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]
-
-    return raw(html)
+    html.html_safe
   end
 
   def describe_location(lat, lon, zoom = nil, language = nil)
-    zoom = zoom || 14
-    language = language || request.user_preferred_languages.join(',')
-    url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
-
-    begin
-      response = OSM::Timer.timeout(4) do
-        REXML::Document.new(Net::HTTP.get(URI.parse(url)))
-      end
-    rescue Exception
-      response = nil
-    end
-
-    if response and result = response.get_text("reversegeocode/result")
-      result.to_s
-    else
-      "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}"
-    end
+    Nominatim.describe_location(lat, lon, zoom, language)
   end
 end