X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/26777c44648f908b723c0c74b65972f75ac5fd3d..2b81437fcd38e74d38a41bfc60a917eadd74159b:/config/routes.rb diff --git a/config/routes.rb b/config/routes.rb index 1f25a62c6..a12490158 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,24 +1,26 @@ OpenStreetMap::Application.routes.draw do # API - get "api/capabilities" => "api#capabilities" + namespace :api do + get "capabilities" => "capabilities#show" + end scope "api/0.6" do - get "capabilities" => "api#capabilities" - get "permissions" => "api#permissions" - - put "changeset/create" => "changeset#create" - post "changeset/:id/upload" => "changeset#upload", :id => /\d+/ - get "changeset/:id/download" => "changeset#download", :as => :changeset_download, :id => /\d+/ - post "changeset/:id/expand_bbox" => "changeset#expand_bbox", :id => /\d+/ - get "changeset/:id" => "changeset#read", :as => :changeset_read, :id => /\d+/ - post "changeset/:id/subscribe" => "changeset#subscribe", :as => :changeset_subscribe, :id => /\d+/ - post "changeset/:id/unsubscribe" => "changeset#unsubscribe", :as => :changeset_unsubscribe, :id => /\d+/ - put "changeset/:id" => "changeset#update", :id => /\d+/ - put "changeset/:id/close" => "changeset#close", :id => /\d+/ - get "changesets" => "changeset#query" - post "changeset/:id/comment" => "changeset#comment", :as => :changeset_comment, :id => /\d+/ - post "changeset/comment/:id/hide" => "changeset#hide_comment", :as => :changeset_comment_hide, :id => /\d+/ - post "changeset/comment/:id/unhide" => "changeset#unhide_comment", :as => :changeset_comment_unhide, :id => /\d+/ + get "capabilities" => "api/capabilities#show" + get "permissions" => "api/permissions#show" + + put "changeset/create" => "api/changesets#create" + post "changeset/:id/upload" => "api/changesets#upload", :id => /\d+/ + get "changeset/:id/download" => "api/changesets#download", :as => :changeset_download, :id => /\d+/ + post "changeset/:id/expand_bbox" => "api/changesets#expand_bbox", :id => /\d+/ + get "changeset/:id" => "api/changesets#show", :as => :changeset_show, :id => /\d+/ + post "changeset/:id/subscribe" => "api/changesets#subscribe", :as => :changeset_subscribe, :id => /\d+/ + post "changeset/:id/unsubscribe" => "api/changesets#unsubscribe", :as => :changeset_unsubscribe, :id => /\d+/ + put "changeset/:id" => "api/changesets#update", :id => /\d+/ + put "changeset/:id/close" => "api/changesets#close", :id => /\d+/ + get "changesets" => "api/changesets#query" + post "changeset/:id/comment" => "api/changeset_comments#create", :as => :changeset_comment, :id => /\d+/ + post "changeset/comment/:id/hide" => "api/changeset_comments#destroy", :as => :changeset_comment_hide, :id => /\d+/ + post "changeset/comment/:id/unhide" => "api/changeset_comments#restore", :as => :changeset_comment_unhide, :id => /\d+/ put "node/create" => "nodes#create" get "node/:id/ways" => "ways#ways_for_node", :id => /\d+/ @@ -26,10 +28,10 @@ OpenStreetMap::Application.routes.draw do get "node/:id/history" => "old_nodes#history", :id => /\d+/ post "node/:id/:version/redact" => "old_nodes#redact", :version => /\d+/, :id => /\d+/ get "node/:id/:version" => "old_nodes#version", :id => /\d+/, :version => /\d+/ - get "node/:id" => "nodes#read", :id => /\d+/ + get "node/:id" => "nodes#show", :id => /\d+/ put "node/:id" => "nodes#update", :id => /\d+/ delete "node/:id" => "nodes#delete", :id => /\d+/ - get "nodes" => "nodes#nodes" + get "nodes" => "nodes#index" put "way/create" => "ways#create" get "way/:id/history" => "old_ways#history", :id => /\d+/ @@ -37,10 +39,10 @@ OpenStreetMap::Application.routes.draw do get "way/:id/relations" => "relations#relations_for_way", :id => /\d+/ post "way/:id/:version/redact" => "old_ways#redact", :version => /\d+/, :id => /\d+/ get "way/:id/:version" => "old_ways#version", :id => /\d+/, :version => /\d+/ - get "way/:id" => "ways#read", :id => /\d+/ + get "way/:id" => "ways#show", :id => /\d+/ put "way/:id" => "ways#update", :id => /\d+/ delete "way/:id" => "ways#delete", :id => /\d+/ - get "ways" => "ways#ways" + get "ways" => "ways#index" put "relation/create" => "relations#create" get "relation/:id/relations" => "relations#relations_for_relation", :id => /\d+/ @@ -48,21 +50,21 @@ OpenStreetMap::Application.routes.draw do get "relation/:id/full" => "relations#full", :id => /\d+/ post "relation/:id/:version/redact" => "old_relations#redact", :version => /\d+/, :id => /\d+/ get "relation/:id/:version" => "old_relations#version", :id => /\d+/, :version => /\d+/ - get "relation/:id" => "relations#read", :id => /\d+/ + get "relation/:id" => "relations#show", :id => /\d+/ put "relation/:id" => "relations#update", :id => /\d+/ delete "relation/:id" => "relations#delete", :id => /\d+/ - get "relations" => "relations#relations" + get "relations" => "relations#index" - get "map" => "api#map" + get "map" => "api/map#index" - get "trackpoints" => "api#trackpoints" + get "trackpoints" => "api/tracepoints#index" - get "changes" => "api#changes" + get "changes" => "api/changes#index" - get "search" => "search#search_all", :as => "api_search" - get "ways/search" => "search#search_ways" - get "relations/search" => "search#search_relations" - get "nodes/search" => "search#search_nodes" + get "search" => "api/search#search_all", :as => "api_search" + get "ways/search" => "api/search#search_ways" + get "relations/search" => "api/search#search_relations" + get "nodes/search" => "api/search#search_nodes" get "user/:id" => "users#api_read", :id => /\d+/ get "user/details" => "users#api_details" @@ -116,14 +118,14 @@ OpenStreetMap::Application.routes.draw do get "/relation/:id" => "browse#relation", :id => /\d+/, :as => :relation get "/relation/:id/history" => "browse#relation_history", :id => /\d+/ get "/changeset/:id" => "browse#changeset", :as => :changeset, :id => /\d+/ - get "/changeset/:id/comments/feed" => "changeset#comments_feed", :as => :changeset_comments_feed, :id => /\d*/, :defaults => { :format => "rss" } + get "/changeset/:id/comments/feed" => "changeset_comments#index", :as => :changeset_comments_feed, :id => /\d*/, :defaults => { :format => "rss" } get "/note/:id" => "browse#note", :id => /\d+/, :as => "browse_note" get "/note/new" => "browse#new_note" - get "/user/:display_name/history" => "changeset#index" - get "/user/:display_name/history/feed" => "changeset#feed", :defaults => { :format => :atom } + get "/user/:display_name/history" => "changesets#index" + get "/user/:display_name/history/feed" => "changesets#feed", :defaults => { :format => :atom } get "/user/:display_name/notes" => "notes#mine" - get "/history/friends" => "changeset#index", :friends => true, :as => "friend_changesets", :defaults => { :format => :html } - get "/history/nearby" => "changeset#index", :nearby => true, :as => "nearby_changesets", :defaults => { :format => :html } + get "/history/friends" => "changesets#index", :friends => true, :as => "friend_changesets", :defaults => { :format => :html } + get "/history/nearby" => "changesets#index", :nearby => true, :as => "nearby_changesets", :defaults => { :format => :html } get "/browse/way/:id", :to => redirect(:path => "/way/%{id}") get "/browse/way/:id/history", :to => redirect(:path => "/way/%{id}/history") @@ -150,9 +152,9 @@ OpenStreetMap::Application.routes.draw do get "/fixthemap" => "site#fixthemap" get "/help" => "site#help" get "/about" => "site#about" - get "/history" => "changeset#index" - get "/history/feed" => "changeset#feed", :defaults => { :format => :atom } - get "/history/comments/feed" => "changeset#comments_feed", :as => :changesets_comments_feed, :defaults => { :format => "rss" } + get "/history" => "changesets#index" + get "/history/feed" => "changesets#feed", :defaults => { :format => :atom } + get "/history/comments/feed" => "changeset_comments#index", :as => :changesets_comments_feed, :defaults => { :format => "rss" } get "/export" => "site#export" match "/login" => "users#login", :via => [:get, :post] match "/logout" => "users#logout", :via => [:get, :post]