X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/15b104f4ff4614aa78c01180b6a9b89dd5a1400f..11e81c5398bb43d35c1b12421f7a6be2ca5b7047:/lib/nominatim.rb diff --git a/lib/nominatim.rb b/lib/nominatim.rb index 97d158cfd..fd0855fc9 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,10 +8,10 @@ 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 = "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