X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e409e83b4886ce918c64f5c4cd7fa30cbc1ba14f..9fded0245046b4078c4af1714910c49621b83b4c:/lib/nominatim.rb diff --git a/lib/nominatim.rb b/lib/nominatim.rb index f847ec84e..5e4a18b51 100644 --- a/lib/nominatim.rb +++ b/lib/nominatim.rb @@ -11,15 +11,17 @@ 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") - result.to_s + if results && result = results.get_text("reversegeocode/result") + result.value else "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}" end