Move search fetch url construction to controller

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index f23448bffc08584391f162074d723c1e38d1c987..0ccd1d14badb5ba15cd9562f2cd2bd8ccaae7164 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -13,10 +13,10 @@ class GeocoderController < ApplicationController
     @sources = []
 
     if @params[:lat] && @params[:lon]
     @sources = []
 
     if @params[:lat] && @params[:lon]

-      @sources.push(:name => "latlon", :url => root_path)
-      @sources.push(:name => "osm_nominatim_reverse", :url => nominatim_reverse_url(:format => "html"))
+      @sources.push(:name => "latlon", :url => root_path, :fetch_url => url_for(@params.merge(:action => "search_latlon")))
+      @sources.push(:name => "osm_nominatim_reverse", :url => nominatim_reverse_url(:format => "html"), :fetch_url => url_for(@params.merge(:action => "search_osm_nominatim_reverse")))

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

-      @sources.push(:name => "osm_nominatim", :url => nominatim_url(:format => "html"))
+      @sources.push(:name => "osm_nominatim", :url => nominatim_url(:format => "html"), :fetch_url => url_for(@params.merge(:action => "search_osm_nominatim")))

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

diff --git a/app/views/geocoder/search.html.erb b/app/views/geocoder/search.html.erb
index 56f468f2f655a1303038a237173aca13550d7099..efbaab253d4dffbf0fa333e221fefa5620d3cde0 100644 (file)
--- a/app/views/geocoder/search.html.erb
+++ b/app/views/geocoder/search.html.erb
@@ -6,7 +6,7 @@
   <h4>
     <%= link_to t(".title.#{source[:name]}"), source[:url].to_s %>
   </h4>
   <h4>
     <%= link_to t(".title.#{source[:name]}"), source[:url].to_s %>
   </h4>

-  <div class="search_results_entry mx-n3" data-href="<%= url_for @params.merge(:action => "search_#{source[:name]}") %>">
+  <div class="search_results_entry mx-n3" data-href="<%= source[:fetch_url] %>">

     <div class="text-center loader">
       <div class="spinner-border" role="status">
         <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
     <div class="text-center loader">
       <div class="spinner-border" role="status">
         <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>