X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e19c04c7a7410dd134df9242c221e8a8bb83e3c6..fcebfd1fe76f3e1076ccd0340916ae5af08f36ab:/app/controllers/geocoder_controller.rb

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index fdde82852..f8821ec36 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -19,13 +19,11 @@ class GeocoderController < ApplicationController
       @sources.push "us_postcode"
     elsif @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" if APP_CONFIG['nominatim_enabled']
-      @sources.push "osm_namefinder"
+      @sources.push "osm_nominatim"
     elsif @query.match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i)
       @sources.push "ca_postcode"
     else
-      @sources.push "osm_nominatim" if APP_CONFIG['nominatim_enabled']
-      @sources.push "osm_namefinder"
+      @sources.push "osm_nominatim"
       @sources.push "geonames"
     end
 
@@ -228,31 +226,38 @@ class GeocoderController < ApplicationController
       viewbox = "&viewbox=#{minlon},#{maxlat},#{maxlon},#{minlat}"
     end
 
+    # get objects to excude
+    if params[:exclude]
+      exclude = "&exclude_place_ids=#{params[:exclude].join(',')}"
+    end
+
+    # ask nominatim
+    response = fetch_xml("http://nominatim.openstreetmap.org/search?format=xml&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{request.user_preferred_languages.join(',')}")
+
     # create result array
     @results = Array.new
 
-    # ask nominatim
-    response = fetch_xml("http://nominatim.openstreetmap.org/search?format=xml&q=#{escape_query(query)}#{viewbox}")
+    # create parameter hash for "more results" link
+    @more_params = params.reverse_merge({ :exclude => [] })
+
+    # extract the results from the response
+    results =  response.elements["searchresults"]
 
     # parse the response
-    response.elements.each("searchresults/place") do |place|
+    results.elements.each("place") do |place|
       lat = place.attributes["lat"].to_s
       lon = place.attributes["lon"].to_s
       klass = place.attributes["class"].to_s
       type = place.attributes["type"].to_s
       name = place.attributes["display_name"].to_s
       min_lat,max_lat,min_lon,max_lon = place.attributes["boundingbox"].to_s.split(",")
-
-      if klass == "highway"
-        prefix = t 'geocoder.search_osm_nominatim.prefix_highway', :type => type.capitalize
-      else
-        prefix = t 'geocoder.search_osm_nominatim.prefix_other', :type => type.capitalize
-      end
+      prefix = t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.gsub("_", " ").capitalize
 
       @results.push({:lat => lat, :lon => lon,
                      :min_lat => min_lat, :max_lat => max_lat,
                      :min_lon => min_lon, :max_lon => max_lon,
                      :prefix => prefix, :name => name})
+      @more_params[:exclude].push(place.attributes["place_id"].to_s)
     end
 
     render :action => "results"
@@ -292,10 +297,7 @@ class GeocoderController < ApplicationController
   def description
     @sources = Array.new
 
-    @sources.push({ :name => "osm_nominatim" }) if APP_CONFIG['nominatim_enabled']
-    @sources.push({ :name => "osm_namefinder", :types => "cities", :max => 2 })
-    @sources.push({ :name => "osm_namefinder", :types => "towns", :max => 4 })
-    @sources.push({ :name => "osm_namefinder", :types => "places", :max => 10 })
+    @sources.push({ :name => "osm_nominatim" })
     @sources.push({ :name => "geonames" })
 
     render :update do |page|
@@ -350,7 +352,7 @@ class GeocoderController < ApplicationController
     @results = Array.new
 
     # ask OSM namefinder
-    response = fetch_xml("http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}")
+    response = fetch_xml("http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{request.user_preferred_languages.join(',')}")
 
     # parse the response
     response.elements.each("reversegeocode") do |result|