X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3bf13d9c43dfe2996ddfe0bd15916623e63be1a1..ea132b001d222a6e2781f51357982934de1f58ae:/config/routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index bf1f2a20f..025d5d2b0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -32,6 +32,8 @@ ActionController::Routing::Routes.draw do |map|
   map.connect "api/#{API_VERSION}/map", :controller => 'api', :action => 'map'
   
   map.connect "api/#{API_VERSION}/trackpoints", :controller => 'api', :action => 'trackpoints'
+
+  map.connect "api/#{API_VERSION}/changes", :controller => 'api', :action => 'changes'
   
   map.connect "api/#{API_VERSION}/search", :controller => 'search', :action => 'search_all'
   map.connect "api/#{API_VERSION}/ways/search", :controller => 'search', :action => 'search_ways'
@@ -77,6 +79,8 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/traces/mine/tag/:tag', :controller => 'trace', :action => 'mine'
   map.connect '/traces/mine/tag/:tag/page/:page', :controller => 'trace', :action => 'mine'
   map.connect '/trace/create', :controller => 'trace', :action => 'create'
+  map.connect '/trace/:id/data', :controller => 'trace', :action => 'data'
+  map.connect '/trace/:id/data.:format', :controller => 'trace', :action => 'data'
   map.connect '/trace/:id/edit', :controller => 'trace', :action => 'edit'
   map.connect '/trace/:id/delete', :controller => 'trace', :action => 'delete'
   map.connect '/trace/:id/make_public', :controller => 'trace', :action => 'make_public'
@@ -91,10 +95,12 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/user/:display_name/traces/:id/icon', :controller => 'trace', :action => 'icon'
 
   # user pages
-  map.connect '/user/:display_name/make_friend', :controller => 'user', :action => 'make_friend'
   map.connect '/user/:display_name', :controller => 'user', :action => 'view'
+  map.connect '/user/:display_name/make_friend', :controller => 'user', :action => 'make_friend'
+  map.connect '/user/:display_name/remove_friend', :controller => 'user', :action => 'remove_friend'
   map.connect '/user/:display_name/diary', :controller => 'diary_entry', :action => 'list'
-  map.connect '/user/:display_name/diary/:id', :controller => 'diary_entry', :action => 'list', :id => /\d+/
+  map.connect '/user/:display_name/diary/:id', :controller => 'diary_entry', :action => 'view', :id => /\d+/
+  map.connect '/user/:display_name/diary/:id/newcomment', :controller => 'diary_entry', :action => 'comment', :id => /\d+/
   map.connect '/user/:display_name/diary/rss', :controller => 'diary_entry', :action => 'rss'
   map.connect '/user/:display_name/diary/newpost', :controller => 'diary_entry', :action => 'new'
   map.connect '/user/:display_name/account', :controller => 'user', :action => 'account'
@@ -115,10 +121,12 @@ ActionController::Routing::Routes.draw do |map|
   # messages
 
   map.connect '/user/:display_name/inbox', :controller => 'message', :action => 'inbox'
+  map.connect '/user/:display_name/outbox', :controller => 'message', :action => 'outbox'
   map.connect '/message/new/:user_id', :controller => 'message', :action => 'new'
   map.connect '/message/read/:message_id', :controller => 'message', :action => 'read'
   map.connect '/message/mark/:message_id', :controller => 'message', :action => 'mark'
-  
+  map.connect '/message/reply/:message_id', :controller => 'message', :action => 'reply'
+
   # fall through
      map.connect ':controller/:id/:action'
   map.connect ':controller/:action'