Merge pull request #4610 from AntonKhorev/no-old-note-api

[rails.git] / lib / nominatim.rb

diff --git a/lib/nominatim.rb b/lib/nominatim.rb
index 10eac78e5db335d2d2fe43a3f6514821c20de4d5..adb041da43857799d2bdbea0a8a1c018e1d536e6 100644 (file)
--- a/lib/nominatim.rb
+++ b/lib/nominatim.rb
@@ -1,23 +1,25 @@
 module Nominatim
 module Nominatim

+  require "timeout"
+

   extend ActionView::Helpers::NumberHelper
 
   def self.describe_location(lat, lon, zoom = nil, language = nil)
     zoom ||= 14
   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
 
     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 = "#{Settings.nominatim_url}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"

 
       begin
 
       begin

-        response = OSM::Timer.timeout(4) do
+        response = Timeout.timeout(4) do

           REXML::Document.new(Net::HTTP.get(URI.parse(url)))
         end
           REXML::Document.new(Net::HTTP.get(URI.parse(url)))
         end

-      rescue Exception
+      rescue StandardError

         response = nil
       end
 
       if response && result = response.get_text("reversegeocode/result")
         response = nil
       end
 
       if response && result = response.get_text("reversegeocode/result")

-        result.to_s
+        result.value

       else
         "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}"
       end
       else
         "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}"
       end