From: Tom Hughes <tom@compton.nu>
Date: Wed, 7 Sep 2022 07:45:27 +0000 (+0100)
Subject: Use nominatim_url setting more consistently
X-Git-Tag: live~1655
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/fa93526f76cf08445e910a5f81053db1bed87d70

Use nominatim_url setting more consistently
---

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 48d3505dc..02f00ff7f 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -167,7 +167,8 @@ class GeocoderController < ApplicationController
 
     render :action => "results"
   rescue StandardError => e
-    @error = "Error contacting nominatim.openstreetmap.org: #{e}"
+    host = URI(Settings.nominatim_url).host
+    @error = "Error contacting #{host}: #{e}"
     render :action => "error"
   end
 
@@ -231,7 +232,8 @@ class GeocoderController < ApplicationController
 
     render :action => "results"
   rescue StandardError => e
-    @error = "Error contacting nominatim.openstreetmap.org: #{e}"
+    host = URI(Settings.nominatim_url).host
+    @error = "Error contacting #{host}: #{e}"
     render :action => "error"
   end
 
diff --git a/lib/nominatim.rb b/lib/nominatim.rb
index fd0855fc9..f847ec84e 100644
--- 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