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

diff --combined config/routes.rb
index 3f0c7b49421bfbfad3e2ea7e53da08ccc48e972c,bbe9837f0f12842df39063f70e4508f87dd796d3..7689b506da0a9dad5a16827684f33c7dc0113894
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -87,7 -87,6 +87,6 @@@ OpenStreetMap::Application.routes.draw 
      # AMF (ActionScript) API
      post "amf/read" => "api/amf#amf_read"
      post "amf/write" => "api/amf#amf_write"
-     get "swf/trackpoints" => "api/swf#trackpoints"
  
      # Map notes API
      resources :notes, :except => [:new, :edit, :update], :constraints => { :id => /\d+/ }, :defaults => { :format => "xml" }, :controller => "api/notes" do
@@@ -216,12 -215,9 +215,12 @@@
    post "/trace/:id/delete" => "traces#delete", :id => /\d+/
  
    # diary pages
 -  match "/diary/new" => "diary_entries#new", :via => [:get, :post]
 -  get "/diary/friends" => "diary_entries#index", :friends => true, :as => "friend_diaries"
 -  get "/diary/nearby" => "diary_entries#index", :nearby => true, :as => "nearby_diaries"
 +  resources :diary_entries, :path => "diary", :only => [:new, :create, :index] do
 +    collection do
 +      get "friends" => "diary_entries#index", :friends => true
 +      get "nearby" => "diary_entries#index", :nearby => true
 +    end
 +  end
    get "/user/:display_name/diary/rss" => "diary_entries#rss", :defaults => { :format => :rss }
    get "/diary/:language/rss" => "diary_entries#rss", :defaults => { :format => :rss }
    get "/diary/rss" => "diary_entries#rss", :defaults => { :format => :rss }
@@@ -229,14 -225,12 +228,14 @@@
    get "/user/:display_name/diary/comments/" => "diary_entries#comments"
    get "/user/:display_name/diary" => "diary_entries#index"
    get "/diary/:language" => "diary_entries#index"
 -  get "/diary" => "diary_entries#index"
 -  get "/user/:display_name/diary/:id" => "diary_entries#show", :id => /\d+/, :as => :diary_entry
 +  scope "/user/:display_name" do
 +    resources :diary_entries, :path => "diary", :only => [:edit, :update, :show]
 +  end
    post "/user/:display_name/diary/:id/newcomment" => "diary_entries#comment", :id => /\d+/
 -  match "/user/:display_name/diary/:id/edit" => "diary_entries#edit", :via => [:get, :post], :id => /\d+/
    post "/user/:display_name/diary/:id/hide" => "diary_entries#hide", :id => /\d+/, :as => :hide_diary_entry
 +  post "/user/:display_name/diary/:id/unhide" => "diary_entries#unhide", :id => /\d+/, :as => :unhide_diary_entry
    post "/user/:display_name/diary/:id/hidecomment/:comment" => "diary_entries#hidecomment", :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment
 +  post "/user/:display_name/diary/:id/unhidecomment/:comment" => "diary_entries#unhidecomment", :id => /\d+/, :comment => /\d+/, :as => :unhide_diary_comment
    post "/user/:display_name/diary/:id/subscribe" => "diary_entries#subscribe", :as => :diary_entry_subscribe, :id => /\d+/
    post "/user/:display_name/diary/:id/unsubscribe" => "diary_entries#unsubscribe", :as => :diary_entry_unsubscribe, :id => /\d+/