Merge remote-tracking branch 'upstream/pull/5517'

diff --combined config/routes.rb
index d858d80b17c153fe3543f1a06c2d8ce08d2eaa4e,178cda1cdf7f6b19769324ee622fa00f75086769..6efd17759e273e8a0d27d3e79634214d7cc34eb9
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -64,11 -64,11 +64,11 @@@ OpenStreetMap::Application.routes.draw 
      get "relations" => "relations#index"
  
      get "map" => "map#index"
 -
 -    get "trackpoints" => "tracepoints#index"
    end
  
    namespace :api, :path => "api/0.6" do
 +    resources :tracepoints, :path => "trackpoints", :only => :index
 +
      resources :users, :only => :index
      resources :users, :path => "user", :id => /\d+/, :only => :show
      resources :user_traces, :path => "user/gpx_files", :module => :users, :controller => :traces, :only => :index
@@@ -211,30 -211,30 +211,30 @@@
    post "/preview/:type" => "site#preview", :as => :preview
  
    # traces
-   resources :traces, :except => [:show]
+   resources :traces, :id => /\d+/, :except => [:show]
    get "/user/:display_name/traces/tag/:tag/page/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/user/%{display_name}/traces/tag/%{tag}")
    get "/user/:display_name/traces/tag/:tag" => "traces#index"
    get "/user/:display_name/traces/page/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/user/%{display_name}/traces")
    get "/user/:display_name/traces" => "traces#index"
-   get "/user/:display_name/traces/tag/:tag/rss" => "traces#georss", :defaults => { :format => :rss }
-   get "/user/:display_name/traces/rss" => "traces#georss", :defaults => { :format => :rss }
-   get "/user/:display_name/traces/:id" => "traces#show", :as => "show_trace"
-   scope "/user/:display_name/traces/:trace_id", :module => :traces do
+   get "/user/:display_name/traces/:id" => "traces#show", :id => /\d+/, :as => "show_trace"
+   scope "/user/:display_name/traces/:trace_id", :module => :traces, :trace_id => /\d+/ do
      get "picture" => "pictures#show", :as => "trace_picture"
      get "icon" => "icons#show", :as => "trace_icon"
    end
    get "/traces/tag/:tag/page/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/traces/tag/%{tag}")
    get "/traces/tag/:tag" => "traces#index"
    get "/traces/page/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/traces")
-   get "/traces/tag/:tag/rss" => "traces#georss", :defaults => { :format => :rss }
-   get "/traces/rss" => "traces#georss", :defaults => { :format => :rss }
    get "/traces/mine/tag/:tag/page/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/traces/mine/tag/%{tag}")
    get "/traces/mine/tag/:tag" => "traces#mine"
    get "/traces/mine/page/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/traces/mine")
    get "/traces/mine" => "traces#mine"
    get "/trace/create", :to => redirect(:path => "/traces/new")
    get "/trace/:id/data" => "traces#data", :id => /\d+/, :as => "trace_data"
-   get "/trace/:id/edit", :to => redirect(:path => "/traces/%{id}/edit")
+   get "/trace/:id/edit", :id => /\d+/, :to => redirect(:path => "/traces/%{id}/edit")
+ 
+   namespace :traces, :path => "" do
+     resource :feed, :path => "(/user/:display_name)/traces(/tag/:tag)/rss", :only => :show, :defaults => { :format => :rss }
+   end
  
    # diary pages
    resources :diary_entries, :path => "diary", :only => [:new, :create, :index] do