X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/93dab8a1272f8c807da841c0a55b37f74b65b8c3..11279ebfe90ae64dd9b1e3a6b476f4a8c639f439:/config/routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index bb6da3785..8da9b7238 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,10 +1,9 @@
 ActionController::Routing::Routes.draw do |map|
 
   # API
-  API_VERSION = '0.4' # change this in envronment.rb too
   map.connect "api/#{API_VERSION}/node/create", :controller => 'node', :action => 'create'
-  map.connect "api/#{API_VERSION}/node/:id/history", :controller => 'old_node', :action => 'history', :id => nil
-  map.connect "api/#{API_VERSION}/node/:id", :controller => 'node', :action => 'rest', :id => nil
+  map.connect "api/#{API_VERSION}/node/:id/history", :controller => 'old_node', :action => 'history', :id => nil # TODO is this :id => nil correct? looks like it would throw away essential info - if it does check all these id => nils
+  map.connect "api/#{API_VERSION}/node/:id", :controller => 'node', :action => 'rest', :id => nil 
   map.connect "api/#{API_VERSION}/nodes", :controller => 'node', :action => 'nodes', :id => nil
   
   map.connect "api/#{API_VERSION}/segment/create", :controller => 'segment', :action => 'create'
@@ -31,10 +30,19 @@ ActionController::Routing::Routes.draw do |map|
 
   # traces  
   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 '/traces/user/:user_login/:id', :controller => 'trace', :action => 'view', :id => nil
-  map.connect '/traces/user/:user_login/:id/picture', :controller => 'trace', :action => 'picture', :id => nil
-  map.connect '/traces/user/:user_login/:id/icon', :controller => 'trace', :action => 'icon', :id => nil
+  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 '/traces/user/:display_name/', :controller => 'trace', :action => 'list', :id => nil
+  map.connect '/traces/user/:display_name/page/:page', :controller => 'trace', :action => 'list', :id => nil
+  map.connect '/traces/user/:display_name/:id', :controller => 'trace', :action => 'view', :id => nil
+  map.connect '/traces/user/:display_name/:id/picture', :controller => 'trace', :action => 'picture', :id => nil
+  map.connect '/traces/user/:display_name/: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
 
   # fall through
   map.connect ':controller/:action/:id'