X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/363155a2a86796d27ee9161f1ee9b74d6fa307e5..8381836f606db4cca681416e0fac497746603d29:/config/routes.rb diff --git a/config/routes.rb b/config/routes.rb index 3d018a53f..992197814 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,8 @@ OpenStreetMap::Application.routes.draw do # API namespace :api do - get "capabilities" => "capabilities#show" + get "capabilities" => "capabilities#show" # Deprecated, remove when 0.6 support is removed + get "versions" => "versions#show" end scope "api/0.6" do @@ -11,7 +12,6 @@ OpenStreetMap::Application.routes.draw do 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+/ @@ -23,59 +23,54 @@ OpenStreetMap::Application.routes.draw do post "changeset/comment/:id/unhide" => "api/changeset_comments#restore", :as => :changeset_comment_unhide, :id => /\d+/ put "node/create" => "api/nodes#create" - get "node/:id/ways" => "api/ways#ways_for_node", :id => /\d+/, :defaults => { :format => "xml" } - get "node/:id/relations" => "api/relations#relations_for_node", :id => /\d+/, :defaults => { :format => "xml" } - get "node/:id/history" => "api/old_nodes#history", :id => /\d+/, :defaults => { :format => "xml" } + get "node/:id/ways" => "api/ways#ways_for_node", :id => /\d+/ + get "node/:id/relations" => "api/relations#relations_for_node", :id => /\d+/ + get "node/:id/history" => "api/old_nodes#history", :id => /\d+/ post "node/:id/:version/redact" => "api/old_nodes#redact", :version => /\d+/, :id => /\d+/ - get "node/:id/:version" => "api/old_nodes#version", :id => /\d+/, :version => /\d+/, :defaults => { :format => "xml" } - get "node/:id" => "api/nodes#show", :id => /\d+/, :defaults => { :format => "xml" } + get "node/:id/:version" => "api/old_nodes#version", :id => /\d+/, :version => /\d+/ + get "node/:id" => "api/nodes#show", :id => /\d+/ put "node/:id" => "api/nodes#update", :id => /\d+/ delete "node/:id" => "api/nodes#delete", :id => /\d+/ - get "nodes" => "api/nodes#index", :defaults => { :format => "xml" } + get "nodes" => "api/nodes#index" put "way/create" => "api/ways#create" - get "way/:id/history" => "api/old_ways#history", :id => /\d+/, :defaults => { :format => "xml" } - get "way/:id/full" => "api/ways#full", :id => /\d+/, :defaults => { :format => "xml" } - get "way/:id/relations" => "api/relations#relations_for_way", :id => /\d+/, :defaults => { :format => "xml" } + get "way/:id/history" => "api/old_ways#history", :id => /\d+/ + get "way/:id/full" => "api/ways#full", :id => /\d+/ + get "way/:id/relations" => "api/relations#relations_for_way", :id => /\d+/ post "way/:id/:version/redact" => "api/old_ways#redact", :version => /\d+/, :id => /\d+/ - get "way/:id/:version" => "api/old_ways#version", :id => /\d+/, :version => /\d+/, :defaults => { :format => "xml" } - get "way/:id" => "api/ways#show", :id => /\d+/, :defaults => { :format => "xml" } + get "way/:id/:version" => "api/old_ways#version", :id => /\d+/, :version => /\d+/ + get "way/:id" => "api/ways#show", :id => /\d+/ put "way/:id" => "api/ways#update", :id => /\d+/ delete "way/:id" => "api/ways#delete", :id => /\d+/ - get "ways" => "api/ways#index", :defaults => { :format => "xml" } + get "ways" => "api/ways#index" put "relation/create" => "api/relations#create" - get "relation/:id/relations" => "api/relations#relations_for_relation", :id => /\d+/, :defaults => { :format => "xml" } - get "relation/:id/history" => "api/old_relations#history", :id => /\d+/, :defaults => { :format => "xml" } - get "relation/:id/full" => "api/relations#full", :id => /\d+/, :defaults => { :format => "xml" } + get "relation/:id/relations" => "api/relations#relations_for_relation", :id => /\d+/ + get "relation/:id/history" => "api/old_relations#history", :id => /\d+/ + get "relation/:id/full" => "api/relations#full", :id => /\d+/ post "relation/:id/:version/redact" => "api/old_relations#redact", :version => /\d+/, :id => /\d+/ - get "relation/:id/:version" => "api/old_relations#version", :id => /\d+/, :version => /\d+/, :defaults => { :format => "xml" } - get "relation/:id" => "api/relations#show", :id => /\d+/, :defaults => { :format => "xml" } + get "relation/:id/:version" => "api/old_relations#version", :id => /\d+/, :version => /\d+/ + get "relation/:id" => "api/relations#show", :id => /\d+/ put "relation/:id" => "api/relations#update", :id => /\d+/ delete "relation/:id" => "api/relations#delete", :id => /\d+/ - get "relations" => "api/relations#index", :defaults => { :format => "xml" } + get "relations" => "api/relations#index" - get "map" => "api/map#index", :defaults => { :format => "xml" } + get "map" => "api/map#index" get "trackpoints" => "api/tracepoints#index" get "changes" => "api/changes#index" - 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" => "api/users#show", :id => /\d+/ get "user/details" => "api/users#details" get "user/gpx_files" => "api/users#gpx_files" get "users" => "api/users#index", :as => :api_users - get "user/preferences" => "api/user_preferences#read" - get "user/preferences/:preference_key" => "api/user_preferences#read_one" - put "user/preferences" => "api/user_preferences#update" - put "user/preferences/:preference_key" => "api/user_preferences#update_one" - delete "user/preferences/:preference_key" => "api/user_preferences#delete_one" + get "user/preferences" => "api/user_preferences#index" + get "user/preferences/:preference_key" => "api/user_preferences#show" + put "user/preferences" => "api/user_preferences#update_all" + put "user/preferences/:preference_key" => "api/user_preferences#update" + delete "user/preferences/:preference_key" => "api/user_preferences#destroy" post "gpx/create" => "api/traces#create" get "gpx/:id" => "api/traces#show", :id => /\d+/ @@ -87,7 +82,6 @@ OpenStreetMap::Application.routes.draw do # AMF (ActionScript) API post "amf/read" => "api/amf#amf_read" post "amf/write" => "api/amf#amf_write" - get "swf/trackpoints" => "api/swf#trackpoints" # Map notes API resources :notes, :except => [:new, :edit, :update], :constraints => { :id => /\d+/ }, :defaults => { :format => "xml" }, :controller => "api/notes" do @@ -213,12 +207,14 @@ OpenStreetMap::Application.routes.draw do get "/trace/create", :to => redirect(:path => "/traces/new") get "/trace/:id/data" => "traces#data", :id => /\d+/, :as => "trace_data" get "/trace/:id/edit", :to => redirect(:path => "/traces/%{id}/edit") - post "/trace/:id/delete" => "traces#delete", :id => /\d+/ # diary pages - match "/diary/new" => "diary_entries#new", :via => [:get, :post] - get "/diary/friends" => "diary_entries#index", :friends => true, :as => "friend_diaries" - get "/diary/nearby" => "diary_entries#index", :nearby => true, :as => "nearby_diaries" + resources :diary_entries, :path => "diary", :only => [:new, :create, :index] do + collection do + get "friends" => "diary_entries#index", :friends => true + get "nearby" => "diary_entries#index", :nearby => true + end + end get "/user/:display_name/diary/rss" => "diary_entries#rss", :defaults => { :format => :rss } get "/diary/:language/rss" => "diary_entries#rss", :defaults => { :format => :rss } get "/diary/rss" => "diary_entries#rss", :defaults => { :format => :rss } @@ -226,12 +222,14 @@ OpenStreetMap::Application.routes.draw do get "/user/:display_name/diary/comments/" => "diary_entries#comments" get "/user/:display_name/diary" => "diary_entries#index" get "/diary/:language" => "diary_entries#index" - get "/diary" => "diary_entries#index" - get "/user/:display_name/diary/:id" => "diary_entries#show", :id => /\d+/, :as => :diary_entry + scope "/user/:display_name" do + resources :diary_entries, :path => "diary", :only => [:edit, :update, :show] + end post "/user/:display_name/diary/:id/newcomment" => "diary_entries#comment", :id => /\d+/ - match "/user/:display_name/diary/:id/edit" => "diary_entries#edit", :via => [:get, :post], :id => /\d+/ post "/user/:display_name/diary/:id/hide" => "diary_entries#hide", :id => /\d+/, :as => :hide_diary_entry + post "/user/:display_name/diary/:id/unhide" => "diary_entries#unhide", :id => /\d+/, :as => :unhide_diary_entry post "/user/:display_name/diary/:id/hidecomment/:comment" => "diary_entries#hidecomment", :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment + post "/user/:display_name/diary/:id/unhidecomment/:comment" => "diary_entries#unhidecomment", :id => /\d+/, :comment => /\d+/, :as => :unhide_diary_comment post "/user/:display_name/diary/:id/subscribe" => "diary_entries#subscribe", :as => :diary_entry_subscribe, :id => /\d+/ post "/user/:display_name/diary/:id/unsubscribe" => "diary_entries#unsubscribe", :as => :diary_entry_unsubscribe, :id => /\d+/