Use nominatim_url setting more consistently

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 48d3505dc94aca358794c7c7e37a62be1e397f07..02f00ff7f3bf301bf10269ea685c0e99331d9dc5 100644 (file)
--- 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
 
     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
 
     render :action => "error"
   end
 


@@ -231,7 +232,8 @@ class GeocoderController < ApplicationController
 
     render :action => "results"
   rescue StandardError => e
 
     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
 
     render :action => "error"
   end
 

diff --git a/lib/nominatim.rb b/lib/nominatim.rb
index fd0855fc9e02bf81e091ff443eb2713cce53e00c..f847ec84e323e2a6871f35e824b7d7e7bb53ff35 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
     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
 
       begin
         response = Timeout.timeout(4) do