From 84083ef47be6365c5dfacce0404e27a24df225db Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Mon, 31 Mar 2025 02:40:18 +0300
Subject: [PATCH] Move search query templates

---
 app/controllers/geocoder_controller.rb         | 18 +++++++++---------
 .../queries/create.html.erb}                   |  0
 .../queries}/error.html.erb                    |  0
 config/locales/en.yml                          |  8 +++++---
 test/controllers/geocoder_controller_test.rb   |  2 +-
 5 files changed, 15 insertions(+), 13 deletions(-)
 rename app/views/{geocoder/results.html.erb => searches/queries/create.html.erb} (100%)
 rename app/views/{geocoder => searches/queries}/error.html.erb (100%)

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index f352d8dba..9b8637a95 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -53,24 +53,24 @@ class GeocoderController < ApplicationController
 
       if @results.empty?
         @error = "Latitude or longitude are out of range"
-        render :action => "error"
+        render "searches/queries/error"
       else
-        render :action => "results"
+        render "searches/queries/create"
       end
     else
       # Coordinates in a query have come with markers for latitude and longitude.
       if !lat.between?(-90, 90)
         @error = "Latitude #{lat} out of range"
-        render :action => "error"
+        render "searches/queries/error"
       elsif !lon.between?(-180, 180)
         @error = "Longitude #{lon} out of range"
-        render :action => "error"
+        render "searches/queries/error"
       else
         @results = [{ :lat => params[:lat], :lon => params[:lon],
                       :zoom => params[:zoom],
                       :name => "#{params[:lat]}, #{params[:lon]}" }]
 
-        render :action => "results"
+        render "searches/queries/create"
       end
     end
   end
@@ -126,11 +126,11 @@ class GeocoderController < ApplicationController
                     :type => object_type, :id => object_id)
     end
 
-    render :action => "results"
+    render "searches/queries/create"
   rescue StandardError => e
     host = URI(Settings.nominatim_url).host
     @error = "Error contacting #{host}: #{e}"
-    render :action => "error"
+    render "searches/queries/error"
   end
 
   def search_osm_nominatim_reverse
@@ -157,11 +157,11 @@ class GeocoderController < ApplicationController
                     :type => object_type, :id => object_id)
     end
 
-    render :action => "results"
+    render "searches/queries/create"
   rescue StandardError => e
     host = URI(Settings.nominatim_url).host
     @error = "Error contacting #{host}: #{e}"
-    render :action => "error"
+    render "searches/queries/error"
   end
 
   private
diff --git a/app/views/geocoder/results.html.erb b/app/views/searches/queries/create.html.erb
similarity index 100%
rename from app/views/geocoder/results.html.erb
rename to app/views/searches/queries/create.html.erb
diff --git a/app/views/geocoder/error.html.erb b/app/views/searches/queries/error.html.erb
similarity index 100%
rename from app/views/geocoder/error.html.erb
rename to app/views/searches/queries/error.html.erb
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c9c335ec7..7c9c19d46 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1536,9 +1536,11 @@ en:
         town: "Town Boundary"
         township: "Township Boundary"
         village: "Village Boundary"
-    results:
-      no_results: "No results found"
-      more_results: "More results"
+  searches:
+    queries:
+      create:
+        no_results: "No results found"
+        more_results: "More results"
   directions:
     search:
       title: Directions
diff --git a/test/controllers/geocoder_controller_test.rb b/test/controllers/geocoder_controller_test.rb
index ac9905589..6c8f576e7 100644
--- a/test/controllers/geocoder_controller_test.rb
+++ b/test/controllers/geocoder_controller_test.rb
@@ -462,7 +462,7 @@ class GeocoderControllerTest < ActionDispatch::IntegrationTest
 
   def results_check(*results)
     assert_response :success
-    assert_template :results
+    assert_template :create
     assert_template :layout => nil
     if results.empty?
       assert_select "ul.results-list", 0
-- 
2.39.5