Upgrade minimum version of ruby to 2.5

[rails.git] / lib / nominatim.rb

diff --git a/lib/nominatim.rb b/lib/nominatim.rb
index 5b1c7ac3203ca92ffdcda856ed3a47ba5a15cc01..ffa86d93fee3592bf5a22d975c387319c0688083 100644 (file)
--- a/lib/nominatim.rb
+++ b/lib/nominatim.rb
@@ -1,20 +1,22 @@
 module Nominatim
 module Nominatim

+  extend ActionView::Helpers::NumberHelper
+

   def self.describe_location(lat, lon, zoom = nil, language = nil)
   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
 
     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
 
       begin
         response = OSM::Timer.timeout(4) do
           REXML::Document.new(Net::HTTP.get(URI.parse(url)))
         end

-      rescue Exception
+      rescue StandardError

         response = nil
       end
 
         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)}"
         result.to_s
       else
         "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}"