Remove vestigial routes

Namefinder support was removed in 1a0728ec7b46efdaf3cf9455f288f08ecd465d2b.

diff --git a/config/routes.rb b/config/routes.rb
index 68a5bacf6171f99d7e5e5a16802ec3a695eeb05c..26bf71917ed0e80b9bcb953c4c0132be8c20ac69 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -218,11 +218,9 @@ OpenStreetMap::Application.routes.draw do
   match '/geocoder/search_us_postcode' => 'geocoder#search_us_postcode', :via => :get
   match '/geocoder/search_uk_postcode' => 'geocoder#search_uk_postcode', :via => :get
   match '/geocoder/search_ca_postcode' => 'geocoder#search_ca_postcode', :via => :get
   match '/geocoder/search_us_postcode' => 'geocoder#search_us_postcode', :via => :get
   match '/geocoder/search_uk_postcode' => 'geocoder#search_uk_postcode', :via => :get
   match '/geocoder/search_ca_postcode' => 'geocoder#search_ca_postcode', :via => :get

-  match '/geocoder/search_osm_namefinder' => 'geocoder#search_osm_namefinder', :via => :get

   match '/geocoder/search_osm_nominatim' => 'geocoder#search_osm_nominatim', :via => :get
   match '/geocoder/search_geonames' => 'geocoder#search_geonames', :via => :get
   match '/geocoder/description' => 'geocoder#description', :via => :post
   match '/geocoder/search_osm_nominatim' => 'geocoder#search_osm_nominatim', :via => :get
   match '/geocoder/search_geonames' => 'geocoder#search_geonames', :via => :get
   match '/geocoder/description' => 'geocoder#description', :via => :post

-  match '/geocoder/description_osm_namefinder' => 'geocoder#description_osm_namefinder', :via => :get

   match '/geocoder/description_osm_nominatim' => 'geocoder#description_osm_nominatim', :via => :get
   match '/geocoder/description_geonames' => 'geocoder#description_geonames', :via => :get
 
   match '/geocoder/description_osm_nominatim' => 'geocoder#description_osm_nominatim', :via => :get
   match '/geocoder/description_geonames' => 'geocoder#description_geonames', :via => :get
 

diff --git a/test/functional/geocoder_controller_test.rb b/test/functional/geocoder_controller_test.rb
index 6d1d1f1c5779a34a7541b879b459fd08bc7e4f84..bbb1b0f01a12535f764877e104fa6943bb69a271 100644 (file)
--- a/test/functional/geocoder_controller_test.rb
+++ b/test/functional/geocoder_controller_test.rb
@@ -27,10 +27,6 @@ class GeocoderControllerTest < ActionController::TestCase
       { :path => "/geocoder/search_ca_postcode", :method => :get },
       { :controller => "geocoder", :action => "search_ca_postcode" }
     )
       { :path => "/geocoder/search_ca_postcode", :method => :get },
       { :controller => "geocoder", :action => "search_ca_postcode" }
     )

-    assert_routing(
-      { :path => "/geocoder/search_osm_namefinder", :method => :get },
-      { :controller => "geocoder", :action => "search_osm_namefinder" }
-    )

     assert_routing(
       { :path => "/geocoder/search_osm_nominatim", :method => :get },
       { :controller => "geocoder", :action => "search_osm_nominatim" }
     assert_routing(
       { :path => "/geocoder/search_osm_nominatim", :method => :get },
       { :controller => "geocoder", :action => "search_osm_nominatim" }


@@ -44,10 +40,6 @@ class GeocoderControllerTest < ActionController::TestCase
       { :path => "/geocoder/description", :method => :post },
       { :controller => "geocoder", :action => "description" }
     )
       { :path => "/geocoder/description", :method => :post },
       { :controller => "geocoder", :action => "description" }
     )

-    assert_routing(
-      { :path => "/geocoder/description_osm_namefinder", :method => :get },
-      { :controller => "geocoder", :action => "description_osm_namefinder" }
-    )

     assert_routing(
       { :path => "/geocoder/description_osm_nominatim", :method => :get },
       { :controller => "geocoder", :action => "description_osm_nominatim" }
     assert_routing(
       { :path => "/geocoder/description_osm_nominatim", :method => :get },
       { :controller => "geocoder", :action => "description_osm_nominatim" }