From: Anton Khorev <tony29@yandex.ru>
Date: Wed, 10 Jul 2024 14:20:30 +0000 (+0300)
Subject: Merge branch 'pull/4957'
X-Git-Tag: live~331
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/aad7dc3d24393a2575712dd1f1113774f427de85?hp=a897795c3bc65b2632315d96033ff767699bd16b

Merge branch 'pull/4957'
---

diff --git a/lib/nominatim.rb b/lib/nominatim.rb
index adb041da4..5e4a18b51 100644
--- a/lib/nominatim.rb
+++ b/lib/nominatim.rb
@@ -11,14 +11,16 @@ module Nominatim
       url = "#{Settings.nominatim_url}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
 
       begin
-        response = Timeout.timeout(4) do
-          REXML::Document.new(Net::HTTP.get(URI.parse(url)))
+        response = OSM.http_client.get(URI.parse(url)) do |request|
+          request.options.timeout = 4
         end
+
+        results = REXML::Document.new(response.body) if response.success?
       rescue StandardError
-        response = nil
+        results = nil
       end
 
-      if response && result = response.get_text("reversegeocode/result")
+      if results && result = results.get_text("reversegeocode/result")
         result.value
       else
         "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}"
diff --git a/lib/osm.rb b/lib/osm.rb
index dd273418e..46f37036f 100644
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -535,7 +535,8 @@ module OSM
 
   # Return the HTTP client to use
   def self.http_client
-    @http_client ||= Faraday.new(:request => { :timeout => 15 })
+    @http_client ||= Faraday.new(:request => { :timeout => 15 },
+                                 :headers => { :user_agent => Settings.server_url })
   end
 
   # Return the MaxMindDB database handle