X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9a9b045372a6f48420a9a6dacfde52c34ab7abce..b0c17047a12eca962fa02146e2a3a70b9bcc916e:/lib/nominatim.rb

diff --git a/lib/nominatim.rb b/lib/nominatim.rb
index 97d158cfd..adb041da4 100644
--- a/lib/nominatim.rb
+++ b/lib/nominatim.rb
@@ -1,4 +1,6 @@
 module Nominatim
+  require "timeout"
+
   extend ActionView::Helpers::NumberHelper
 
   def self.describe_location(lat, lon, zoom = nil, language = nil)
@@ -6,10 +8,10 @@ module Nominatim
     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 StandardError
@@ -17,7 +19,7 @@ module Nominatim
       end
 
       if response && result = response.get_text("reversegeocode/result")
-        result.to_s
+        result.value
       else
         "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}"
       end