Merge remote-tracking branch 'openstreetmap/pull/1045'

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

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index be4f0570c828c298dedda67fd3446a0aed5686bd..b6fb455eee3b6631e39f0be605ee3fe7fc2c6ccf 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"
 class GeocoderController < ApplicationController
   require "cgi"
   require "uri"

-  require "net/http"

   require "rexml/document"
 
   before_action :authorize_web
   require "rexml/document"
 
   before_action :authorize_web


@@ -14,25 +13,32 @@ class GeocoderController < ApplicationController
     normalize_params
 
     @sources = []
     normalize_params
 
     @sources = []

+

     if params[:lat] && params[:lon]
       @sources.push "latlon"
       @sources.push "osm_nominatim_reverse"
       @sources.push "geonames_reverse" if defined?(GEONAMES_USERNAME)
     if params[:lat] && params[:lon]
       @sources.push "latlon"
       @sources.push "osm_nominatim_reverse"
       @sources.push "geonames_reverse" if defined?(GEONAMES_USERNAME)

-    elsif params[:query].match(/^\d{5}(-\d{4})?$/)
-      @sources.push "us_postcode"
-      @sources.push "osm_nominatim"
-    elsif params[:query].match(/^(GIR 0AA|[A-PR-UWYZ]([0-9]{1,2}|([A-HK-Y][0-9]|[A-HK-Y][0-9]([0-9]|[ABEHMNPRV-Y]))|[0-9][A-HJKS-UW])\s*[0-9][ABD-HJLNP-UW-Z]{2})$/i)
-      @sources.push "uk_postcode"
-      @sources.push "osm_nominatim"
-    elsif params[:query].match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i)
-      @sources.push "ca_postcode"
-      @sources.push "osm_nominatim"
-    else
-      @sources.push "osm_nominatim"
-      @sources.push "geonames" if defined?(GEONAMES_USERNAME)
+    elsif params[:query]
+      if params[:query].match(/^\d{5}(-\d{4})?$/)
+        @sources.push "us_postcode"
+        @sources.push "osm_nominatim"
+      elsif params[:query].match(/^(GIR 0AA|[A-PR-UWYZ]([0-9]{1,2}|([A-HK-Y][0-9]|[A-HK-Y][0-9]([0-9]|[ABEHMNPRV-Y]))|[0-9][A-HJKS-UW])\s*[0-9][ABD-HJLNP-UW-Z]{2})$/i)
+        @sources.push "uk_postcode"
+        @sources.push "osm_nominatim"
+      elsif params[:query].match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i)
+        @sources.push "ca_postcode"
+        @sources.push "osm_nominatim"
+      else
+        @sources.push "osm_nominatim"
+        @sources.push "geonames" if defined?(GEONAMES_USERNAME)
+      end

     end
 
     end
 

-    render :layout => map_layout
+    if @sources.empty?
+      render :text => "", :status => :bad_request
+    else
+      render :layout => map_layout
+    end

   end
 
   def search_latlon
   end
 
   def search_latlon


@@ -92,7 +98,7 @@ class GeocoderController < ApplicationController
     unless response.match(/Error/)
       dataline = response.split(/\n/)[1]
       data = dataline.split(/,/) # easting,northing,postcode,lat,long
     unless response.match(/Error/)
       dataline = response.split(/\n/)[1]
       data = dataline.split(/,/) # easting,northing,postcode,lat,long

-      postcode = data[2].gsub(/'/, "")
+      postcode = data[2].delete("'")

       zoom = POSTCODE_ZOOM - postcode.count("#")
       @results.push(:lat => data[3], :lon => data[4], :zoom => zoom,
                     :name => postcode)
       zoom = POSTCODE_ZOOM - postcode.count("#")
       @results.push(:lat => data[3], :lon => data[4], :zoom => zoom,
                     :name => postcode)


@@ -168,7 +174,7 @@ class GeocoderController < ApplicationController
       if type.empty?
         prefix_name = ""
       else
       if type.empty?
         prefix_name = ""
       else

-        prefix_name = t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.gsub("_", " ").capitalize
+        prefix_name = t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.tr("_", " ").capitalize

       end
       if klass == "boundary" && type == "administrative"
         rank = (place.attributes["place_rank"].to_i + 1) / 2
       end
       if klass == "boundary" && type == "administrative"
         rank = (place.attributes["place_rank"].to_i + 1) / 2


@@ -186,9 +192,9 @@ class GeocoderController < ApplicationController
     end
 
     render :action => "results"
     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
   end
 
   def search_geonames


@@ -218,7 +224,7 @@ class GeocoderController < ApplicationController
 
     render :action => "results"
   rescue StandardError => ex
 
     render :action => "results"
   rescue StandardError => ex

-    @error = "Error contacting ws.geonames.org: #{ex}"
+    @error = "Error contacting api.geonames.org: #{ex}"

     render :action => "error"
   end
 
     render :action => "error"
   end
 


@@ -280,49 +286,26 @@ class GeocoderController < ApplicationController
 
     render :action => "results"
   rescue StandardError => ex
 
     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)
     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
 
   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
   def escape_query(query)
     URI.escape(query, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]", false, "N"))
   end