From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Jan 2010 00:30:29 +0000 (+0000)
Subject: Add a "More results" link to Nominatim search results.
X-Git-Tag: live~6358
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4f23e718b4a46c514843b9fd5e53fc8a9aabd694

Add a "More results" link to Nominatim search results.
---

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| %>
     <p class="search_results_entry"><%= result_to_html(result) %></p>
   <% end %>
+  <% if @more_params %>
+    <div id="search_more_<%= @more_params.hash %>">
+      <p class="search_results_entry"><%=
+        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
+        %></p>
+    </div>
+  <% end %>
 <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4fd3e9967..adaa7e662 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -839,6 +839,7 @@ en:
       prefix: "{{distance}} {{direction}} of {{type}}"
     results:
       no_results: "No results found"
+      more_results: "More results"
     distance:
       zero: "less than 1km"
       one: "about 1km"