X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/60a294c40e341af16fa2eac6de5df2b0917a74be..914b358154479adf295e8ef794787f07aee50c3d:/config/routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index b00b3b649..bcf340b8b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -31,6 +31,10 @@ ActionController::Routing::Routes.draw do |map|
   map.connect "api/#{API_VERSION}/gpx/:id/details", :controller => 'trace', :action => 'api_details'
   map.connect "api/#{API_VERSION}/gpx/:id/data", :controller => 'trace', :action => 'api_data'
   
+  # Potlatch API
+  
+  map.connect "api/#{API_VERSION}/amf", :controller =>'amf', :action =>'talk'
+  
   # web site
 
   map.connect '/', :controller => 'site', :action => 'index'
@@ -63,20 +67,29 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/traces/tag/:tag/page/:page', :controller => 'trace', :action => 'list', :id => nil
 
   # 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/diary', :controller => 'user', :action => 'diary'
   map.connect '/user/:display_name/diary/newpost', :controller => 'diary_entry', :action => 'new'
   map.connect '/user/:display_name/edit', :controller => 'user', :action => 'edit'
   map.connect '/user/:display_name/account', :controller => 'user', :action => 'account'
   map.connect '/user/:display_name/set_home', :controller => 'user', :action => 'set_home'
+  map.connect '/diary', :controller => 'diary_entry', :action => 'list'
 
   # test pages
   map.connect '/test/populate/:table/:from/:count', :controller => 'test', :action => 'populate'
   map.connect '/test/populate/:table/:count', :controller => 'test', :action => 'populate', :from => 1
 
   # geocoder
-  map.connect 'geocoder/search/', :controller => 'geocoder', :action => 'search'
-  map.connect 'geocoder/results/', :controller => 'geocoder', :action => 'results'
+  map.connect '/geocoder/search/', :controller => 'geocoder', :action => 'search'
+  map.connect '/geocoder/results/', :controller => 'geocoder', :action => 'results'
+  map.connect '/postcode/:postcode/', :controller => 'geocoder', :action => 'search'
+
+  # messages
+
+  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'
   
   # fall through
      map.connect ':controller/:id/:action'