From fa93526f76cf08445e910a5f81053db1bed87d70 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 7 Sep 2022 08:45:27 +0100 Subject: [PATCH] Use nominatim_url setting more consistently --- app/controllers/geocoder_controller.rb | 6 ++++-- lib/nominatim.rb | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) 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 -- 2.45.1