Merge pull request #5362 from AntonKhorev/color-mode-preference-map

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index f65042dd7d9ab1c9bf83e22b5c2f1c71c5503ff9..871fef1bf27f667279d32c4a22be320abd2d3a4a 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -86,16 +86,17 @@ OpenStreetMap::Application.routes.draw do
     end
 
     post "/user/messages/:id" => "messages#update", :as => :api_message_update
     end
 
     post "/user/messages/:id" => "messages#update", :as => :api_message_update

-
-    post "gpx/create" => "traces#create"
-    get "gpx/:id" => "traces#show", :as => :api_trace, :id => /\d+/
-    put "gpx/:id" => "traces#update", :id => /\d+/
-    delete "gpx/:id" => "traces#destroy", :id => /\d+/
-    get "gpx/:id/details" => "traces#show", :id => /\d+/
-    get "gpx/:id/data" => "traces#data", :as => :api_trace_data

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

+    resources :traces, :path => "gpx", :only => [:create, :show, :update, :destroy], :id => /\d+/ do
+      scope :module => :traces do
+        resource :data, :only => :show
+      end
+    end
+    post "gpx/create" => "traces#create", :id => /\d+/, :as => :trace_create
+    get "gpx/:id/details" => "traces#show", :id => /\d+/, :as => :trace_details
+

     # Map notes API
     resources :notes, :except => [:new, :edit, :update], :id => /\d+/, :controller => "notes" do
       collection do
     # Map notes API
     resources :notes, :except => [:new, :edit, :update], :id => /\d+/, :controller => "notes" do
       collection do