X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8090e086daad67eac711ad6fd6a5eba6f28d44fd..a1b179fa384d689e6cb78c2b8d863621e7bff152:/lib/nominatim.rb

diff --git a/lib/nominatim.rb b/lib/nominatim.rb
index 1d2037d8d..ffa86d93f 100644
--- a/lib/nominatim.rb
+++ b/lib/nominatim.rb
@@ -2,21 +2,21 @@ module Nominatim
   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 = "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
 
-      if response and result = response.get_text("reversegeocode/result")
+      if response && result = response.get_text("reversegeocode/result")
         result.to_s
       else
         "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}"