X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fb4d003ebee8842ace3807bb1a60b9b36d94723e..58f0eea2a4aba52858361915157a06d0087a99e4:/config/routes.rb diff --git a/config/routes.rb b/config/routes.rb index 62c43ee03..e45d56701 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,250 +1,330 @@ -ActionController::Routing::Routes.draw do |map| +OpenStreetMap::Application.routes.draw do + use_doorkeeper :scope => "oauth2" do + controllers :authorizations => "oauth2_authorizations", + :applications => "oauth2_applications", + :authorized_applications => "oauth2_authorized_applications" + end + # API - map.connect "api/capabilities", :controller => 'api', :action => 'capabilities' - map.connect "api/#{API_VERSION}/capabilities", :controller => 'api', :action => 'capabilities' - - map.connect "api/#{API_VERSION}/changeset/create", :controller => 'changeset', :action => 'create' - map.connect "api/#{API_VERSION}/changeset/:id/upload", :controller => 'changeset', :action => 'upload', :id => /\d+/ - map.changeset_download "api/#{API_VERSION}/changeset/:id/download", :controller => 'changeset', :action => 'download', :id => /\d+/ - map.connect "api/#{API_VERSION}/changeset/:id/expand_bbox", :controller => 'changeset', :action => 'expand_bbox', :id => /\d+/ - map.changeset_read "api/#{API_VERSION}/changeset/:id", :controller => 'changeset', :action => 'read', :id => /\d+/, :conditions => { :method => :get } - map.connect "api/#{API_VERSION}/changeset/:id", :controller => 'changeset', :action => 'update', :id => /\d+/, :conditions => { :method => :put } - map.connect "api/#{API_VERSION}/changeset/:id/close", :controller => 'changeset', :action => 'close', :id =>/\d+/ - map.connect "api/#{API_VERSION}/changesets", :controller => 'changeset', :action => 'query' - - map.connect "api/#{API_VERSION}/node/create", :controller => 'node', :action => 'create' - map.connect "api/#{API_VERSION}/node/:id/ways", :controller => 'way', :action => 'ways_for_node', :id => /\d+/ - map.connect "api/#{API_VERSION}/node/:id/relations", :controller => 'relation', :action => 'relations_for_node', :id => /\d+/ - map.connect "api/#{API_VERSION}/node/:id/history", :controller => 'old_node', :action => 'history', :id => /\d+/ - map.connect "api/#{API_VERSION}/node/:id/:version", :controller => 'old_node', :action => 'version', :id => /\d+/, :version => /\d+/ - map.connect "api/#{API_VERSION}/node/:id", :controller => 'node', :action => 'read', :id => /\d+/, :conditions => { :method => :get } - map.connect "api/#{API_VERSION}/node/:id", :controller => 'node', :action => 'update', :id => /\d+/, :conditions => { :method => :put } - map.connect "api/#{API_VERSION}/node/:id", :controller => 'node', :action => 'delete', :id => /\d+/, :conditions => { :method => :delete } - map.connect "api/#{API_VERSION}/nodes", :controller => 'node', :action => 'nodes', :id => nil - - map.connect "api/#{API_VERSION}/way/create", :controller => 'way', :action => 'create' - map.connect "api/#{API_VERSION}/way/:id/history", :controller => 'old_way', :action => 'history', :id => /\d+/ - map.connect "api/#{API_VERSION}/way/:id/full", :controller => 'way', :action => 'full', :id => /\d+/ - map.connect "api/#{API_VERSION}/way/:id/relations", :controller => 'relation', :action => 'relations_for_way', :id => /\d+/ - map.connect "api/#{API_VERSION}/way/:id/:version", :controller => 'old_way', :action => 'version', :id => /\d+/, :version => /\d+/ - map.connect "api/#{API_VERSION}/way/:id", :controller => 'way', :action => 'read', :id => /\d+/, :conditions => { :method => :get } - map.connect "api/#{API_VERSION}/way/:id", :controller => 'way', :action => 'update', :id => /\d+/, :conditions => { :method => :put } - map.connect "api/#{API_VERSION}/way/:id", :controller => 'way', :action => 'delete', :id => /\d+/, :conditions => { :method => :delete } - map.connect "api/#{API_VERSION}/ways", :controller => 'way', :action => 'ways', :id => nil - - map.connect "api/#{API_VERSION}/relation/create", :controller => 'relation', :action => 'create' - map.connect "api/#{API_VERSION}/relation/:id/relations", :controller => 'relation', :action => 'relations_for_relation', :id => /\d+/ - map.connect "api/#{API_VERSION}/relation/:id/history", :controller => 'old_relation', :action => 'history', :id => /\d+/ - map.connect "api/#{API_VERSION}/relation/:id/full", :controller => 'relation', :action => 'full', :id => /\d+/ - map.connect "api/#{API_VERSION}/relation/:id/:version", :controller => 'old_relation', :action => 'version', :id => /\d+/, :version => /\d+/ - map.connect "api/#{API_VERSION}/relation/:id", :controller => 'relation', :action => 'read', :id => /\d+/, :conditions => { :method => :get } - map.connect "api/#{API_VERSION}/relation/:id", :controller => 'relation', :action => 'update', :id => /\d+/, :conditions => { :method => :put } - map.connect "api/#{API_VERSION}/relation/:id", :controller => 'relation', :action => 'delete', :id => /\d+/, :conditions => { :method => :delete } - map.connect "api/#{API_VERSION}/relations", :controller => 'relation', :action => 'relations', :id => nil - - map.connect "api/#{API_VERSION}/map", :controller => 'api', :action => 'map' - - map.connect "api/#{API_VERSION}/trackpoints", :controller => 'api', :action => 'trackpoints' - - map.connect "api/#{API_VERSION}/changes", :controller => 'api', :action => 'changes' - - map.connect "api/#{API_VERSION}/search", :controller => 'search', :action => 'search_all' - map.connect "api/#{API_VERSION}/ways/search", :controller => 'search', :action => 'search_ways' - map.connect "api/#{API_VERSION}/relations/search", :controller => 'search', :action => 'search_relations' - map.connect "api/#{API_VERSION}/nodes/search", :controller => 'search', :action => 'search_nodes' - - map.connect "api/#{API_VERSION}/user/details", :controller => 'user', :action => 'api_details' - map.connect "api/#{API_VERSION}/user/preferences", :controller => 'user_preference', :action => 'read', :conditions => { :method => :get } - map.connect "api/#{API_VERSION}/user/preferences/:preference_key", :controller => 'user_preference', :action => 'read_one', :conditions => { :method => :get } - map.connect "api/#{API_VERSION}/user/preferences", :controller => 'user_preference', :action => 'update', :conditions => { :method => :put } - map.connect "api/#{API_VERSION}/user/preferences/:preference_key", :controller => 'user_preference', :action => 'update_one', :conditions => { :method => :put } - map.connect "api/#{API_VERSION}/user/preferences/:preference_key", :controller => 'user_preference', :action => 'delete_one', :conditions => { :method => :delete } - map.connect "api/#{API_VERSION}/user/gpx_files", :controller => 'user', :action => 'api_gpx_files' - - map.connect "api/#{API_VERSION}/gpx/create", :controller => 'trace', :action => 'api_create' - map.connect "api/#{API_VERSION}/gpx/:id", :controller => 'trace', :action => 'api_read', :id => /\d+/, :conditions => { :method => :get } - map.connect "api/#{API_VERSION}/gpx/:id", :controller => 'trace', :action => 'api_update', :id => /\d+/, :conditions => { :method => :put } - map.connect "api/#{API_VERSION}/gpx/:id", :controller => 'trace', :action => 'api_delete', :id => /\d+/, :conditions => { :method => :delete } - map.connect "api/#{API_VERSION}/gpx/:id/details", :controller => 'trace', :action => 'api_read', :id => /\d+/ - map.connect "api/#{API_VERSION}/gpx/:id/data", :controller => 'trace', :action => 'api_data', :id => /\d+/ - map.connect "api/#{API_VERSION}/gpx/:id/data.:format", :controller => 'trace', :action => 'api_data', :id => /\d+/ - - # AMF (ActionScript) API - - map.connect "api/#{API_VERSION}/amf/read", :controller =>'amf', :action =>'amf_read' - map.connect "api/#{API_VERSION}/amf/write", :controller =>'amf', :action =>'amf_write' - map.connect "api/#{API_VERSION}/swf/trackpoints", :controller =>'swf', :action =>'trackpoints' - - # Map Bugs API - map.connect "api/#{API_VERSION}/bugs/getBugs", :controller => 'map_bugs', :action => 'get_bugs' - map.connect "api/#{API_VERSION}/bugs/addPOIexec", :controller => 'map_bugs', :action => 'add_bug' - map.connect "api/#{API_VERSION}/bugs/closePOIexec", :controller => 'map_bugs', :action => 'close_bug' - map.connect "api/#{API_VERSION}/bugs/editPOIexec", :controller => 'map_bugs', :action => 'edit_bug' - map.connect "api/#{API_VERSION}/bugs/getGPX", :controller => 'map_bugs', :action => 'gpx_bugs' - map.connect "api/#{API_VERSION}/bugs/getRSSfeed", :controller => 'map_bugs', :action => 'rss' - map.connect "api/#{API_VERSION}/bugs", :controller => 'map_bugs', :action => 'get_bugs' - map.connect "api/#{API_VERSION}/bugs/search", :controller => 'map_bugs', :action => 'search' - map.connect "api/#{API_VERSION}/bugs/rss", :controller =>'map_bugs', :action => 'rss' - map.connect "api/#{API_VERSION}/bug/create", :controller => 'map_bugs', :action => 'add_bug' - map.connect "api/#{API_VERSION}/bug/:id/comment", :controller => 'map_bugs', :action => 'edit_bug', :id => /\d+/ - map.connect "api/#{API_VERSION}/bug/:id/close", :controller => 'map_bugs', :action => 'close_bug', :id => /\d+/ - map.connect "api/#{API_VERSION}/bug/:id", :controller => 'map_bugs', :action => 'read', :id => /\d+/, :conditions => { :method => :get } - map.connect "api/#{API_VERSION}/bug/:id", :controller => 'map_bugs', :action => 'delete', :id => /\d+/, :conditions => { :method => :delete } - + 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", :as => :changeset_upload, :id => /\d+/ + get "changeset/:id/download" => "api/changesets#download", :as => :changeset_download, :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", :as => :changeset_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", :as => :node_ways, :id => /\d+/ + get "node/:id/relations" => "api/relations#relations_for_node", :as => :node_relations, :id => /\d+/ + get "node/:id/history" => "api/old_nodes#history", :as => :api_node_history, :id => /\d+/ + post "node/:id/:version/redact" => "api/old_nodes#redact", :as => :node_version_redact, :version => /\d+/, :id => /\d+/ + get "node/:id/:version" => "api/old_nodes#version", :as => :node_version, :id => /\d+/, :version => /\d+/ + get "node/:id" => "api/nodes#show", :as => :api_node, :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", :as => :api_way_history, :id => /\d+/ + get "way/:id/full" => "api/ways#full", :as => :way_full, :id => /\d+/ + get "way/:id/relations" => "api/relations#relations_for_way", :as => :way_relations, :id => /\d+/ + post "way/:id/:version/redact" => "api/old_ways#redact", :as => :way_version_redact, :version => /\d+/, :id => /\d+/ + get "way/:id/:version" => "api/old_ways#version", :as => :way_version, :id => /\d+/, :version => /\d+/ + get "way/:id" => "api/ways#show", :as => :api_way, :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", :as => :relation_relations, :id => /\d+/ + get "relation/:id/history" => "api/old_relations#history", :as => :api_relation_history, :id => /\d+/ + get "relation/:id/full" => "api/relations#full", :as => :relation_full, :id => /\d+/ + post "relation/:id/:version/redact" => "api/old_relations#redact", :as => :relation_version_redact, :version => /\d+/, :id => /\d+/ + get "relation/:id/:version" => "api/old_relations#version", :as => :relation_version, :id => /\d+/, :version => /\d+/ + get "relation/:id" => "api/relations#show", :as => :api_relation, :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 "user/:id" => "api/users#show", :id => /\d+/, :as => :api_user + get "user/details" => "api/users#details" + get "user/gpx_files" => "api/users#gpx_files" + get "users" => "api/users#index", :as => :api_users + + resources :user_preferences, :except => [:new, :create, :edit], :param => :preference_key, :path => "user/preferences", :controller => "api/user_preferences" do + collection do + put "" => "api/user_preferences#update_all", :as => "" + end + end + + post "gpx/create" => "api/traces#create" + get "gpx/:id" => "api/traces#show", :as => :api_trace, :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", :as => :api_trace_data + + # 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" } + end + + member do + post "comment" + post "close" + post "reopen" + end + 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" + end + # Data browsing - map.connect '/browse/start', :controller => 'browse', :action => 'start' - map.connect '/browse/way/:id', :controller => 'browse', :action => 'way', :id => /\d+/ - map.connect '/browse/way/:id/history', :controller => 'browse', :action => 'way_history', :id => /\d+/ - map.connect '/browse/node/:id', :controller => 'browse', :action => 'node', :id => /\d+/ - map.connect '/browse/node/:id/history', :controller => 'browse', :action => 'node_history', :id => /\d+/ - map.connect '/browse/relation/:id', :controller => 'browse', :action => 'relation', :id => /\d+/ - map.connect '/browse/relation/:id/history', :controller => 'browse', :action => 'relation_history', :id => /\d+/ - map.changeset '/browse/changeset/:id', :controller => 'browse', :action => 'changeset', :id => /\d+/ - map.connect '/user/:display_name/edits/feed', :controller => 'changeset', :action => 'list', :format =>:atom - map.connect '/user/:display_name/edits', :controller => 'changeset', :action => 'list' - map.connect '/browse/changesets/feed', :controller => 'changeset', :action => 'list', :format => :atom - map.connect '/browse/changesets', :controller => 'changeset', :action => 'list' - map.connect '/browse/bug/:id', :controller => 'browse', :action => 'bug', :id => /\d+/ - map.connect '/user/:display_name/bugs', :controller => 'map_bugs', :action => 'my_bugs' - map.connect '/browse', :controller => 'changeset', :action => 'list' + get "/way/:id" => "browse#way", :id => /\d+/, :as => :way + get "/way/:id/history" => "browse#way_history", :id => /\d+/, :as => :way_history + get "/node/:id" => "browse#node", :id => /\d+/, :as => :node + get "/node/:id/history" => "browse#node_history", :id => /\d+/, :as => :node_history + get "/relation/:id" => "browse#relation", :id => /\d+/, :as => :relation + get "/relation/:id/history" => "browse#relation_history", :id => /\d+/, :as => :relation_history + 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#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 } + + get "/browse/way/:id", :to => redirect(:path => "/way/%{id}") + get "/browse/way/:id/history", :to => redirect(:path => "/way/%{id}/history") + get "/browse/node/:id", :to => redirect(:path => "/node/%{id}") + get "/browse/node/:id/history", :to => redirect(:path => "/node/%{id}/history") + get "/browse/relation/:id", :to => redirect(:path => "/relation/%{id}") + get "/browse/relation/:id/history", :to => redirect(:path => "/relation/%{id}/history") + get "/browse/changeset/:id", :to => redirect(:path => "/changeset/%{id}") + get "/browse/note/:id", :to => redirect(:path => "/note/%{id}") + get "/user/:display_name/edits", :to => redirect(:path => "/user/%{display_name}/history") + get "/user/:display_name/edits/feed", :to => redirect(:path => "/user/%{display_name}/history/feed") + get "/browse/friends", :to => redirect(:path => "/history/friends") + get "/browse/nearby", :to => redirect(:path => "/history/nearby") + get "/browse/changesets/feed", :to => redirect(:path => "/history/feed") + get "/browse/changesets", :to => redirect(:path => "/history") + get "/browse", :to => redirect(:path => "/history") # web site - map.root :controller => 'site', :action => 'index' - map.connect '/', :controller => 'site', :action => 'index' - map.connect '/edit', :controller => 'site', :action => 'edit' - map.connect '/copyright', :controller => 'site', :action => 'copyright' - map.connect '/copyright/:copyright_locale', :controller => 'site', :action => 'copyright' - map.connect '/history', :controller => 'changeset', :action => 'list' - map.connect '/history/feed', :controller => 'changeset', :action => 'list', :format => :atom - map.connect '/export', :controller => 'site', :action => 'export' - map.connect '/login', :controller => 'user', :action => 'login' - map.connect '/logout', :controller => 'user', :action => 'logout' - map.connect '/offline', :controller => 'site', :action => 'offline' - map.connect '/key', :controller => 'site', :action => 'key' - map.connect '/user/new', :controller => 'user', :action => 'new' - map.connect '/user/terms', :controller => 'user', :action => 'terms' - map.connect '/user/save', :controller => 'user', :action => 'save' - map.connect '/user/:display_name/confirm/resend', :controller => 'user', :action => 'confirm_resend' - map.connect '/user/:display_name/confirm', :controller => 'user', :action => 'confirm' - map.connect '/user/confirm', :controller => 'user', :action => 'confirm' - map.connect '/user/confirm-email', :controller => 'user', :action => 'confirm_email' - map.connect '/user/go_public', :controller => 'user', :action => 'go_public' - map.connect '/user/reset-password', :controller => 'user', :action => 'reset_password' - map.connect '/user/forgot-password', :controller => 'user', :action => 'lost_password' - map.connect '/user/suspended', :controller => 'user', :action => 'suspended' - - map.connect '/index.html', :controller => 'site', :action => 'index' - map.connect '/edit.html', :controller => 'site', :action => 'edit' - map.connect '/export.html', :controller => 'site', :action => 'export' - map.connect '/login.html', :controller => 'user', :action => 'login' - map.connect '/logout.html', :controller => 'user', :action => 'logout' - map.connect '/create-account.html', :controller => 'user', :action => 'new' - map.connect '/forgot-password.html', :controller => 'user', :action => 'lost_password' + root :to => "site#index", :via => [:get, :post] + 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/:about_locale" => "site#about" + 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" + 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" + 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" => "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" => "passwords#reset_password", :via => [:get, :post], :as => :user_reset_password + match "/user/forgot-password" => "passwords#lost_password", :via => [:get, :post], :as => :user_forgot_password + 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 + 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 => [:post, :patch], :as => :auth # permalink - map.connect '/go/:code', :controller => 'site', :action => 'permalink', :code => /[a-zA-Z0-9_@]+[=-]*/ - - # traces - map.connect '/user/:display_name/traces/tag/:tag/page/:page', :controller => 'trace', :action => 'list' - map.connect '/user/:display_name/traces/tag/:tag', :controller => 'trace', :action => 'list' - map.connect '/user/:display_name/traces/page/:page', :controller => 'trace', :action => 'list' - map.connect '/user/:display_name/traces', :controller => 'trace', :action => 'list' - map.connect '/user/:display_name/traces/tag/:tag/rss', :controller => 'trace', :action => 'georss' - map.connect '/user/:display_name/traces/rss', :controller => 'trace', :action => 'georss' - map.connect '/user/:display_name/traces/:id', :controller => 'trace', :action => 'view' - map.connect '/user/:display_name/traces/:id/picture', :controller => 'trace', :action => 'picture' - map.connect '/user/:display_name/traces/:id/icon', :controller => 'trace', :action => 'icon' - map.connect '/traces/tag/:tag/page/:page', :controller => 'trace', :action => 'list' - map.connect '/traces/tag/:tag', :controller => 'trace', :action => 'list' - map.connect '/traces/page/:page', :controller => 'trace', :action => 'list' - map.connect '/traces', :controller => 'trace', :action => 'list' - map.connect '/traces/tag/:tag/rss', :controller => 'trace', :action => 'georss' - map.connect '/traces/rss', :controller => 'trace', :action => 'georss' - map.connect '/traces/mine/tag/:tag/page/:page', :controller => 'trace', :action => 'mine' - map.connect '/traces/mine/tag/:tag', :controller => 'trace', :action => 'mine' - map.connect '/traces/mine/page/:page', :controller => 'trace', :action => 'mine' - map.connect '/traces/mine', :controller => 'trace', :action => 'mine' - map.connect '/trace/create', :controller => 'trace', :action => 'create' - map.connect '/trace/:id/data', :controller => 'trace', :action => 'data' - map.connect '/trace/:id/data.:format', :controller => 'trace', :action => 'data' - map.connect '/trace/:id/edit', :controller => 'trace', :action => 'edit' - map.connect '/trace/:id/delete', :controller => 'trace', :action => 'delete' + 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" => "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", :as => "show_trace" + get "/user/:display_name/traces/:id/picture" => "traces#picture", :as => "trace_picture" + get "/user/:display_name/traces/:id/icon" => "traces#icon", :as => "trace_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") # diary pages - map.connect '/diary/new', :controller => 'diary_entry', :action => 'new' - map.connect '/user/:display_name/diary/rss', :controller => 'diary_entry', :action => 'rss' - map.connect '/diary/:language/rss', :controller => 'diary_entry', :action => 'rss' - map.connect '/diary/rss', :controller => 'diary_entry', :action => 'rss' - map.connect '/user/:display_name/diary', :controller => 'diary_entry', :action => 'list' - map.connect '/diary/:language', :controller => 'diary_entry', :action => 'list' - map.connect '/diary', :controller => 'diary_entry', :action => 'list' - map.connect '/user/:display_name/diary/:id', :controller => 'diary_entry', :action => 'view', :id => /\d+/ - map.connect '/user/:display_name/diary/:id/newcomment', :controller => 'diary_entry', :action => 'comment', :id => /\d+/ - map.connect '/user/:display_name/diary/:id/edit', :controller => 'diary_entry', :action => 'edit', :id => /\d+/ - map.connect '/user/:display_name/diary/:id/hide', :controller => 'diary_entry', :action => 'hide', :id => /\d+/ - map.connect '/user/:display_name/diary/:id/hidecomment/:comment', :controller => 'diary_entry', :action => 'hidecomment', :id => /\d+/, :comment => /\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", :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] + end + post "/user/:display_name/diary/:id/newcomment" => "diary_entries#comment", :id => /\d+/, :as => :comment_diary_entry + 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 - map.connect '/user/:display_name', :controller => 'user', :action => 'view' - map.connect '/user/:display_name/make_friend', :controller => 'user', :action => 'make_friend' - map.connect '/user/:display_name/remove_friend', :controller => 'user', :action => 'remove_friend' - map.connect '/user/:display_name/account', :controller => 'user', :action => 'account' - map.connect '/user/:display_name/set_status', :controller => 'user', :action => 'set_status' - map.connect '/user/:display_name/delete', :controller => 'user', :action => 'delete' + resources :users, :path => "user", :param => :display_name, :only => [:show, :destroy] + get "/user/:display_name/account", :to => redirect(:path => "/account/edit") + post "/user/:display_name/set_status" => "users#set_status", :as => :set_status_user - # user lists - map.connect '/users', :controller => 'user', :action => 'list' - map.connect '/users/:status', :controller => 'user', :action => 'list' + 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] - # test pages - map.connect '/test/populate/:table/:from/:count', :controller => 'test', :action => 'populate' - map.connect '/test/populate/:table/:count', :controller => 'test', :action => 'populate', :from => 1 + # 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] + match "/users/:status" => "users#index", :via => [:get, :post] # geocoder - map.connect '/geocoder/search', :controller => 'geocoder', :action => 'search' - map.connect '/geocoder/search_latlon', :controller => 'geocoder', :action => 'search_latlon' - map.connect '/geocoder/search_us_postcode', :controller => 'geocoder', :action => 'search_us_postcode' - map.connect '/geocoder/search_uk_postcode', :controller => 'geocoder', :action => 'search_uk_postcode' - map.connect '/geocoder/search_ca_postcode', :controller => 'geocoder', :action => 'search_ca_postcode' - map.connect '/geocoder/search_osm_namefinder', :controller => 'geocoder', :action => 'search_osm_namefinder' - map.connect '/geocoder/search_osm_nominatim', :controller => 'geocoder', :action => 'search_osm_nominatim' - map.connect '/geocoder/search_geonames', :controller => 'geocoder', :action => 'search_geonames' - map.connect '/geocoder/description', :controller => 'geocoder', :action => 'description' - map.connect '/geocoder/description_osm_namefinder', :controller => 'geocoder', :action => 'description_osm_namefinder' - map.connect '/geocoder/description_osm_nominatim', :controller => 'geocoder', :action => 'description_osm_nominatim' - map.connect '/geocoder/description_geonames', :controller => 'geocoder', :action => 'description_geonames' + 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 + get "/directions" => "directions#search" # export - map.connect '/export/start', :controller => 'export', :action => 'start' - map.connect '/export/finish', :controller => 'export', :action => 'finish' + post "/export/finish" => "export#finish" + get "/export/embed" => "export#embed" # messages - map.connect '/user/:display_name/inbox', :controller => 'message', :action => 'inbox' - map.connect '/user/:display_name/outbox', :controller => 'message', :action => 'outbox' - map.connect '/message/new/:display_name', :controller => 'message', :action => 'new' - map.connect '/message/read/:message_id', :controller => 'message', :action => 'read' - map.connect '/message/mark/:message_id', :controller => 'message', :action => 'mark' - map.connect '/message/reply/:message_id', :controller => 'message', :action => 'reply' - map.connect '/message/delete/:message_id', :controller => 'message', :action => 'delete' + 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...) - map.resources :oauth_clients, :path_prefix => '/user/:display_name' - map.connect '/oauth/revoke', :controller => 'oauth', :action => 'revoke' - map.authorize '/oauth/authorize', :controller => 'oauth', :action => 'oauthorize' - map.request_token '/oauth/request_token', :controller => 'oauth', :action => 'request_token' - map.access_token '/oauth/access_token', :controller => 'oauth', :action => 'access_token' - map.test_request '/oauth/test_request', :controller => 'oauth', :action => 'test_request' + scope "/user/:display_name" do + resources :oauth_clients + 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 - map.connect '/user/:display_name/role/:role/grant', :controller => 'user_roles', :action => 'grant' - map.connect '/user/:display_name/role/:role/revoke', :controller => 'user_roles', :action => 'revoke' - map.connect '/user/:display_name/blocks', :controller => 'user_blocks', :action => 'blocks_on' - map.connect '/user/:display_name/blocks_by', :controller => 'user_blocks', :action => 'blocks_by' - map.connect '/blocks/new/:display_name', :controller => 'user_blocks', :action => 'new' - map.resources :user_blocks, :as => 'blocks' - map.connect '/blocks/:id/revoke', :controller => 'user_blocks', :action => 'revoke' - - # fall through - map.connect ':controller/:id/:action' - map.connect ':controller/:action' + 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", :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" + + # 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