From 7c946bcba8f3addb0afb5dc7d30d658636c07a2f Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Mon, 31 Mar 2025 05:32:49 +0300
Subject: [PATCH] Clean up geocoder after moving out queries

---
 app/controllers/geocoder_controller.rb       | 20 ++--------------
 test/controllers/geocoder_controller_test.rb | 25 --------------------
 2 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 34f45dc39..1ff7ed2f9 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -1,15 +1,13 @@
 class GeocoderController < ApplicationController
-  require "uri"
-  require "rexml/document"
   include NominatimMethods
 
   before_action :authorize_web
   before_action :set_locale
-  before_action :require_oauth, :only => [:search]
+  before_action :require_oauth
 
   authorize_resource :class => false
 
-  before_action :normalize_params, :only => [:search]
+  before_action :normalize_params
 
   def search
     @sources = []
@@ -33,20 +31,6 @@ class GeocoderController < ApplicationController
 
   private
 
-  def fetch_text(url)
-    response = OSM.http_client.get(URI.parse(url))
-
-    if response.success?
-      response.body
-    else
-      raise response.status.to_s
-    end
-  end
-
-  def fetch_xml(url)
-    REXML::Document.new(fetch_text(url))
-  end
-
   def normalize_params
     if (query = params[:query])
       query.strip!
diff --git a/test/controllers/geocoder_controller_test.rb b/test/controllers/geocoder_controller_test.rb
index e7f2ec669..134101eba 100644
--- a/test/controllers/geocoder_controller_test.rb
+++ b/test/controllers/geocoder_controller_test.rb
@@ -350,29 +350,4 @@ class GeocoderControllerTest < ActionDispatch::IntegrationTest
     assert_template :layout => "xhr"
     assert_equal sources, assigns(:sources).pluck(:name)
   end
-
-  def results_check(*results)
-    assert_response :success
-    assert_template :create
-    assert_template :layout => nil
-    if results.empty?
-      assert_select "ul.results-list", 0
-    else
-      assert_select "ul.results-list", 1 do
-        assert_select "li.search_results_entry", results.count
-
-        results.each do |result|
-          attrs = result.collect { |k, v| "[data-#{k}='#{v}']" }.join
-          assert_select "li.search_results_entry a.set_position#{attrs}", result[:name]
-        end
-      end
-    end
-  end
-
-  def results_check_error(error)
-    assert_response :success
-    assert_template :error
-    assert_template :layout => nil
-    assert_select ".alert.alert-danger", error
-  end
 end
-- 
2.39.5