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

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 178cda1cdf7f6b19769324ee622fa00f75086769..6efd17759e273e8a0d27d3e79634214d7cc34eb9 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -64,11 +64,11 @@ OpenStreetMap::Application.routes.draw do
     get "relations" => "relations#index"
 
     get "map" => "map#index"
-
-    get "trackpoints" => "tracepoints#index"
   end
 
   namespace :api, :path => "api/0.6" do
+    resources :tracepoints, :path => "trackpoints", :only => :index
+
     resources :users, :only => :index
     resources :users, :path => "user", :id => /\d+/, :only => :show
     resources :user_traces, :path => "user/gpx_files", :module => :users, :controller => :traces, :only => :index