X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3b34f700f1af3cee87a591c5cecd897b5529dec0..35458c009652645972a9167d80aba1c4fdce82cf:/config/routes.rb diff --git a/config/routes.rb b/config/routes.rb index 04d1a763c..231be4f43 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -103,21 +103,21 @@ OpenStreetMap::Application.routes.draw do # Data browsing match '/browse/start' => 'browse#start', :via => :get - match '/browse/way/:id' => 'browse#way', :via => :get, :id => /\d+/ + match '/browse/way/:id' => 'browse#way', :via => :get, :id => /\d+/, :as => :way match '/browse/way/:id/history' => 'browse#way_history', :via => :get, :id => /\d+/ - match '/browse/node/:id' => 'browse#node', :via => :get, :id => /\d+/ + match '/browse/node/:id' => 'browse#node', :via => :get, :id => /\d+/, :as => :node match '/browse/node/:id/history' => 'browse#node_history', :via => :get, :id => /\d+/ - match '/browse/relation/:id' => 'browse#relation', :via => :get, :id => /\d+/ + match '/browse/relation/:id' => 'browse#relation', :via => :get, :id => /\d+/, :as => :relation match '/browse/relation/:id/history' => 'browse#relation_history', :via => :get, :id => /\d+/ 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,9 +126,11 @@ 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 '/about' => 'site#about', :via => :get, :as => :about match '/history' => 'changeset#list', :via => :get - match '/history/feed' => 'changeset#feed', :via => :get, :format => :atom - match '/export' => 'site#index', :export => true, :via => :get + match '/history/feed' => 'changeset#feed', :via => :get, :defaults => { :format => :atom } + match '/export' => 'site#export', :via => :get match '/login' => 'user#login', :via => [:get, :post] match '/logout' => 'user#logout', :via => [:get, :post] match '/offline' => 'site#offline', :via => :get @@ -162,8 +164,8 @@ OpenStreetMap::Application.routes.draw do match '/user/:display_name/traces/tag/:tag' => 'trace#list', :via => :get match '/user/:display_name/traces/page/:page' => 'trace#list', :via => :get match '/user/:display_name/traces' => 'trace#list', :via => :get - match '/user/:display_name/traces/tag/:tag/rss' => 'trace#georss', :via => :get, :format => :rss - match '/user/:display_name/traces/rss' => 'trace#georss', :via => :get, :format => :rss + match '/user/:display_name/traces/tag/:tag/rss' => 'trace#georss', :via => :get, :defaults => { :format => :rss } + match '/user/:display_name/traces/rss' => 'trace#georss', :via => :get, :defaults => { :format => :rss } match '/user/:display_name/traces/:id' => 'trace#view', :via => :get match '/user/:display_name/traces/:id/picture' => 'trace#picture', :via => :get match '/user/:display_name/traces/:id/icon' => 'trace#icon', :via => :get @@ -171,8 +173,8 @@ OpenStreetMap::Application.routes.draw do match '/traces/tag/:tag' => 'trace#list', :via => :get match '/traces/page/:page' => 'trace#list', :via => :get match '/traces' => 'trace#list', :via => :get - match '/traces/tag/:tag/rss' => 'trace#georss', :via => :get, :format => :rss - match '/traces/rss' => 'trace#georss', :via => :get, :format => :rss + match '/traces/tag/:tag/rss' => 'trace#georss', :via => :get, :defaults => { :format => :rss } + match '/traces/rss' => 'trace#georss', :via => :get, :defaults => { :format => :rss } match '/traces/mine/tag/:tag/page/:page' => 'trace#mine', :via => :get match '/traces/mine/tag/:tag' => 'trace#mine', :via => :get match '/traces/mine/page/:page' => 'trace#mine', :via => :get @@ -186,9 +188,9 @@ OpenStreetMap::Application.routes.draw do match '/diary/new' => 'diary_entry#new', :via => [:get, :post] match '/diary/friends' => 'diary_entry#list', :friends => true, :via => :get, :as => "friend_diaries" match '/diary/nearby' => 'diary_entry#list', :nearby => true, :via => :get, :as => "nearby_diaries" - match '/user/:display_name/diary/rss' => 'diary_entry#rss', :via => :get, :format => :rss - match '/diary/:language/rss' => 'diary_entry#rss', :via => :get, :format => :rss - match '/diary/rss' => 'diary_entry#rss', :via => :get, :format => :rss + match '/user/:display_name/diary/rss' => 'diary_entry#rss', :via => :get, :defaults => { :format => :rss } + match '/diary/:language/rss' => 'diary_entry#rss', :via => :get, :defaults => { :format => :rss } + match '/diary/rss' => 'diary_entry#rss', :via => :get, :defaults => { :format => :rss } match '/user/:display_name/diary/comments/:page' => 'diary_entry#comments', :via => :get, :page => /\d+/ match '/user/:display_name/diary/comments/' => 'diary_entry#comments', :via => :get match '/user/:display_name/diary' => 'diary_entry#list', :via => :get @@ -213,18 +215,14 @@ OpenStreetMap::Application.routes.draw do match '/users/:status' => 'user#list', :via => [:get, :post] # geocoder - match '/geocoder/search' => 'geocoder#search', :via => :post - match '/geocoder/search_latlon' => 'geocoder#search_latlon', :via => :get + match '/search' => 'geocoder#search', :via => :get, :as => :search 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 +245,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