Remove LearnOSM

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index c65954b223e95e3ca3fbef390fa4d484f01986cb..31658e4a954682d1dbf5e82926926b25715751dc 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -112,12 +112,12 @@ OpenStreetMap::Application.routes.draw do
   match '/browse/changeset/:id' => 'browse#changeset', :via => :get, :as => :changeset, :id => /\d+/
   match '/browse/note/:id' => 'browse#note', :via => :get, :id => /\d+/, :as => "browse_note"
   match '/user/:display_name/edits' => 'changeset#list', :via => :get
-  match '/user/:display_name/edits/feed' => 'changeset#feed', :via => :get, :format => :atom
+  match '/user/:display_name/edits/feed' => 'changeset#feed', :via => :get, :defaults => { :format => :atom }
   match '/user/:display_name/notes' => 'notes#mine', :via => :get
   match '/browse/friends' => 'changeset#list', :via => :get, :friends => true, :as => "friend_changesets"
   match '/browse/nearby' => 'changeset#list', :via => :get, :nearby => true, :as => "nearby_changesets"
   match '/browse/changesets' => 'changeset#list', :via => :get
-  match '/browse/changesets/feed' => 'changeset#feed', :via => :get, :format => :atom
+  match '/browse/changesets/feed' => 'changeset#feed', :via => :get, :defaults => { :format => :atom }
   match '/browse' => 'changeset#list', :via => :get
 
   # web site
@@ -126,8 +126,9 @@ OpenStreetMap::Application.routes.draw do
   match '/copyright/:copyright_locale' => 'site#copyright', :via => :get
   match '/copyright' => 'site#copyright', :via => :get
   match '/welcome' => 'site#welcome', :via => :get, :as => :welcome
+  match '/help' => 'site#help', :via => :get, :as => :help
   match '/history' => 'changeset#list', :via => :get
-  match '/history/feed' => 'changeset#feed', :via => :get, :format => :atom
+  match '/history/feed' => 'changeset#feed', :via => :get, :defaults => { :format => :atom }
   match '/export' => 'site#index', :export => true, :via => :get
   match '/login' => 'user#login', :via => [:get, :post]
   match '/logout' => 'user#logout', :via => [:get, :post]
@@ -214,17 +215,13 @@ OpenStreetMap::Application.routes.draw do
 
   # geocoder
   match '/geocoder/search' => 'geocoder#search', :via => :post
-  match '/geocoder/search_latlon' => 'geocoder#search_latlon', :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/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/search_osm_nominatim_reverse' => 'geocoder#search_osm_nominatim_reverse', :via => :get
+  match '/geocoder/search_geonames_reverse' => 'geocoder#search_geonames_reverse', :via => :get
 
   # export
   match '/export/start' => 'export#start', :via => :get
@@ -247,8 +244,8 @@ OpenStreetMap::Application.routes.draw do
   match '/oauth/revoke' => 'oauth#revoke', :via => [:get, :post]
   match '/oauth/authorize' => 'oauth#authorize', :via => [:get, :post], :as => :authorize
   match '/oauth/token' => 'oauth#token', :via => :get, :as => :token
-  match '/oauth/request_token' => 'oauth#request_token', :via => :get, :as => :request_token
-  match '/oauth/access_token' => 'oauth#access_token', :via => :get, :as => :access_token
+  match '/oauth/request_token' => 'oauth#request_token', :via => [:get, :post], :as => :request_token
+  match '/oauth/access_token' => 'oauth#access_token', :via => [:get, :post], :as => :access_token
   match '/oauth/test_request' => 'oauth#test_request', :via => :get, :as => :test_request
 
   # roles and banning pages