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

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 67991b251a7238277944216cf47accdcae92d546..3f4a12bd782e058360439c44e3c3ac30bdb15c48 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -17,22 +17,25 @@ OpenStreetMap::Application.routes.draw do
     get "capabilities" => "capabilities#show"
     get "permissions" => "permissions#show"
 
     get "capabilities" => "capabilities#show"
     get "permissions" => "permissions#show"
 

-    put "changeset/create" => "changesets#create"

     post "changeset/:id/upload" => "changesets#upload", :as => :changeset_upload, :id => /\d+/
     post "changeset/:id/upload" => "changesets#upload", :as => :changeset_upload, :id => /\d+/

-    get "changeset/:id/download" => "changesets#download", :as => :changeset_download, :id => /\d+/
-    get "changeset/:id" => "changesets#show", :as => :changeset_show, :id => /\d+/

     post "changeset/:id/subscribe" => "changesets#subscribe", :as => :api_changeset_subscribe, :id => /\d+/
     post "changeset/:id/unsubscribe" => "changesets#unsubscribe", :as => :api_changeset_unsubscribe, :id => /\d+/
     post "changeset/:id/subscribe" => "changesets#subscribe", :as => :api_changeset_subscribe, :id => /\d+/
     post "changeset/:id/unsubscribe" => "changesets#unsubscribe", :as => :api_changeset_unsubscribe, :id => /\d+/

-    put "changeset/:id" => "changesets#update", :id => /\d+/

     put "changeset/:id/close" => "changesets#close", :as => :changeset_close, :id => /\d+/
     put "changeset/:id/close" => "changesets#close", :as => :changeset_close, :id => /\d+/

-    get "changesets" => "changesets#index"
-    post "changeset/:id/comment" => "changeset_comments#create", :as => :changeset_comment, :id => /\d+/
-    post "changeset/comment/:id/hide" => "changeset_comments#destroy", :as => :changeset_comment_hide, :id => /\d+/
-    post "changeset/comment/:id/unhide" => "changeset_comments#restore", :as => :changeset_comment_unhide, :id => /\d+/

   end
 
   namespace :api, :path => "api/0.6" do
   end
 
   namespace :api, :path => "api/0.6" do

-    resources :changeset_comments, :only => :index
+    resources :changesets, :only => [:index, :create]
+    resources :changesets, :path => "changeset", :id => /\d+/, :only => [:show, :update] do
+      resource :download, :module => :changesets, :only => :show
+      resources :changeset_comments, :path => "comment", :only => :create
+    end
+    put "changeset/create" => "changesets#create", :as => nil
+
+    resources :changeset_comments, :id => /\d+/, :only => :index do
+      resource :visibility, :module => :changeset_comments, :only => [:create, :destroy]
+    end
+    post "changeset/comment/:changeset_comment_id/unhide" => "changeset_comments/visibilities#create", :changeset_comment_id => /\d+/, :as => nil
+    post "changeset/comment/:changeset_comment_id/hide" => "changeset_comments/visibilities#destroy", :changeset_comment_id => /\d+/, :as => nil

 
     resources :nodes, :only => [:index, :create]
     resources :nodes, :path => "node", :id => /\d+/, :only => [:show, :update, :destroy] do
 
     resources :nodes, :only => [:index, :create]
     resources :nodes, :path => "node", :id => /\d+/, :only => [:show, :update, :destroy] do