From: Tom Hughes Date: Sat, 10 Mar 2012 15:30:25 +0000 (+0000) Subject: Merge branch 'master' into openstreetbugs X-Git-Tag: live~5677^2~109 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/6aca6cfabf21da48567e8197457dae8785b7324d Merge branch 'master' into openstreetbugs Conflicts: config/routes.rb db/structure.sql --- 6aca6cfabf21da48567e8197457dae8785b7324d diff --cc config/routes.rb index 0c090ef3c,5952bae52..e466fc362 --- a/config/routes.rb +++ b/config/routes.rb @@@ -65,170 -65,144 +65,160 @@@ OpenStreetMap::Application.routes.draw 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', :id => /\d+/ - match 'api/0.6/gpx/:id/data' => 'trace#api_data' - match 'api/0.6/gpx/:id/data.:format' => 'trace#api_data' + 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' - match 'api/0.6/amf/write' => 'amf#amf_write' - match 'api/0.6/swf/trackpoints' => 'swf#trackpoints' - + 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 + match 'api/0.6/notes' => 'note#list', :format => :xml + match 'api/0.6/notes/search' => 'note#search', :format => :xml + match 'api/0.6/notes/rss' => 'note#rss', :format => :rss + match 'api/0.6/note/create' => 'note#create' + match 'api/0.6/note/:id/comment' => 'note#update', :id => /\d+/ + match 'api/0.6/note/:id/close' => 'note#close', :id => /\d+/ + match 'api/0.6/note/:id' => 'note#read', :via => :get, :id => /\d+/, :format => :xml + match 'api/0.6/note/:id' => 'note#delete', :via => :delete, :id => /\d+/ + match 'api/0.6/notes/addPOIexec' => 'note#create' + match 'api/0.6/notes/closePOIexec' => 'note#close' + match 'api/0.6/notes/editPOIexec' => 'note#update' + match 'api/0.6/notes/getGPX' => 'note#list', :format => :gpx + match 'api/0.6/notes/getRSSfeed' => 'note#rss', :format => :rss + # Data browsing - match '/browse/start' => 'browse#start' - match '/browse/way/:id' => 'browse#way', :id => /\d+/ - match '/browse/way/:id/history' => 'browse#way_history', :id => /\d+/ - match '/browse/node/:id' => 'browse#node', :id => /\d+/ - match '/browse/node/:id/history' => 'browse#node_history', :id => /\d+/ - match '/browse/relation/:id' => 'browse#relation', :id => /\d+/ - match '/browse/relation/:id/history' => 'browse#relation_history', :id => /\d+/ - match '/browse/changeset/:id' => 'browse#changeset', :as => :changeset, :id => /\d+/ - match '/user/:display_name/edits' => 'changeset#list' - match '/user/:display_name/edits/feed' => 'changeset#feed', :format => :atom - match '/browse/friends' => 'changeset#list', :friends => true - match '/browse/nearby' => 'changeset#list', :nearby => true - match '/browse/changesets' => 'changeset#list' - match '/browse/changesets/feed' => 'changeset#feed', :format => :atom - match '/browse/note/:id' => 'browse#note', :id => /\d+/ - match '/user/:display_name/notes' => 'note#mine' - match '/browse' => 'changeset#list' + match '/browse/start' => 'browse#start', :via => :get + match '/browse/way/:id' => 'browse#way', :via => :get, :id => /\d+/ + match '/browse/way/:id/history' => 'browse#way_history', :via => :get, :id => /\d+/ + match '/browse/node/:id' => 'browse#node', :via => :get, :id => /\d+/ + match '/browse/node/:id/history' => 'browse#node_history', :via => :get, :id => /\d+/ + match '/browse/relation/:id' => 'browse#relation', :via => :get, :id => /\d+/ + match '/browse/relation/:id/history' => 'browse#relation_history', :via => :get, :id => /\d+/ + match '/browse/changeset/:id' => 'browse#changeset', :via => :get, :as => :changeset, :id => /\d+/ ++ match '/browse/note/:id' => 'browse#note', :via => :get, :id => /\d+/ + match '/user/:display_name/edits' => 'changeset#list', :via => :get + match '/user/:display_name/edits/feed' => 'changeset#feed', :via => :get, :format => :atom ++ match '/user/:display_name/notes' => 'note#mine', :via => :get + match '/browse/friends' => 'changeset#list', :via => :get, :friends => true, :as => "friend_changesets" + match '/browse/nearby' => 'changeset#list', :via => :get, :nearby => true, :as => "nearby_changesets" + match '/browse/changesets' => 'changeset#list', :via => :get + match '/browse/changesets/feed' => 'changeset#feed', :via => :get, :format => :atom + match '/browse' => 'changeset#list', :via => :get # web site - root :to => 'site#index' - match '/edit' => 'site#edit' - match '/copyright/:copyright_locale' => 'site#copyright' - match '/copyright' => 'site#copyright' - match '/history' => 'changeset#list' - match '/history/feed' => 'changeset#feed', :format => :atom - match '/export' => 'site#export' - match '/login' => 'user#login' - match '/logout' => 'user#logout' - match '/offline' => 'site#offline' - match '/key' => 'site#key' - match '/user/new' => 'user#new' - match '/user/terms' => 'user#terms' - match '/user/save' => 'user#save' - match '/user/:display_name/confirm/resend' => 'user#confirm_resend' - match '/user/:display_name/confirm' => 'user#confirm' - match '/user/confirm' => 'user#confirm' - match '/user/confirm-email' => 'user#confirm_email' - match '/user/go_public' => 'user#go_public' - match '/user/reset-password' => 'user#reset_password' - match '/user/forgot-password' => 'user#lost_password' - match '/user/suspended' => 'user#suspended' - - match '/index.html' => 'site#index' - match '/edit.html' => 'site#edit' - match '/export.html' => 'site#export' - match '/login.html' => 'user#login' - match '/logout.html' => 'user#logout' - match '/create-account.html' => 'user#new' - match '/forgot-password.html' => 'user#lost_password' + root :to => 'site#index', :via => :get + match '/edit' => 'site#edit', :via => :get + match '/copyright/:copyright_locale' => 'site#copyright', :via => :get + match '/copyright' => 'site#copyright', :via => :get + match '/history' => 'changeset#list', :via => :get + match '/history/feed' => 'changeset#feed', :via => :get, :format => :atom + 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 => :post + match '/user/new' => 'user#new', :via => :get + match '/user/terms' => 'user#terms', :via => [:get, :post] + 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 + + match '/index.html' => 'site#index', :via => :get + match '/create-account.html' => 'user#new', :via => :get + match '/forgot-password.html' => 'user#lost_password', :via => :get # permalink - match '/go/:code' => 'site#permalink', :code => /[a-zA-Z0-9_@~]+[=-]*/ + match '/go/:code' => 'site#permalink', :via => :get, :code => /[a-zA-Z0-9_@~]+[=-]*/ # traces - match '/user/:display_name/traces/tag/:tag/page/:page' => 'trace#list' - match '/user/:display_name/traces/tag/:tag' => 'trace#list' - match '/user/:display_name/traces/page/:page' => 'trace#list' - match '/user/:display_name/traces' => 'trace#list' - match '/user/:display_name/traces/tag/:tag/rss' => 'trace#georss' - match '/user/:display_name/traces/rss' => 'trace#georss' - match '/user/:display_name/traces/:id' => 'trace#view' - match '/user/:display_name/traces/:id/picture' => 'trace#picture' - match '/user/:display_name/traces/:id/icon' => 'trace#icon' - match '/traces/tag/:tag/page/:page' => 'trace#list' - match '/traces/tag/:tag' => 'trace#list' - match '/traces/page/:page' => 'trace#list' - match '/traces' => 'trace#list' - match '/traces/tag/:tag/rss' => 'trace#georss' - match '/traces/rss' => 'trace#georss' - match '/traces/mine/tag/:tag/page/:page' => 'trace#mine' - match '/traces/mine/tag/:tag' => 'trace#mine' - match '/traces/mine/page/:page' => 'trace#mine' - match '/traces/mine' => 'trace#mine' - match '/trace/create' => 'trace#create' - match '/trace/:id/data' => 'trace#data' - match '/trace/:id/data.:format' => 'trace#data' - match '/trace/:id/edit' => 'trace#edit' - match '/trace/:id/delete' => 'trace#delete' + match '/user/:display_name/traces/tag/:tag/page/:page' => 'trace#list', :via => :get + match '/user/:display_name/traces/tag/:tag' => 'trace#list', :via => :get + match '/user/:display_name/traces/page/:page' => 'trace#list', :via => :get + match '/user/:display_name/traces' => 'trace#list', :via => :get + match '/user/:display_name/traces/tag/:tag/rss' => 'trace#georss', :via => :get + match '/user/:display_name/traces/rss' => 'trace#georss', :via => :get + 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 + match '/traces/tag/:tag' => 'trace#list', :via => :get + match '/traces/page/:page' => 'trace#list', :via => :get + match '/traces' => 'trace#list', :via => :get + match '/traces/tag/:tag/rss' => 'trace#georss', :via => :get + match '/traces/rss' => 'trace#georss', :via => :get + match '/traces/mine/tag/:tag/page/:page' => 'trace#mine', :via => :get + 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 + match '/trace/:id/edit' => 'trace#edit', :via => [:get, :post, :put] + match '/trace/:id/delete' => 'trace#delete', :via => :post # diary pages - match '/diary/new' => 'diary_entry#new' - match '/diary/friends' => 'diary_entry#list', :friends => true - match '/diary/nearby' => 'diary_entry#list', :nearby => true - match '/user/:display_name/diary/rss' => 'diary_entry#rss', :format => :rss - match '/diary/:language/rss' => 'diary_entry#rss', :format => :rss - match '/diary/rss' => 'diary_entry#rss', :format => :rss - match '/user/:display_name/diary/comments/:page' => 'diary_entry#comments', :page => /\d+/ - match '/user/:display_name/diary/comments/' => 'diary_entry#comments' - match '/user/:display_name/diary' => 'diary_entry#list' - match '/diary/:language' => 'diary_entry#list' - match '/diary' => 'diary_entry#list' - match '/user/:display_name/diary/:id' => 'diary_entry#view', :id => /\d+/ - match '/user/:display_name/diary/:id/newcomment' => 'diary_entry#comment', :id => /\d+/ - match '/user/:display_name/diary/:id/edit' => 'diary_entry#edit', :id => /\d+/ - match '/user/:display_name/diary/:id/hide' => 'diary_entry#hide', :id => /\d+/ - match '/user/:display_name/diary/:id/hidecomment/:comment' => 'diary_entry#hidecomment', :id => /\d+/, :comment => /\d+/ + 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, :format => :rss + match '/diary/:language/rss' => 'diary_entry#rss', :via => :get, :format => :rss + match '/diary/rss' => 'diary_entry#rss', :via => :get, :format => :rss + match '/user/:display_name/diary/comments/:page' => 'diary_entry#comments', :via => :get, :page => /\d+/ + 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+/ + match '/user/:display_name/diary/:id/hidecomment/:comment' => 'diary_entry#hidecomment', :via => :post, :id => /\d+/, :comment => /\d+/ # user pages - match '/user/:display_name' => 'user#view' - match '/user/:display_name/make_friend' => 'user#make_friend' - match '/user/:display_name/remove_friend' => 'user#remove_friend' - match '/user/:display_name/account' => 'user#account' - match '/user/:display_name/set_status' => 'user#set_status' - match '/user/:display_name/delete' => 'user#delete' + match '/user/:display_name' => 'user#view', :via => :get + match '/user/:display_name/make_friend' => 'user#make_friend', :via => :get + match '/user/:display_name/remove_friend' => 'user#remove_friend', :via => :get + match '/user/:display_name/account' => 'user#account', :via => [:get, :post] + match '/user/:display_name/set_status' => 'user#set_status', :via => :get + match '/user/:display_name/delete' => 'user#delete', :via => :get # user lists - match '/users' => 'user#list' - match '/users/:status' => 'user#list' - - # test pages - match '/test/populate/:table/:from/:count' => 'test#populate' - match '/test/populate/:table/:count' => 'test#populate', :from => 1 + match '/users' => 'user#list', :via => [:get, :post] + match '/users/:status' => 'user#list', :via => [:get, :post] # geocoder - match '/geocoder/search' => 'geocoder#search' - match '/geocoder/search_latlon' => 'geocoder#search_latlon' - match '/geocoder/search_us_postcode' => 'geocoder#search_us_postcode' - match '/geocoder/search_uk_postcode' => 'geocoder#search_uk_postcode' - match '/geocoder/search_ca_postcode' => 'geocoder#search_ca_postcode' - match '/geocoder/search_osm_namefinder' => 'geocoder#search_osm_namefinder' - match '/geocoder/search_osm_nominatim' => 'geocoder#search_osm_nominatim' - match '/geocoder/search_geonames' => 'geocoder#search_geonames' - match '/geocoder/description' => 'geocoder#description' - match '/geocoder/description_osm_namefinder' => 'geocoder#description_osm_namefinder' - match '/geocoder/description_osm_nominatim' => 'geocoder#description_osm_nominatim' - match '/geocoder/description_geonames' => 'geocoder#description_geonames' + match '/geocoder/search' => 'geocoder#search', :via => :post + 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_namefinder' => 'geocoder#search_osm_namefinder', :via => :get + match '/geocoder/search_osm_nominatim' => 'geocoder#search_osm_nominatim', :via => :get + match '/geocoder/search_geonames' => 'geocoder#search_geonames', :via => :get + match '/geocoder/description' => 'geocoder#description', :via => :post + match '/geocoder/description_osm_namefinder' => 'geocoder#description_osm_namefinder', :via => :get + match '/geocoder/description_osm_nominatim' => 'geocoder#description_osm_nominatim', :via => :get + match '/geocoder/description_geonames' => 'geocoder#description_geonames', :via => :get # export - match '/export/start' => 'export#start' - match '/export/finish' => 'export#finish' + match '/export/start' => 'export#start', :via => :get + match '/export/finish' => 'export#finish', :via => :post # messages - match '/user/:display_name/inbox' => 'message#inbox' - match '/user/:display_name/outbox' => 'message#outbox' - match '/message/new/:display_name' => 'message#new' - match '/message/read/:message_id' => 'message#read' - match '/message/mark/:message_id' => 'message#mark' - match '/message/reply/:message_id' => 'message#reply' - match '/message/delete/:message_id' => 'message#delete' + 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] + match '/message/read/:message_id' => 'message#read', :via => :get + match '/message/mark/:message_id' => 'message#mark', :via => :post + match '/message/reply/:message_id' => 'message#reply', :via => [:get, :post] + match '/message/delete/:message_id' => 'message#delete', :via => :post # oauth admin pages (i.e: for setting up new clients, etc...) scope "/user/:display_name" do