Merge pull request #2266 from systemed/patch-2

[rails.git] / lib / nominatim.rb

diff --git a/lib/nominatim.rb b/lib/nominatim.rb
index 10eac78e5db335d2d2fe43a3f6514821c20de4d5..ffa86d93fee3592bf5a22d975c387319c0688083 100644 (file)
--- a/lib/nominatim.rb
+++ b/lib/nominatim.rb
@@ -3,16 +3,16 @@ module Nominatim
 
   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
           REXML::Document.new(Net::HTTP.get(URI.parse(url)))
         end
-      rescue Exception
+      rescue StandardError
         response = nil
       end