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

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index ff5c74b22faf54c7ee1766818c2bd6c5e393615e..b562ca9f4a0c60b6d1984b5db21acf80aec0153a 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -47,9 +47,6 @@ OpenStreetMap::Application.routes.draw do
     get "relation/:id/full" => "relations#full", :as => :relation_full, :id => /\d+/
     post "relation/:id/:version/redact" => "old_relations#redact", :as => :relation_version_redact, :version => /\d+/, :id => /\d+/
     get "relation/:id/:version" => "old_relations#show", :as => :api_old_relation, :id => /\d+/, :version => /\d+/
-    get "relation/:id" => "relations#show", :as => :api_relation, :id => /\d+/
-    put "relation/:id" => "relations#update", :id => /\d+/
-    delete "relation/:id" => "relations#delete", :id => /\d+/
   end
 
   namespace :api, :path => "api/0.6" do
@@ -62,6 +59,7 @@ OpenStreetMap::Application.routes.draw do
     put "way/create" => "ways#create", :as => nil
 
     resources :relations, :only => [:index, :create]
+    resources :relations, :path => "relation", :id => /\d+/, :only => [:show, :update, :destroy]
     put "relation/create" => "relations#create", :as => nil
 
     resource :map, :only => :show