X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/76c1371dcf4783b38dd9235b63a3121e08e6e20e..24a26e015a4389c8b5d9ae6d7d501c63f39c2450:/config/routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 9ccb913cb..71af08b73 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -84,19 +84,21 @@ OpenStreetMap::Application.routes.draw do
   match '/browse/relation/:id' => 'browse#relation', :id => /\d+/
   match '/browse/relation/:id/history' => 'browse#relation_history', :id => /\d+/
   match '/browse/changeset/:id' => 'browse#changeset', :as => :changeset, :id => /\d+/
-  match '/user/:display_name/edits/feed' => 'changeset#list', :format => :atom
   match '/user/:display_name/edits' => 'changeset#list'
-  match '/browse/changesets/feed' => 'changeset#list', :format => :atom
+  match '/user/:display_name/edits/feed' => 'changeset#feed', :format => :atom
+  match '/browse/friends' => 'changeset#list', :friends => true
+  match '/browse/nearby' => 'changeset#list', :nearby => true
   match '/browse/changesets' => 'changeset#list'
+  match '/browse/changesets/feed' => 'changeset#feed', :format => :atom
   match '/browse' => 'changeset#list'
 
   # web site
-  match '/' => 'site#index'
+  root :to => 'site#index'
   match '/edit' => 'site#edit'
-  match '/copyright' => 'site#copyright'
   match '/copyright/:copyright_locale' => 'site#copyright'
-  match '/history/feed' => 'changeset#list', :format => :atom
+  match '/copyright' => 'site#copyright'
   match '/history' => 'changeset#list'
+  match '/history/feed' => 'changeset#feed', :format => :atom
   match '/export' => 'site#export'
   match '/login' => 'user#login'
   match '/logout' => 'user#logout'
@@ -123,7 +125,7 @@ OpenStreetMap::Application.routes.draw do
   match '/forgot-password.html' => 'user#lost_password'
 
   # permalink
-  match '/go/:code' => 'site#permalink', :code => /[a-zA-Z0-9_@]+[=-]*/
+  match '/go/:code' => 'site#permalink', :code => /[a-zA-Z0-9_@~]+[=-]*/
 
   # traces
   match '/user/:display_name/traces/tag/:tag/page/:page' => 'trace#list'
@@ -153,6 +155,8 @@ OpenStreetMap::Application.routes.draw do
 
   # diary pages
   match '/diary/new' => 'diary_entry#new'
+  match '/diary/friends' => 'diary_entry#list', :friends => true
+  match '/diary/nearby' => 'diary_entry#list', :nearby => true  
   match '/user/:display_name/diary/rss' => 'diary_entry#rss', :format => :rss
   match '/diary/:language/rss' => 'diary_entry#rss', :format => :rss
   match '/diary/rss' => 'diary_entry#rss', :format => :rss
@@ -213,7 +217,8 @@ OpenStreetMap::Application.routes.draw do
     resources :oauth_clients
   end
   match '/oauth/revoke' => 'oauth#revoke'
-  match '/oauth/authorize' => 'oauth#oauthorize', :as => :authorize
+  match '/oauth/authorize' => 'oauth#authorize', :as => :authorize
+  match '/oauth/token' => 'oauth#token', :as => :token
   match '/oauth/request_token' => 'oauth#request_token', :as => :request_token
   match '/oauth/access_token' => 'oauth#access_token', :as => :access_token
   match '/oauth/test_request' => 'oauth#test_request', :as => :test_request