X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/043d29fd7eb72048cf5d07edfbc20ec5c25af708..97ff32f5286bf9477829cbfb05f0f26dde128380:/config/routes.rb diff --git a/config/routes.rb b/config/routes.rb index 59c0dac86..3f0c7b494 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,92 +1,96 @@ OpenStreetMap::Application.routes.draw do # API - match "api/capabilities" => "api#capabilities", :via => :get - match "api/0.6/capabilities" => "api#capabilities", :via => :get - match "api/0.6/permissions" => "api#permissions", :via => :get - - match "api/0.6/changeset/create" => "changeset#create", :via => :put - match "api/0.6/changeset/:id/upload" => "changeset#upload", :via => :post, :id => /\d+/ - match "api/0.6/changeset/:id/download" => "changeset#download", :via => :get, :as => :changeset_download, :id => /\d+/ - match "api/0.6/changeset/:id/expand_bbox" => "changeset#expand_bbox", :via => :post, :id => /\d+/ - match "api/0.6/changeset/:id" => "changeset#read", :via => :get, :as => :changeset_read, :id => /\d+/ - match "api/0.6/changeset/:id/subscribe" => "changeset#subscribe", :via => :post, :as => :changeset_subscribe, :id => /\d+/ - match "api/0.6/changeset/:id/unsubscribe" => "changeset#unsubscribe", :via => :post, :as => :changeset_unsubscribe, :id => /\d+/ - match "api/0.6/changeset/:id" => "changeset#update", :via => :put, :id => /\d+/ - match "api/0.6/changeset/:id/close" => "changeset#close", :via => :put, :id => /\d+/ - match "api/0.6/changesets" => "changeset#query", :via => :get - post "api/0.6/changeset/:id/comment" => "changeset#comment", :as => :changeset_comment, :id => /\d+/ - post "api/0.6/changeset/comment/:id/hide" => "changeset#hide_comment", :as => :changeset_comment_hide, :id => /\d+/ - post "api/0.6/changeset/comment/:id/unhide" => "changeset#unhide_comment", :as => :changeset_comment_unhide, :id => /\d+/ - - match "api/0.6/node/create" => "node#create", :via => :put - match "api/0.6/node/:id/ways" => "way#ways_for_node", :via => :get, :id => /\d+/ - match "api/0.6/node/:id/relations" => "relation#relations_for_node", :via => :get, :id => /\d+/ - match "api/0.6/node/:id/history" => "old_node#history", :via => :get, :id => /\d+/ - match "api/0.6/node/:id/:version/redact" => "old_node#redact", :via => :post, :version => /\d+/, :id => /\d+/ - match "api/0.6/node/:id/:version" => "old_node#version", :via => :get, :id => /\d+/, :version => /\d+/ - match "api/0.6/node/:id" => "node#read", :via => :get, :id => /\d+/ - match "api/0.6/node/:id" => "node#update", :via => :put, :id => /\d+/ - match "api/0.6/node/:id" => "node#delete", :via => :delete, :id => /\d+/ - match "api/0.6/nodes" => "node#nodes", :via => :get - - match "api/0.6/way/create" => "way#create", :via => :put - match "api/0.6/way/:id/history" => "old_way#history", :via => :get, :id => /\d+/ - match "api/0.6/way/:id/full" => "way#full", :via => :get, :id => /\d+/ - match "api/0.6/way/:id/relations" => "relation#relations_for_way", :via => :get, :id => /\d+/ - match "api/0.6/way/:id/:version/redact" => "old_way#redact", :via => :post, :version => /\d+/, :id => /\d+/ - match "api/0.6/way/:id/:version" => "old_way#version", :via => :get, :id => /\d+/, :version => /\d+/ - match "api/0.6/way/:id" => "way#read", :via => :get, :id => /\d+/ - match "api/0.6/way/:id" => "way#update", :via => :put, :id => /\d+/ - match "api/0.6/way/:id" => "way#delete", :via => :delete, :id => /\d+/ - match "api/0.6/ways" => "way#ways", :via => :get - - match "api/0.6/relation/create" => "relation#create", :via => :put - match "api/0.6/relation/:id/relations" => "relation#relations_for_relation", :via => :get, :id => /\d+/ - match "api/0.6/relation/:id/history" => "old_relation#history", :via => :get, :id => /\d+/ - match "api/0.6/relation/:id/full" => "relation#full", :via => :get, :id => /\d+/ - match "api/0.6/relation/:id/:version/redact" => "old_relation#redact", :via => :post, :version => /\d+/, :id => /\d+/ - match "api/0.6/relation/:id/:version" => "old_relation#version", :via => :get, :id => /\d+/, :version => /\d+/ - match "api/0.6/relation/:id" => "relation#read", :via => :get, :id => /\d+/ - match "api/0.6/relation/:id" => "relation#update", :via => :put, :id => /\d+/ - match "api/0.6/relation/:id" => "relation#delete", :via => :delete, :id => /\d+/ - match "api/0.6/relations" => "relation#relations", :via => :get - - match "api/0.6/map" => "api#map", :via => :get - - match "api/0.6/trackpoints" => "api#trackpoints", :via => :get - - match "api/0.6/changes" => "api#changes", :via => :get - - match "api/0.6/search" => "search#search_all", :via => :get - match "api/0.6/ways/search" => "search#search_ways", :via => :get - match "api/0.6/relations/search" => "search#search_relations", :via => :get - match "api/0.6/nodes/search" => "search#search_nodes", :via => :get - - match "api/0.6/user/:id" => "user#api_read", :via => :get, :id => /\d+/ - match "api/0.6/user/details" => "user#api_details", :via => :get - match "api/0.6/user/gpx_files" => "user#api_gpx_files", :via => :get - - match "api/0.6/user/preferences" => "user_preference#read", :via => :get - match "api/0.6/user/preferences/:preference_key" => "user_preference#read_one", :via => :get - match "api/0.6/user/preferences" => "user_preference#update", :via => :put - match "api/0.6/user/preferences/:preference_key" => "user_preference#update_one", :via => :put - match "api/0.6/user/preferences/:preference_key" => "user_preference#delete_one", :via => :delete - - match "api/0.6/gpx/create" => "trace#api_create", :via => :post - match "api/0.6/gpx/:id" => "trace#api_read", :via => :get, :id => /\d+/ - match "api/0.6/gpx/:id" => "trace#api_update", :via => :put, :id => /\d+/ - match "api/0.6/gpx/:id" => "trace#api_delete", :via => :delete, :id => /\d+/ - match "api/0.6/gpx/:id/details" => "trace#api_read", :via => :get, :id => /\d+/ - match "api/0.6/gpx/:id/data" => "trace#api_data", :via => :get - - # AMF (ActionScript) API - match "api/0.6/amf/read" => "amf#amf_read", :via => :post - match "api/0.6/amf/write" => "amf#amf_write", :via => :post - match "api/0.6/swf/trackpoints" => "swf#trackpoints", :via => :get - - # Map notes API + namespace :api do + get "capabilities" => "capabilities#show" + end + scope "api/0.6" do - resources :notes, :except => [:new, :edit, :update], :constraints => { :id => /\d+/ }, :defaults => { :format => "xml" } do + 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" => "api/nodes#create" + 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+/ + 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" + + put "way/create" => "api/ways#create" + 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+/ + 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" + + put "relation/create" => "api/relations#create" + 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+/ + 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" + + 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" + + post "gpx/create" => "api/traces#create" + get "gpx/:id" => "api/traces#show", :id => /\d+/ + put "gpx/:id" => "api/traces#update", :id => /\d+/ + delete "gpx/:id" => "api/traces#destroy", :id => /\d+/ + get "gpx/:id/details" => "api/traces#show", :id => /\d+/ + get "gpx/:id/data" => "api/traces#data" + + # 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 collection do get "search" get "feed", :defaults => { :format => "rss" } @@ -99,29 +103,29 @@ OpenStreetMap::Application.routes.draw do end end - match "notes/addPOIexec" => "notes#create", :via => :post - match "notes/closePOIexec" => "notes#close", :via => :post - match "notes/editPOIexec" => "notes#comment", :via => :post - match "notes/getGPX" => "notes#index", :via => :get, :format => "gpx" - match "notes/getRSSfeed" => "notes#feed", :via => :get, :format => "rss" + post "notes/addPOIexec" => "api/notes#create" + post "notes/closePOIexec" => "api/notes#close" + post "notes/editPOIexec" => "api/notes#comment" + get "notes/getGPX" => "api/notes#index", :format => "gpx" + get "notes/getRSSfeed" => "api/notes#feed", :format => "rss" end # Data browsing - match "/way/:id" => "browse#way", :via => :get, :id => /\d+/, :as => :way - match "/way/:id/history" => "browse#way_history", :via => :get, :id => /\d+/ - match "/node/:id" => "browse#node", :via => :get, :id => /\d+/, :as => :node - match "/node/:id/history" => "browse#node_history", :via => :get, :id => /\d+/ - match "/relation/:id" => "browse#relation", :via => :get, :id => /\d+/, :as => :relation - match "/relation/:id/history" => "browse#relation_history", :via => :get, :id => /\d+/ - match "/changeset/:id" => "browse#changeset", :via => :get, :as => :changeset, :id => /\d+/ - match "/changeset/:id/comments/feed" => "changeset#comments_feed", :via => :get, :as => :changeset_comments_feed, :id => /\d*/, :defaults => { :format => "rss" } - match "/note/:id" => "browse#note", :via => :get, :id => /\d+/, :as => "browse_note" - match "/note/new" => "browse#new_note", :via => :get - match "/user/:display_name/history" => "changeset#list", :via => :get - match "/user/:display_name/history/feed" => "changeset#feed", :via => :get, :defaults => { :format => :atom } - match "/user/:display_name/notes" => "notes#mine", :via => :get - match "/history/friends" => "changeset#list", :via => :get, :friends => true, :as => "friend_changesets", :defaults => { :format => :html } - match "/history/nearby" => "changeset#list", :via => :get, :nearby => true, :as => "nearby_changesets", :defaults => { :format => :html } + get "/way/:id" => "browse#way", :id => /\d+/, :as => :way + get "/way/:id/history" => "browse#way_history", :id => /\d+/ + get "/node/:id" => "browse#node", :id => /\d+/, :as => :node + get "/node/:id/history" => "browse#node_history", :id => /\d+/ + 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#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" => "changesets#index" + get "/user/:display_name/history/feed" => "changesets#feed", :defaults => { :format => :atom } + get "/user/:display_name/notes" => "notes#mine" + 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") @@ -141,134 +145,142 @@ OpenStreetMap::Application.routes.draw do # web site root :to => "site#index", :via => [:get, :post] - match "/edit" => "site#edit", :via => :get, :as => :edit - match "/copyright/:copyright_locale" => "site#copyright", :via => :get - match "/copyright" => "site#copyright", :via => :get - match "/welcome" => "site#welcome", :via => :get, :as => :welcome - match "/fixthemap" => "site#fixthemap", :via => :get, :as => :fixthemap - match "/help" => "site#help", :via => :get, :as => :help - match "/about" => "site#about", :via => :get, :as => :about - match "/history" => "changeset#list", :via => :get - match "/history/feed" => "changeset#feed", :via => :get, :defaults => { :format => :atom } - match "/history/comments/feed" => "changeset#comments_feed", :via => :get, :as => :changesets_comments_feed, :defaults => { :format => "rss" } - match "/export" => "site#export", :via => :get - match "/login" => "user#login", :via => [:get, :post] - match "/logout" => "user#logout", :via => [:get, :post] - match "/offline" => "site#offline", :via => :get - match "/key" => "site#key", :via => :get - match "/id" => "site#id", :via => :get - match "/query" => "browse#query", :via => :get - match "/user/new" => "user#new", :via => :get - match "/user/new" => "user#create", :via => :post - match "/user/terms" => "user#terms", :via => :get - match "/user/save" => "user#save", :via => :post - match "/user/:display_name/confirm/resend" => "user#confirm_resend", :via => :get - match "/user/:display_name/confirm" => "user#confirm", :via => [:get, :post] - match "/user/confirm" => "user#confirm", :via => [:get, :post] - match "/user/confirm-email" => "user#confirm_email", :via => [:get, :post] - match "/user/go_public" => "user#go_public", :via => :post - match "/user/reset-password" => "user#reset_password", :via => [:get, :post] - match "/user/forgot-password" => "user#lost_password", :via => [:get, :post] - match "/user/suspended" => "user#suspended", :via => :get + get "/edit" => "site#edit" + get "/copyright/:copyright_locale" => "site#copyright" + get "/copyright" => "site#copyright" + get "/welcome" => "site#welcome" + get "/fixthemap" => "site#fixthemap" + get "/help" => "site#help" + get "/about" => "site#about" + 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] + get "/offline" => "site#offline" + get "/key" => "site#key" + get "/id" => "site#id" + get "/query" => "browse#query" + get "/user/new" => "users#new" + post "/user/new" => "users#create" + get "/user/terms" => "users#terms" + post "/user/save" => "users#save" + get "/user/:display_name/confirm/resend" => "users#confirm_resend" + match "/user/:display_name/confirm" => "users#confirm", :via => [:get, :post] + match "/user/confirm" => "users#confirm", :via => [:get, :post] + match "/user/confirm-email" => "users#confirm_email", :via => [:get, :post] + post "/user/go_public" => "users#go_public" + match "/user/reset-password" => "users#reset_password", :via => [:get, :post] + match "/user/forgot-password" => "users#lost_password", :via => [:get, :post] + get "/user/suspended" => "users#suspended" get "/index.html", :to => redirect(:path => "/") get "/create-account.html", :to => redirect(:path => "/user/new") get "/forgot-password.html", :to => redirect(:path => "/user/forgot-password") # omniauth - match "/auth/failure" => "user#auth_failure", :via => :get - match "/auth/:provider/callback" => "user#auth_success", :via => [:get, :post], :as => :auth_success - match "/auth/:provider" => "user#auth", :via => [:get, :post], :as => :auth + get "/auth/failure" => "users#auth_failure" + match "/auth/:provider/callback" => "users#auth_success", :via => [:get, :post], :as => :auth_success + match "/auth/:provider" => "users#auth", :via => [:get, :post], :as => :auth # permalink - match "/go/:code" => "site#permalink", :via => :get, :code => /[a-zA-Z0-9_@~]+[=-]*/ + get "/go/:code" => "site#permalink", :code => /[a-zA-Z0-9_@~]+[=-]*/ # rich text preview - match "/preview/:format" => "site#preview", :via => :post, :as => :preview + post "/preview/:type" => "site#preview", :as => :preview # traces - match "/user/:display_name/traces/tag/:tag/page/:page" => "trace#list", :via => :get, :page => /[1-9][0-9]*/ - match "/user/:display_name/traces/tag/:tag" => "trace#list", :via => :get - match "/user/:display_name/traces/page/:page" => "trace#list", :via => :get, :page => /[1-9][0-9]*/ - match "/user/:display_name/traces" => "trace#list", :via => :get - match "/user/:display_name/traces/tag/:tag/rss" => "trace#georss", :via => :get, :defaults => { :format => :rss } - match "/user/:display_name/traces/rss" => "trace#georss", :via => :get, :defaults => { :format => :rss } - match "/user/:display_name/traces/:id" => "trace#view", :via => :get - match "/user/:display_name/traces/:id/picture" => "trace#picture", :via => :get - match "/user/:display_name/traces/:id/icon" => "trace#icon", :via => :get - match "/traces/tag/:tag/page/:page" => "trace#list", :via => :get, :page => /[1-9][0-9]*/ - match "/traces/tag/:tag" => "trace#list", :via => :get - match "/traces/page/:page" => "trace#list", :via => :get, :page => /[1-9][0-9]*/ - match "/traces" => "trace#list", :via => :get - match "/traces/tag/:tag/rss" => "trace#georss", :via => :get, :defaults => { :format => :rss } - match "/traces/rss" => "trace#georss", :via => :get, :defaults => { :format => :rss } - match "/traces/mine/tag/:tag/page/:page" => "trace#mine", :via => :get, :page => /[1-9][0-9]*/ - match "/traces/mine/tag/:tag" => "trace#mine", :via => :get - match "/traces/mine/page/:page" => "trace#mine", :via => :get - match "/traces/mine" => "trace#mine", :via => :get - match "/trace/create" => "trace#create", :via => [:get, :post] - match "/trace/:id/data" => "trace#data", :via => :get, :id => /\d+/, :as => "trace_data" - match "/trace/:id/edit" => "trace#edit", :via => [:get, :post, :patch], :id => /\d+/, :as => "trace_edit" - match "/trace/:id/delete" => "trace#delete", :via => :post, :id => /\d+/ + resources :traces, :except => [:show] + get "/user/:display_name/traces/tag/:tag/page/:page" => "traces#index", :page => /[1-9][0-9]*/ + get "/user/:display_name/traces/tag/:tag" => "traces#index" + get "/user/:display_name/traces/page/:page" => "traces#index", :page => /[1-9][0-9]*/ + get "/user/:display_name/traces" => "traces#index" + get "/user/:display_name/traces/tag/:tag/rss" => "traces#georss", :defaults => { :format => :rss } + get "/user/:display_name/traces/rss" => "traces#georss", :defaults => { :format => :rss } + get "/user/:display_name/traces/:id" => "traces#show" + get "/user/:display_name/traces/:id/picture" => "traces#picture" + get "/user/:display_name/traces/:id/icon" => "traces#icon" + get "/traces/tag/:tag/page/:page" => "traces#index", :page => /[1-9][0-9]*/ + get "/traces/tag/:tag" => "traces#index" + get "/traces/page/:page" => "traces#index", :page => /[1-9][0-9]*/ + get "/traces/tag/:tag/rss" => "traces#georss", :defaults => { :format => :rss } + get "/traces/rss" => "traces#georss", :defaults => { :format => :rss } + get "/traces/mine/tag/:tag/page/:page" => "traces#mine", :page => /[1-9][0-9]*/ + get "/traces/mine/tag/:tag" => "traces#mine" + get "/traces/mine/page/:page" => "traces#mine" + get "/traces/mine" => "traces#mine" + 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_entry#new", :via => [:get, :post] - match "/diary/friends" => "diary_entry#list", :friends => true, :via => :get, :as => "friend_diaries" - match "/diary/nearby" => "diary_entry#list", :nearby => true, :via => :get, :as => "nearby_diaries" - match "/user/:display_name/diary/rss" => "diary_entry#rss", :via => :get, :defaults => { :format => :rss } - match "/diary/:language/rss" => "diary_entry#rss", :via => :get, :defaults => { :format => :rss } - match "/diary/rss" => "diary_entry#rss", :via => :get, :defaults => { :format => :rss } - match "/user/:display_name/diary/comments/:page" => "diary_entry#comments", :via => :get, :page => /[1-9][0-9]*/ - match "/user/:display_name/diary/comments/" => "diary_entry#comments", :via => :get - match "/user/:display_name/diary" => "diary_entry#list", :via => :get - match "/diary/:language" => "diary_entry#list", :via => :get - match "/diary" => "diary_entry#list", :via => :get - match "/user/:display_name/diary/:id" => "diary_entry#view", :via => :get, :id => /\d+/ - match "/user/:display_name/diary/:id/newcomment" => "diary_entry#comment", :via => :post, :id => /\d+/ - match "/user/:display_name/diary/:id/edit" => "diary_entry#edit", :via => [:get, :post], :id => /\d+/ - match "/user/:display_name/diary/:id/hide" => "diary_entry#hide", :via => :post, :id => /\d+/, :as => :hide_diary_entry - match "/user/:display_name/diary/:id/hidecomment/:comment" => "diary_entry#hidecomment", :via => :post, :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment - match "/user/:display_name/diary/:id/subscribe" => "diary_entry#subscribe", :via => :post, :as => :diary_entry_subscribe, :id => /\d+/ - match "/user/:display_name/diary/:id/unsubscribe" => "diary_entry#unsubscribe", :via => :post, :as => :diary_entry_unsubscribe, :id => /\d+/ + 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 } + get "/user/:display_name/diary/comments/:page" => "diary_entries#comments", :page => /[1-9][0-9]*/ + get "/user/:display_name/diary/comments/" => "diary_entries#comments" + get "/user/:display_name/diary" => "diary_entries#index" + get "/diary/:language" => "diary_entries#index" + 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+/ + 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+/ # user pages - match "/user/:display_name" => "user#view", :via => :get, :as => "user" - match "/user/:display_name/make_friend" => "user#make_friend", :via => [:get, :post], :as => "make_friend" - match "/user/:display_name/remove_friend" => "user#remove_friend", :via => [:get, :post], :as => "remove_friend" - match "/user/:display_name/account" => "user#account", :via => [:get, :post] - match "/user/:display_name/set_status" => "user#set_status", :via => :get, :as => :set_status_user - match "/user/:display_name/delete" => "user#delete", :via => :get, :as => :delete_user + get "/user/:display_name" => "users#show", :as => "user" + match "/user/:display_name/make_friend" => "users#make_friend", :via => [:get, :post], :as => "make_friend" + match "/user/:display_name/remove_friend" => "users#remove_friend", :via => [:get, :post], :as => "remove_friend" + match "/user/:display_name/account" => "users#account", :via => [:get, :post] + get "/user/:display_name/set_status" => "users#set_status", :as => :set_status_user + get "/user/:display_name/delete" => "users#delete", :as => :delete_user # user lists - match "/users" => "user#list", :via => [:get, :post] - match "/users/:status" => "user#list", :via => [:get, :post] + match "/users" => "users#index", :via => [:get, :post] + match "/users/:status" => "users#index", :via => [:get, :post] # geocoder - match "/search" => "geocoder#search", :via => :get, :as => :search - match "/geocoder/search_latlon" => "geocoder#search_latlon", :via => :get - match "/geocoder/search_us_postcode" => "geocoder#search_us_postcode", :via => :get - match "/geocoder/search_uk_postcode" => "geocoder#search_uk_postcode", :via => :get - match "/geocoder/search_ca_postcode" => "geocoder#search_ca_postcode", :via => :get - match "/geocoder/search_osm_nominatim" => "geocoder#search_osm_nominatim", :via => :get - match "/geocoder/search_geonames" => "geocoder#search_geonames", :via => :get - match "/geocoder/search_osm_nominatim_reverse" => "geocoder#search_osm_nominatim_reverse", :via => :get - match "/geocoder/search_geonames_reverse" => "geocoder#search_geonames_reverse", :via => :get + get "/search" => "geocoder#search" + get "/geocoder/search_latlon" => "geocoder#search_latlon" + get "/geocoder/search_ca_postcode" => "geocoder#search_ca_postcode" + get "/geocoder/search_osm_nominatim" => "geocoder#search_osm_nominatim" + get "/geocoder/search_geonames" => "geocoder#search_geonames" + get "/geocoder/search_osm_nominatim_reverse" => "geocoder#search_osm_nominatim_reverse" + get "/geocoder/search_geonames_reverse" => "geocoder#search_geonames_reverse" # directions - match "/directions" => "directions#search", :via => :get, :as => :directions + get "/directions" => "directions#search" # export - match "/export/finish" => "export#finish", :via => :post - match "/export/embed" => "export#embed", :via => :get + post "/export/finish" => "export#finish" + get "/export/embed" => "export#embed" # messages - match "/user/:display_name/inbox" => "message#inbox", :via => :get, :as => "inbox" - match "/user/:display_name/outbox" => "message#outbox", :via => :get, :as => "outbox" - match "/message/new/:display_name" => "message#new", :via => [:get, :post], :as => "new_message" - match "/message/read/:message_id" => "message#read", :via => :get, :as => "read_message" - match "/message/mark/:message_id" => "message#mark", :via => :post, :as => "mark_message" - match "/message/reply/:message_id" => "message#reply", :via => [:get, :post], :as => "reply_message" - match "/message/delete/:message_id" => "message#delete", :via => :post, :as => "delete_message" + resources :messages, :only => [:create, :show, :destroy] do + post :mark + match :reply, :via => [:get, :post] + collection do + get :inbox + get :outbox + end + end + get "/user/:display_name/inbox", :to => redirect(:path => "/messages/inbox") + get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox") + get "/message/new/:display_name" => "messages#new", :as => "new_message" + get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}") # oauth admin pages (i.e: for setting up new clients, etc...) scope "/user/:display_name" do @@ -276,20 +288,38 @@ OpenStreetMap::Application.routes.draw do end match "/oauth/revoke" => "oauth#revoke", :via => [:get, :post] match "/oauth/authorize" => "oauth#authorize", :via => [:get, :post], :as => :authorize - match "/oauth/token" => "oauth#token", :via => :get, :as => :token + get "/oauth/token" => "oauth#token", :as => :token match "/oauth/request_token" => "oauth#request_token", :via => [:get, :post], :as => :request_token match "/oauth/access_token" => "oauth#access_token", :via => [:get, :post], :as => :access_token - match "/oauth/test_request" => "oauth#test_request", :via => :get, :as => :test_request + get "/oauth/test_request" => "oauth#test_request", :as => :test_request # roles and banning pages - match "/user/:display_name/role/:role/grant" => "user_roles#grant", :via => :post, :as => "grant_role" - match "/user/:display_name/role/:role/revoke" => "user_roles#revoke", :via => :post, :as => "revoke_role" - match "/user/:display_name/blocks" => "user_blocks#blocks_on", :via => :get - match "/user/:display_name/blocks_by" => "user_blocks#blocks_by", :via => :get - match "/blocks/new/:display_name" => "user_blocks#new", :via => :get, :as => "new_user_block" + post "/user/:display_name/role/:role/grant" => "user_roles#grant", :as => "grant_role" + post "/user/:display_name/role/:role/revoke" => "user_roles#revoke", :as => "revoke_role" + get "/user/:display_name/blocks" => "user_blocks#blocks_on" + get "/user/:display_name/blocks_by" => "user_blocks#blocks_by" + get "/blocks/new/:display_name" => "user_blocks#new", :as => "new_user_block" resources :user_blocks match "/blocks/:id/revoke" => "user_blocks#revoke", :via => [:get, :post], :as => "revoke_user_block" + # issues and reports + resources :issues do + resources :comments, :controller => :issue_comments + member do + post "resolve" + post "assign" + post "ignore" + post "reopen" + end + end + + resources :reports + # redactions resources :redactions + + # errors + match "/403", :to => "errors#forbidden", :via => :all + match "/404", :to => "errors#not_found", :via => :all + match "/500", :to => "errors#internal_server_error", :via => :all end