X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3cd5f45e08d977d04a778ab8802f71df85edc314..5b6558c0f29013e85c9c398a61872f9dad5a69c5:/config/routes.rb diff --git a/config/routes.rb b/config/routes.rb index 5551c7c55..e9f593d92 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -117,21 +117,21 @@ OpenStreetMap::Application.routes.draw do match '/history/friends' => 'changeset#list', :via => :get, :friends => true, :as => "friend_changesets" match '/history/nearby' => 'changeset#list', :via => :get, :nearby => true, :as => "nearby_changesets" - get '/browse/way/:id', :to => redirect('/way/%{id}') - get '/browse/way/:id/history', :to => redirect('/way/%{id}/history') - get '/browse/node/:id', :to => redirect('/node/%{id}') - get '/browse/node/:id/history', :to => redirect('/node/%{id}/history') - get '/browse/relation/:id', :to => redirect('/relation/%{id}') - get '/browse/relation/:id/history', :to => redirect('/relation/%{id}/history') - get '/browse/changset/:id', :to => redirect('/changeset/%{id}') - get '/browse/note/:id', :to => redirect('/note/%{id}') - get '/user/:display_name/edits', :to => redirect('/user/:display_name/history') - get '/user/:display_name/edits/feed', :to => redirect('/user/:display_name/history/feed') - get '/browse/friends', :to => redirect('/history/friends') - get '/browse/nearby', :to => redirect('/history/nearby') - get '/browse/changesets/feed', :to => redirect('/history/feed') - get '/browse/changesets', :to => redirect('/history') - get '/browse', :to => redirect('/history') + get '/browse/way/:id', :to => redirect(:path => '/way/%{id}') + get '/browse/way/:id/history', :to => redirect(:path => '/way/%{id}/history') + get '/browse/node/:id', :to => redirect(:path => '/node/%{id}') + get '/browse/node/:id/history', :to => redirect(:path => '/node/%{id}/history') + get '/browse/relation/:id', :to => redirect(:path => '/relation/%{id}') + get '/browse/relation/:id/history', :to => redirect(:path => '/relation/%{id}/history') + get '/browse/changeset/:id', :to => redirect(:path => '/changeset/%{id}') + get '/browse/note/:id', :to => redirect(:path => '/note/%{id}') + get '/user/:display_name/edits', :to => redirect(:path => '/user/%{display_name}/history') + get '/user/:display_name/edits/feed', :to => redirect(:path => '/user/%{display_name}/history/feed') + get '/browse/friends', :to => redirect(:path => '/history/friends') + get '/browse/nearby', :to => redirect(:path => '/history/nearby') + get '/browse/changesets/feed', :to => redirect(:path => '/history/feed') + get '/browse/changesets', :to => redirect(:path => '/history') + get '/browse', :to => redirect(:path => '/history') # web site root :to => 'site#index', :via => [:get, :post] @@ -139,6 +139,7 @@ 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 '/fixthemap' => 'site#fixthemap', :via => :get, :as => :fixthemap match '/help' => 'site#help', :via => :get, :as => :help match '/about' => 'site#about', :via => :get, :as => :about match '/history' => 'changeset#list', :via => :get @@ -162,9 +163,9 @@ OpenStreetMap::Application.routes.draw do match '/user/forgot-password' => 'user#lost_password', :via => [:get, :post] match '/user/suspended' => 'user#suspended', :via => :get - match '/index.html' => 'site#index', :via => :get - match '/create-account.html' => 'user#new', :via => :get - match '/forgot-password.html' => 'user#lost_password', :via => :get + get '/index.html', :to => redirect(:path => "/") + get '/create-account.html', :to => redirect(:path => "/user/new") + get '/forgot-password.html', :to => redirect(:path => "/user/forgot-password") # permalink match '/go/:code' => 'site#permalink', :via => :get, :code => /[a-zA-Z0-9_@~]+[=-]*/