Make blank role icons transparent

[rails.git] / lib / nominatim.rb

diff --git a/lib/nominatim.rb b/lib/nominatim.rb
index 97d158cfdf98f10bc47526c0b397f813b0283a8e..adb041da43857799d2bdbea0a8a1c018e1d536e6 100644 (file)
--- a/lib/nominatim.rb
+++ b/lib/nominatim.rb
@@ -1,4 +1,6 @@
 module Nominatim
 module Nominatim

+  require "timeout"
+

   extend ActionView::Helpers::NumberHelper
 
   def self.describe_location(lat, lon, zoom = nil, language = nil)
   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
     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 = "#{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
       rescue StandardError
           REXML::Document.new(Net::HTTP.get(URI.parse(url)))
         end
       rescue StandardError


@@ -17,7 +19,7 @@ module Nominatim
       end
 
       if response && result = response.get_text("reversegeocode/result")
       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