X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cb87f02642d0097ebc067ca1f9371dde274a41e3..9fc2a5c4e9c2d0bc7df5493b5b74345992aa9dfa:/lib/nominatim.rb diff --git a/lib/nominatim.rb b/lib/nominatim.rb index 97d158cfd..5e4a18b51 100644 --- a/lib/nominatim.rb +++ b/lib/nominatim.rb @@ -1,4 +1,6 @@ module Nominatim + require "timeout" + extend ActionView::Helpers::NumberHelper def self.describe_location(lat, lon, zoom = nil, language = nil) @@ -6,18 +8,20 @@ module Nominatim language ||= http_accept_language.user_preferred_languages.join(",") Rails.cache.fetch "/nominatim/location/#{lat}/#{lon}/#{zoom}/#{language}" do - url = "http://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 = OSM::Timer.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