X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0c8ad2f86edefed72052b402742cadedb0d674d9..e11c70f751b69d2d675064d1952cd01d069b4654:/lib/nominatim.rb

diff --git a/lib/nominatim.rb b/lib/nominatim.rb
index 1d2037d8d..adb041da4 100644
--- a/lib/nominatim.rb
+++ b/lib/nominatim.rb
@@ -1,23 +1,25 @@
 module Nominatim
+  require "timeout"
+
   extend ActionView::Helpers::NumberHelper
 
   def self.describe_location(lat, lon, zoom = nil, language = nil)
-    zoom = zoom || 14
-    language = language || request.user_preferred_languages.join(',')
+    zoom ||= 14
+    language ||= http_accept_language.user_preferred_languages.join(",")
 
     Rails.cache.fetch "/nominatim/location/#{lat}/#{lon}/#{zoom}/#{language}" do
-      url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
+      url = "#{Settings.nominatim_url}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
 
       begin
-        response = OSM::Timer.timeout(4) do
+        response = Timeout.timeout(4) do
           REXML::Document.new(Net::HTTP.get(URI.parse(url)))
         end
-      rescue Exception
+      rescue StandardError
         response = nil
       end
 
-      if response and result = response.get_text("reversegeocode/result")
-        result.to_s
+      if response && result = response.get_text("reversegeocode/result")
+        result.value
       else
         "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}"
       end