Fix warnings from rubocop update

[rails.git] / app / controllers / geocoder_controller.rb

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index be4f0570c828c298dedda67fd3446a0aed5686bd..2a3012892d736225d9c0fe86166cf529ae49f990 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -3,7 +3,6 @@
 class GeocoderController < ApplicationController
   require "cgi"
   require "uri"
-  require "net/http"
   require "rexml/document"
 
   before_action :authorize_web
@@ -186,9 +185,9 @@ class GeocoderController < ApplicationController
     end
 
     render :action => "results"
-    #  rescue StandardError => ex
-    #    @error = "Error contacting nominatim.openstreetmap.org: #{ex.to_s}"
-    #    render :action => "error"
+  rescue StandardError => ex
+    @error = "Error contacting nominatim.openstreetmap.org: #{ex}"
+    render :action => "error"
   end
 
   def search_geonames
@@ -218,7 +217,7 @@ class GeocoderController < ApplicationController
 
     render :action => "results"
   rescue StandardError => ex
-    @error = "Error contacting ws.geonames.org: #{ex}"
+    @error = "Error contacting api.geonames.org: #{ex}"
     render :action => "error"
   end
 
@@ -280,49 +279,26 @@ class GeocoderController < ApplicationController
 
     render :action => "results"
   rescue StandardError => ex
-    @error = "Error contacting ws.geonames.org: #{ex}"
+    @error = "Error contacting api.geonames.org: #{ex}"
     render :action => "error"
   end
 
   private
 
   def fetch_text(url)
-    Net::HTTP.get(URI.parse(url))
+    response = OSM.http_client.get(URI.parse(url))
+
+    if response.success?
+      response.body
+    else
+      fail response.status.to_s
+    end
   end
 
   def fetch_xml(url)
     REXML::Document.new(fetch_text(url))
   end
 
-  def format_distance(distance)
-    t("geocoder.distance", :count => distance)
-  end
-
-  def format_direction(bearing)
-    return t("geocoder.direction.south_west") if bearing >= 22.5 && bearing < 67.5
-    return t("geocoder.direction.south") if bearing >= 67.5 && bearing < 112.5
-    return t("geocoder.direction.south_east") if bearing >= 112.5 && bearing < 157.5
-    return t("geocoder.direction.east") if bearing >= 157.5 && bearing < 202.5
-    return t("geocoder.direction.north_east") if bearing >= 202.5 && bearing < 247.5
-    return t("geocoder.direction.north") if bearing >= 247.5 && bearing < 292.5
-    return t("geocoder.direction.north_west") if bearing >= 292.5 && bearing < 337.5
-    t("geocoder.direction.west")
-  end
-
-  def format_name(name)
-    name.gsub(/( *\[[^\]]*\])*$/, "")
-  end
-
-  def count_results(results)
-    count = 0
-
-    results.each do |source|
-      count += source[:results].length if source[:results]
-    end
-
-    count
-  end
-
   def escape_query(query)
     URI.escape(query, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]", false, "N"))
   end