X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0a3aba7f891ba55a5500f02907cec15d44554eae..5fe5777a58751e3626f645d57dafb0dd854586ec:/app/helpers/geocoder_helper.rb diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb index f5519ddc3..8f662bde7 100644 --- a/app/helpers/geocoder_helper.rb +++ b/app/helpers/geocoder_helper.rb @@ -22,22 +22,6 @@ module GeocoderHelper end def describe_location(lat, lon, zoom = nil, language = nil) - zoom = zoom || 14 - language = language || request.user_preferred_languages.join(',') - url = "http://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 - response = nil - end - - if response and result = response.get_text("reversegeocode/result") - result.to_s - else - "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}" - end + Nominatim.describe_location(lat, lon, zoom, language) end end