X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/490226ad6d28cf9eff1fc78c7c69bef750321614..3d1df30f6520be5c2d8998a688efba4700e3852d:/app/helpers/geocoder_helper.rb?ds=sidebyside

diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb
index 735ac8153..f5519ddc3 100644
--- a/app/helpers/geocoder_helper.rb
+++ b/app/helpers/geocoder_helper.rb
@@ -1,6 +1,6 @@
 module GeocoderHelper
   def result_to_html(result)
-    html_options = { :class => "set_position" }
+    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]}"
@@ -9,7 +9,7 @@ module GeocoderHelper
     end
 
     result.each do |key,value|
-      html_options["data-#{key.to_s.tr('_', '-')}"] = value
+      html_options[:data][key.to_s.tr('_', '-')] = value
     end
 
     html = ""
@@ -20,4 +20,24 @@ module GeocoderHelper
 
     return raw(html)
   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
+  end
 end