Merge remote-tracking branch 'upstream/pull/4095'

[rails.git] / lib / nominatim.rb

diff --git a/lib/nominatim.rb b/lib/nominatim.rb
index fd0855fc9e02bf81e091ff443eb2713cce53e00c..adb041da43857799d2bdbea0a8a1c018e1d536e6 100644 (file)
--- a/lib/nominatim.rb
+++ b/lib/nominatim.rb
@@ -8,7 +8,7 @@ module Nominatim
     language ||= http_accept_language.user_preferred_languages.join(",")
 
     Rails.cache.fetch "/nominatim/location/#{lat}/#{lon}/#{zoom}/#{language}" do
-      url = "https://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 = Timeout.timeout(4) do
@@ -19,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