Merge branch 'pull/5556'

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 453c625adea0b8c28f9b83cdd2a832f469cdd4ac..19dfc9a7729519c26285160ff1d3d68a36c157c7 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -62,11 +62,11 @@ OpenStreetMap::Application.routes.draw do
     put "relation/:id" => "relations#update", :id => /\d+/
     delete "relation/:id" => "relations#delete", :id => /\d+/
     get "relations" => "relations#index"
     put "relation/:id" => "relations#update", :id => /\d+/
     delete "relation/:id" => "relations#delete", :id => /\d+/
     get "relations" => "relations#index"

-
-    get "map" => "map#index"

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

+    resource :map, :only => :show
+

     resources :tracepoints, :path => "trackpoints", :only => :index
 
     resources :users, :only => :index
     resources :tracepoints, :path => "trackpoints", :only => :index
 
     resources :users, :only => :index


@@ -322,11 +322,10 @@ OpenStreetMap::Application.routes.draw do
 
   # messages
   resources :messages, :path_names => { :new => "new/:display_name" }, :id => /\d+/, :only => [:new, :create, :show, :destroy] do
 
   # messages
   resources :messages, :path_names => { :new => "new/:display_name" }, :id => /\d+/, :only => [:new, :create, :show, :destroy] do

-    patch :unmute
-

     scope :module => :messages do
       resource :reply, :path_names => { :new => "new" }, :only => :new
       resource :read_mark, :only => [:create, :destroy]
     scope :module => :messages do
       resource :reply, :path_names => { :new => "new" }, :only => :new
       resource :read_mark, :only => [:create, :destroy]

+      resource :mute, :only => :destroy

     end
   end
   namespace :messages, :path => "/messages" do
     end
   end
   namespace :messages, :path => "/messages" do