X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/baf10cd39289cd7e94a819305e46f43e85a136c6..f4d1d97848306e71b6525c58f2e5691b8aa686b7:/lib/nominatim.rb diff --git a/lib/nominatim.rb b/lib/nominatim.rb index c5d60cebd..fd0855fc9 100644 --- a/lib/nominatim.rb +++ b/lib/nominatim.rb @@ -1,15 +1,17 @@ module Nominatim + require "timeout" + extend ActionView::Helpers::NumberHelper def self.describe_location(lat, lon, zoom = nil, language = nil) zoom ||= 14 - language ||= http_accept_language.user_preferred_languages.join(',') + 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 = "https://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}" begin - response = OSM::Timer.timeout(4) do + response = Timeout.timeout(4) do REXML::Document.new(Net::HTTP.get(URI.parse(url))) end rescue StandardError