X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/25ebf87e5aaa2fbe979dcf47d59cfebe08e43ad8..3d79f9fd88ab2784b292c8eafc46070472b2a4c9:/config/routes.rb?ds=inline diff --git a/config/routes.rb b/config/routes.rb index d936072d7..f65042dd7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,91 +1,103 @@ OpenStreetMap::Application.routes.draw do + use_doorkeeper :scope => "oauth2" do + controllers :authorizations => "oauth2_authorizations", + :applications => "oauth2_applications", + :authorized_applications => "oauth2_authorized_applications" + end + + use_doorkeeper_openid_connect :scope => "oauth2" if Settings.key?(:doorkeeper_signing_key) + # API namespace :api do get "capabilities" => "capabilities#show" # Deprecated, remove when 0.6 support is removed get "versions" => "versions#show" end - scope "api/0.6" 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 "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#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+/ - 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" + scope "api/0.6", :module => :api do + get "capabilities" => "capabilities#show" + get "permissions" => "permissions#show" + + put "changeset/create" => "changesets#create" + post "changeset/:id/upload" => "changesets#upload", :as => :changeset_upload, :id => /\d+/ + get "changeset/:id/download" => "changesets#download", :as => :changeset_download, :id => /\d+/ + get "changeset/:id" => "changesets#show", :as => :changeset_show, :id => /\d+/ + post "changeset/:id/subscribe" => "changesets#subscribe", :as => :api_changeset_subscribe, :id => /\d+/ + post "changeset/:id/unsubscribe" => "changesets#unsubscribe", :as => :api_changeset_unsubscribe, :id => /\d+/ + put "changeset/:id" => "changesets#update", :id => /\d+/ + put "changeset/:id/close" => "changesets#close", :as => :changeset_close, :id => /\d+/ + get "changesets" => "changesets#index" + post "changeset/:id/comment" => "changeset_comments#create", :as => :changeset_comment, :id => /\d+/ + post "changeset/comment/:id/hide" => "changeset_comments#destroy", :as => :changeset_comment_hide, :id => /\d+/ + post "changeset/comment/:id/unhide" => "changeset_comments#restore", :as => :changeset_comment_unhide, :id => /\d+/ + + put "node/create" => "nodes#create" + get "node/:id/ways" => "ways#ways_for_node", :as => :node_ways, :id => /\d+/ + get "node/:id/relations" => "relations#relations_for_node", :as => :node_relations, :id => /\d+/ + get "node/:id/history" => "old_nodes#history", :as => :api_node_history, :id => /\d+/ + post "node/:id/:version/redact" => "old_nodes#redact", :as => :node_version_redact, :version => /\d+/, :id => /\d+/ + get "node/:id/:version" => "old_nodes#show", :as => :api_old_node, :id => /\d+/, :version => /\d+/ + get "node/:id" => "nodes#show", :as => :api_node, :id => /\d+/ + put "node/:id" => "nodes#update", :id => /\d+/ + delete "node/:id" => "nodes#delete", :id => /\d+/ + get "nodes" => "nodes#index" + + put "way/create" => "ways#create" + get "way/:id/history" => "old_ways#history", :as => :api_way_history, :id => /\d+/ + get "way/:id/full" => "ways#full", :as => :way_full, :id => /\d+/ + get "way/:id/relations" => "relations#relations_for_way", :as => :way_relations, :id => /\d+/ + post "way/:id/:version/redact" => "old_ways#redact", :as => :way_version_redact, :version => /\d+/, :id => /\d+/ + get "way/:id/:version" => "old_ways#show", :as => :api_old_way, :id => /\d+/, :version => /\d+/ + get "way/:id" => "ways#show", :as => :api_way, :id => /\d+/ + put "way/:id" => "ways#update", :id => /\d+/ + delete "way/:id" => "ways#delete", :id => /\d+/ + get "ways" => "ways#index" + + put "relation/create" => "relations#create" + get "relation/:id/relations" => "relations#relations_for_relation", :as => :relation_relations, :id => /\d+/ + get "relation/:id/history" => "old_relations#history", :as => :api_relation_history, :id => /\d+/ + get "relation/:id/full" => "relations#full", :as => :relation_full, :id => /\d+/ + post "relation/:id/:version/redact" => "old_relations#redact", :as => :relation_version_redact, :version => /\d+/, :id => /\d+/ + get "relation/:id/:version" => "old_relations#show", :as => :api_old_relation, :id => /\d+/, :version => /\d+/ + get "relation/:id" => "relations#show", :as => :api_relation, :id => /\d+/ + put "relation/:id" => "relations#update", :id => /\d+/ + delete "relation/:id" => "relations#delete", :id => /\d+/ + get "relations" => "relations#index" + + get "map" => "map#index" + + get "trackpoints" => "tracepoints#index" + + get "user/:id" => "users#show", :id => /\d+/, :as => :api_user + get "user/details" => "users#details" + get "user/gpx_files" => "users#gpx_files" + get "users" => "users#index", :as => :api_users + + resources :user_preferences, :except => [:new, :create, :edit], :param => :preference_key, :path => "user/preferences", :controller => "user_preferences" do + collection do + put "" => "user_preferences#update_all", :as => "" + end + end + + resources :messages, :path => "user/messages", :constraints => { :id => /\d+/ }, :only => [:create, :show, :destroy], :controller => "messages", :as => :api_messages do + collection do + get "inbox" + get "outbox" + end + 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 # Map notes API - resources :notes, :except => [:new, :edit, :update], :constraints => { :id => /\d+/ }, :defaults => { :format => "xml" }, :controller => "api/notes" do + resources :notes, :except => [:new, :edit, :update], :id => /\d+/, :controller => "notes" do collection do get "search" get "feed", :defaults => { :format => "rss" } @@ -96,29 +108,35 @@ OpenStreetMap::Application.routes.draw do post "close" post "reopen" end + + resource :subscription, :only => [:create, :destroy], :controller => "note_subscriptions" end - 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" + resources :user_blocks, :only => :show, :id => /\d+/, :controller => "user_blocks" end # Data browsing - 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 "/way/:id" => "ways#show", :id => /\d+/, :as => :way + get "/way/:id/history" => "old_ways#index", :id => /\d+/, :as => :way_history + resources :old_ways, :path => "/way/:id/history", :id => /\d+/, :version => /\d+/, :param => :version, :only => :show + get "/node/:id" => "nodes#show", :id => /\d+/, :as => :node + get "/node/:id/history" => "old_nodes#index", :id => /\d+/, :as => :node_history + resources :old_nodes, :path => "/node/:id/history", :id => /\d+/, :version => /\d+/, :param => :version, :only => :show + get "/relation/:id" => "relations#show", :id => /\d+/, :as => :relation + get "/relation/:id/history" => "old_relations#index", :id => /\d+/, :as => :relation_history + resources :old_relations, :path => "/relation/:id/history", :id => /\d+/, :version => /\d+/, :param => :version, :only => :show + resources :changesets, :path => "changeset", :id => /\d+/, :only => :show do + match :subscribe, :unsubscribe, :on => :member, :via => [:get, :post] + + namespace :changeset_comments, :as => :comments, :path => :comments do + resource :feed, :only => :show, :defaults => { :format => "rss" } + end + end + resources :notes, :path => "note", :id => /\d+/, :only => [:show, :new] + 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 "/user/:display_name/notes" => "notes#index", :as => :user_notes 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 } @@ -146,13 +164,20 @@ OpenStreetMap::Application.routes.draw do get "/welcome" => "site#welcome" get "/fixthemap" => "site#fixthemap" get "/help" => "site#help" + get "/about/:about_locale" => "site#about" get "/about" => "site#about" + get "/communities" => "site#communities" 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" } + scope "/history" do + namespace :changeset_comments, :path => :comments, :as => :changesets_comments do + resource :feed, :only => :show, :defaults => { :format => "rss" } + end + end get "/export" => "site#export" - match "/login" => "users#login", :via => [:get, :post] - match "/logout" => "users#logout", :via => [:get, :post] + get "/login" => "sessions#new" + post "/login" => "sessions#create" + match "/logout" => "sessions#destroy", :via => [:get, :post] get "/offline" => "site#offline" get "/key" => "site#key" get "/id" => "site#id" @@ -161,13 +186,17 @@ OpenStreetMap::Application.routes.draw do 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] + get "/user/:display_name/confirm/resend" => "confirmations#confirm_resend", :as => :user_confirm_resend + match "/user/:display_name/confirm" => "confirmations#confirm", :via => [:get, :post] + match "/user/confirm" => "confirmations#confirm", :via => [:get, :post] + match "/user/confirm-email" => "confirmations#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] + scope :user, :as => "user" do + get "forgot-password" => "passwords#new" + post "forgot-password" => "passwords#create" + get "reset-password" => "passwords#edit" + post "reset-password" => "passwords#update" + end get "/user/suspended" => "users#suspended" get "/index.html", :to => redirect(:path => "/") @@ -177,38 +206,39 @@ OpenStreetMap::Application.routes.draw do # omniauth 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 + match "/auth/:provider" => "users#auth", :via => [:post, :patch], :as => :auth # permalink - get "/go/:code" => "site#permalink", :code => /[a-zA-Z0-9_@~]+[=-]*/ + get "/go/:code" => "site#permalink", :code => /[a-zA-Z0-9_@~]+[=-]*/, :as => :permalink # rich text preview post "/preview/:type" => "site#preview", :as => :preview # traces 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/page/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/user/%{display_name}/traces/tag/%{tag}") 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/page/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/user/%{display_name}/traces") 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 "/user/:display_name/traces/:id" => "traces#show", :as => "show_trace" + scope "/user/:display_name/traces/:trace_id", :module => :traces do + get "picture" => "pictures#show", :as => "trace_picture" + get "icon" => "icons#show", :as => "trace_icon" + end + get "/traces/tag/:tag/page/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/traces/tag/%{tag}") get "/traces/tag/:tag" => "traces#index" - get "/traces/page/:page" => "traces#index", :page => /[1-9][0-9]*/ + get "/traces/page/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/traces") 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/page/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/traces/mine/tag/%{tag}") get "/traces/mine/tag/:tag" => "traces#mine" - get "/traces/mine/page/:page" => "traces#mine" + get "/traces/mine/page/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/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 resources :diary_entries, :path => "diary", :only => [:new, :create, :index] do @@ -220,28 +250,42 @@ OpenStreetMap::Application.routes.draw do 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/comments/:page", :page => /[1-9][0-9]*/, :to => redirect(:path => "/user/%{display_name}/diary/comments") + get "/user/:display_name/diary/comments" => "diary_comments#index", :as => :diary_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] + resources :diary_entries, :path => "diary", :only => [:edit, :update, :show], :id => /\d+/ do + member do + post :hide, :unhide + end + end 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+/ + match "/user/:display_name/diary/:id/subscribe" => "diary_entries#subscribe", :via => [:get, :post], :as => :diary_entry_subscribe, :id => /\d+/ + match "/user/:display_name/diary/:id/unsubscribe" => "diary_entries#unsubscribe", :via => [:get, :post], :as => :diary_entry_unsubscribe, :id => /\d+/ + post "/user/:display_name/diary/:id/comments" => "diary_comments#create", :id => /\d+/, :as => :comment_diary_entry + post "/diary_comments/:comment/hide" => "diary_comments#hide", :comment => /\d+/, :as => :hide_diary_comment + post "/diary_comments/:comment/unhide" => "diary_comments#unhide", :comment => /\d+/, :as => :unhide_diary_comment # user pages - 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 + resources :users, :path => "user", :param => :display_name, :only => [:show, :destroy] do + resource :role, :controller => "user_roles", :path => "roles/:role", :only => [:create, :destroy] + end + get "/user/:display_name/account", :to => redirect(:path => "/account/edit") + post "/user/:display_name/set_status" => "users#set_status", :as => :set_status_user + + resource :account, :only => [:edit, :update, :destroy] + + namespace :account do + resource :deletion, :only => [:show] + end + resource :dashboard, :only => [:show] + resource :preferences, :only => [:show, :edit, :update] + resource :profile, :only => [:edit, :update] + + # friendships + match "/user/:display_name/make_friend" => "friendships#make_friend", :via => [:get, :post], :as => "make_friend" + match "/user/:display_name/remove_friend" => "friendships#remove_friend", :via => [:get, :post], :as => "remove_friend" # user lists match "/users" => "users#index", :via => [:get, :post] @@ -249,12 +293,9 @@ OpenStreetMap::Application.routes.draw do # geocoder 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" + post "/geocoder/search_latlon" => "geocoder#search_latlon" + post "/geocoder/search_osm_nominatim" => "geocoder#search_osm_nominatim" + post "/geocoder/search_osm_nominatim_reverse" => "geocoder#search_osm_nominatim_reverse" # directions get "/directions" => "directions#search" @@ -266,9 +307,12 @@ OpenStreetMap::Application.routes.draw do # messages resources :messages, :only => [:create, :show, :destroy] do post :mark + patch :unmute + match :reply, :via => [:get, :post] collection do get :inbox + get :muted get :outbox end end @@ -277,25 +321,18 @@ OpenStreetMap::Application.routes.draw do 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...) + # muting users scope "/user/:display_name" do - resources :oauth_clients + resource :user_mute, :only => [:create, :destroy], :path => "mute" end - match "/oauth/revoke" => "oauth#revoke", :via => [:get, :post] - match "/oauth/authorize" => "oauth#authorize", :via => [:get, :post], :as => :authorize - 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 - get "/oauth/test_request" => "oauth#test_request", :as => :test_request - - # roles and banning pages - 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" + resources :user_mutes, :only => [:index] + + # banning pages + get "/user/:display_name/blocks" => "user_blocks#blocks_on", :as => "user_blocks_on" + get "/user/:display_name/blocks_by" => "user_blocks#blocks_by", :as => "user_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" + resources :user_blocks, :except => :new + match "/user/:display_name/blocks/revoke_all" => "user_blocks#revoke_all", :via => [:get, :post], :as => "revoke_all_user_blocks" # issues and reports resources :issues do @@ -314,6 +351,7 @@ OpenStreetMap::Application.routes.draw do resources :redactions # errors + match "/400", :to => "errors#bad_request", :via => :all match "/403", :to => "errors#forbidden", :via => :all match "/404", :to => "errors#not_found", :via => :all match "/500", :to => "errors#internal_server_error", :via => :all