cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use nominatim_url setting more consistently

Browse source
This commit is contained in:
Tom Hughes 2022-09-07 08:45:27 +01:00
parent d4da1dce97
commit fa93526f76
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/geocoder_controller.rb
View file

@ -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

2
lib/nominatim.rb
View file

@ -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