X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cdb9d2527a8524eea02856c27fff10ad5c138344..12f9bedbf5a949752a45184e760eada952bf8fc2:/config/routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 9d26eb0fa..5b2a6babf 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -18,6 +18,11 @@ ActionController::Routing::Routes.draw do |map|
 
   map.connect "api/#{API_VERSION}/map", :controller => 'api', :action => 'map'
   
+  map.connect "api/#{API_VERSION}/search", :controller => 'search', :action => 'search_all'
+  map.connect "api/#{API_VERSION}/way/search", :controller => 'search', :action => 'search_ways'
+  map.connect "api/#{API_VERSION}/segment/search", :controller => 'search', :action => 'search_segments'
+  map.connect "api/#{API_VERSION}/nodes/search", :controller => 'search', :action => 'search_nodes'
+  
   map.connect "api/#{API_VERSION}/user/details", :controller => 'user', :action => 'api_details'
   map.connect "api/#{API_VERSION}/user/gpx_files", :controller => 'user', :action => 'api_gpx_files'
  
@@ -28,6 +33,9 @@ ActionController::Routing::Routes.draw do |map|
   # web site
 
   map.connect '/', :controller => 'site', :action => 'index'
+  map.connect '/user/save', :controller => 'user', :action => 'save'
+  map.connect '/user/confirm', :controller => 'user', :action => 'confirm'
+  map.connect '/user/go_public', :controller => 'user', :action => 'go_public'
   map.connect '/index.html', :controller => 'site', :action => 'index'
   map.connect '/edit.html', :controller => 'site', :action => 'edit'
   map.connect '/search.html', :controller => 'way_tag', :action => 'search'
@@ -40,23 +48,34 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/traces', :controller => 'trace', :action => 'list'
   map.connect '/traces/page/:page', :controller => 'trace', :action => 'list'
   map.connect '/traces/mine', :controller => 'trace', :action => 'mine'
+  map.connect '/trace/create', :controller => 'trace', :action => 'create'
   map.connect '/traces/mine/page/:page', :controller => 'trace', :action => 'mine'
   map.connect '/traces/mine/tag/:tag', :controller => 'trace', :action => 'mine'
   map.connect '/traces/mine/tag/:tag/page/:page', :controller => 'trace', :action => 'mine'
   map.connect '/traces/rss', :controller => 'trace', :action => 'georss'
-  map.connect '/user/:display_name/traces', :controller => 'trace', :action => 'list', :id => nil
-  map.connect '/user/:display_name/traces/page/:page', :controller => 'trace', :action => 'list', :id => nil
+  map.connect '/user/:display_name/traces', :controller => 'trace', :action => 'list', :id => nil
+  map.connect '/user/:display_name/traces/page/:page', :controller => 'trace', :action => 'list', :id => nil
   map.connect '/user/:display_name/traces/:id', :controller => 'trace', :action => 'view', :id => nil
   map.connect '/user/:display_name/traces/:id/picture', :controller => 'trace', :action => 'picture', :id => nil
   map.connect '/user/:display_name/traces/:id/icon', :controller => 'trace', :action => 'icon', :id => nil
   map.connect '/traces/tag/:tag', :controller => 'trace', :action => 'list', :id => nil
-  map.connect '/traces/tag/:tag/page/:page', :controller => 'trace', :action => 'list', :id => nil
+  map.connect '/traces/tag/:tag/page/:page', :controller => 'trace', :action => 'list', :id => nil
+
+  # user pages
+  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'
 
   # 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'
+  
   # fall through
-  map.connect ':controller/:id/:action'
+   map.connect ':controller/:id/:action'
   map.connect ':controller/:action'
 end