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

diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index b6baed5f7725f471e13ac562e8952642576dcb19..36e1a7a9298ab8da3b9a081b6438f491f59437bf 100644 (file)
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -1,9 +1,15 @@
+<% search_query = if params[:query]
+                    params[:query]
+                  elsif params[:lat] && params[:lon]
+                    "#{params[:lat]}, #{params[:lon]}"
+                  end %>
+
 <div class="search_forms">
   <form method="GET" action="<%= search_path %>" class="search_form bg-body-secondary px-1 py-2">
     <div class="row gx-2 mx-0">
       <div class="col">
         <div class="input-group flex-nowrap">
-          <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus, :autocomplete => "on", :class => "form-control z-0 py-1 px-2", :dir => "auto" %>
+          <%= text_field_tag "query", search_query, :placeholder => t("site.search.search"), :autofocus => autofocus, :autocomplete => "on", :class => "form-control z-0 py-1 px-2", :dir => "auto" %>
           <div class="input-group-text border-start-0 p-0 position-relative">
             <%= button_tag t("site.search.where_am_i"), :type => "button", :class => "describe_location position-absolute end-0 top-0 bottom-0 m-1 btn btn-outline-primary border-0 p-1 bg-transparent text-primary link-body-emphasis link-opacity-100-hover", :title => t("site.search.where_am_i_title") %>
           </div>

diff --git a/test/system/search_test.rb b/test/system/search_test.rb
index 8cda1f74e853d342a984e3b1a7cdcb0608e635c0..ced1e1beb2b0955cdbb124bdefff0858ad96be14 100644 (file)
--- a/test/system/search_test.rb
+++ b/test/system/search_test.rb
@@ -11,4 +11,22 @@ class SearchTest < ApplicationSystemTestCase
     click_on "Where is this?"
     assert_field "Search", :with => "1.234, 6.789"
   end
+
+  test "query search link sets search input value" do
+    stub_request(:get, %r{^https://nominatim\.openstreetmap\.org/reverse\?})
+      .to_return(:status => 404)
+
+    visit search_path(:query => "2.341, 7.896")
+
+    assert_field "Search", :with => "2.341, 7.896"
+  end
+
+  test "latlon search link sets search input value" do
+    stub_request(:get, %r{^https://nominatim\.openstreetmap\.org/reverse\?})
+      .to_return(:status => 404)
+
+    visit search_path(:lat => "4.321", :lon => "9.876")
+
+    assert_field "Search", :with => "4.321, 9.876"
+  end
 end