Merge remote-tracking branch 'upstream/pull/4686'

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

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 48d3505dc94aca358794c7c7e37a62be1e397f07..912247c9c15d622a88af5ac96a40886d045a3ac0 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -15,19 +15,8 @@ class GeocoderController < ApplicationController
     if @params[:lat] && @params[:lon]
       @sources.push "latlon"
       @sources.push "osm_nominatim_reverse"
     if @params[:lat] && @params[:lon]
       @sources.push "latlon"
       @sources.push "osm_nominatim_reverse"

-      @sources.push "geonames_reverse" if Settings.key?(:geonames_username)

     elsif @params[:query]
     elsif @params[:query]

-      case @params[:query]
-      when /^\d{5}(-\d{4})?$/,
-           /^(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 "osm_nominatim"
-      when /^[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 Settings.key?(:geonames_username)
-      end
+      @sources.push "osm_nominatim"

     end
 
     if @sources.empty?
     end
 
     if @sources.empty?


@@ -81,28 +70,6 @@ class GeocoderController < ApplicationController
     end
   end
 
     end
   end
 

-  def search_ca_postcode
-    # get query parameters
-    query = params[:query]
-    @results = []
-
-    # ask geocoder.ca (note - they have a per-day limit)
-    response = fetch_xml("https://geocoder.ca/?geoit=XML&postal=#{escape_query(query)}")
-
-    # parse the response
-    if response.get_elements("geodata/error").empty?
-      @results.push(:lat => response.text("geodata/latt"),
-                    :lon => response.text("geodata/longt"),
-                    :zoom => Settings.postcode_zoom,
-                    :name => query.upcase)
-    end
-
-    render :action => "results"
-  rescue StandardError => e
-    @error = "Error contacting geocoder.ca: #{e}"
-    render :action => "error"
-  end
-

   def search_osm_nominatim
     # get query parameters
     query = params[:query]
   def search_osm_nominatim
     # get query parameters
     query = params[:query]


@@ -121,10 +88,7 @@ class GeocoderController < ApplicationController
     response = fetch_xml("#{Settings.nominatim_url}search?format=xml&extratags=1&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}")
 
     # extract the results from the response
     response = fetch_xml("#{Settings.nominatim_url}search?format=xml&extratags=1&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}")
 
     # extract the results from the response

-    results =  response.elements["searchresults"]
-
-    # extract parameters from more_url
-    more_url_params = CGI.parse(URI.parse(results.attributes["more_url"]).query)
+    results = response.elements["searchresults"]

 
     # create result array
     @results = []
 
     # create result array
     @results = []


@@ -132,7 +96,7 @@ class GeocoderController < ApplicationController
     # create parameter hash for "more results" link
     @more_params = params
                    .permit(:query, :minlon, :minlat, :maxlon, :maxlat, :exclude)
     # create parameter hash for "more results" link
     @more_params = params
                    .permit(:query, :minlon, :minlat, :maxlon, :maxlat, :exclude)

-                   .merge(:exclude => more_url_params["exclude_place_ids"].first)
+                   .merge(:exclude => results.attributes["exclude_place_ids"])

 
     # parse the response
     results.elements.each("place") do |place|
 
     # parse the response
     results.elements.each("place") do |place|


@@ -154,7 +118,7 @@ class GeocoderController < ApplicationController
           prefix_name = t "geocoder.search_osm_nominatim.prefix.place.#{extratag.attributes['value']}", :default => prefix_name if extratag.attributes["key"] == "linked_place" || extratag.attributes["key"] == "place"
         end
       end
           prefix_name = t "geocoder.search_osm_nominatim.prefix.place.#{extratag.attributes['value']}", :default => prefix_name if extratag.attributes["key"] == "linked_place" || extratag.attributes["key"] == "place"
         end
       end

-      prefix = t "geocoder.search_osm_nominatim.prefix_format", :name => prefix_name
+      prefix = t ".prefix_format", :name => prefix_name

       object_type = place.attributes["osm_type"]
       object_id = place.attributes["osm_id"]
 
       object_type = place.attributes["osm_type"]
       object_id = place.attributes["osm_id"]
 


@@ -167,39 +131,8 @@ class GeocoderController < ApplicationController
 
     render :action => "results"
   rescue StandardError => e
 
     render :action => "results"
   rescue StandardError => e

-    @error = "Error contacting nominatim.openstreetmap.org: #{e}"
-    render :action => "error"
-  end
-
-  def search_geonames
-    # get query parameters
-    query = params[:query]
-
-    # get preferred language
-    lang = I18n.locale.to_s.split("-").first
-
-    # create result array
-    @results = []
-
-    # ask geonames.org
-    response = fetch_xml("http://api.geonames.org/search?q=#{escape_query(query)}&lang=#{lang}&maxRows=20&username=#{Settings.geonames_username}")
-
-    # parse the response
-    response.elements.each("geonames/geoname") do |geoname|
-      lat = geoname.text("lat")
-      lon = geoname.text("lng")
-      name = geoname.text("name")
-      country = geoname.text("countryName")
-
-      @results.push(:lat => lat, :lon => lon,
-                    :zoom => Settings.geonames_zoom,
-                    :name => name,
-                    :suffix => ", #{country}")
-    end
-
-    render :action => "results"
-  rescue StandardError => e
-    @error = "Error contacting api.geonames.org: #{e}"
+    host = URI(Settings.nominatim_url).host
+    @error = "Error contacting #{host}: #{e}"

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


@@ -231,38 +164,8 @@ class GeocoderController < ApplicationController
 
     render :action => "results"
   rescue StandardError => e
 
     render :action => "results"
   rescue StandardError => e

-    @error = "Error contacting nominatim.openstreetmap.org: #{e}"
-    render :action => "error"
-  end
-
-  def search_geonames_reverse
-    # get query parameters
-    lat = params[:lat]
-    lon = params[:lon]
-
-    # get preferred language
-    lang = I18n.locale.to_s.split("-").first
-
-    # create result array
-    @results = []
-
-    # ask geonames.org
-    response = fetch_xml("http://api.geonames.org/countrySubdivision?lat=#{lat}&lng=#{lon}&lang=#{lang}&username=#{Settings.geonames_username}")
-
-    # parse the response
-    response.elements.each("geonames/countrySubdivision") do |geoname|
-      name = geoname.text("adminName1")
-      country = geoname.text("countryName")
-
-      @results.push(:lat => lat, :lon => lon,
-                    :zoom => Settings.geonames_zoom,
-                    :name => name,
-                    :suffix => ", #{country}")
-    end
-
-    render :action => "results"
-  rescue StandardError => e
-    @error = "Error contacting api.geonames.org: #{e}"
+    host = URI(Settings.nominatim_url).host
+    @error = "Error contacting #{host}: #{e}"

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