X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5fe5777a58751e3626f645d57dafb0dd854586ec..f051a7c1f5d1999558caa9d3cbe8c36f8ac39c9b:/lib/nominatim.rb diff --git a/lib/nominatim.rb b/lib/nominatim.rb index 5b1c7ac32..5e4a18b51 100644 --- a/lib/nominatim.rb +++ b/lib/nominatim.rb @@ -1,21 +1,27 @@ module Nominatim + require "timeout" + + extend ActionView::Helpers::NumberHelper + def self.describe_location(lat, lon, zoom = nil, language = nil) - zoom = zoom || 14 - language = language || request.user_preferred_languages.join(',') + zoom ||= 14 + 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 - rescue Exception - response = nil + + results = REXML::Document.new(response.body) if response.success? + rescue StandardError + results = nil end - if response and 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