diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index 85e056a55..e0f882385 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -228,14 +228,25 @@ 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}&accept-language=#{request.user_preferred_languages.join(',')}") + # 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 @@ -248,6 +259,7 @@ class GeocoderController < ApplicationController :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" diff --git a/app/views/geocoder/results.html.erb b/app/views/geocoder/results.html.erb index 70051c91c..694d0eadb 100644 --- a/app/views/geocoder/results.html.erb +++ b/app/views/geocoder/results.html.erb @@ -4,4 +4,18 @@ <% @results.each do |result| %>
<%= result_to_html(result) %>
<% end %> + <% if @more_params %> +<%= + startSpinner = update_page do |page| + page.replace_html "search_more_#{@more_params.hash}", image_tag("searching.gif", :class => "search_searching") + end + + link_to_remote t('geocoder.results.more_results'), + :update => "search_more_#{@more_params.hash}", + :before => startSpinner, + :url => @more_params + %>
+