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, :via => :get, :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+/
end
# Data browsing
- 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+/, :as => "browse_note"
- match '/user/:display_name/edits' => 'changeset#list', :via => :get
- match '/user/:display_name/edits/feed' => 'changeset#feed', :via => :get, :format => :atom
+ 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 '/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
+ match '/history/friends' => 'changeset#list', :via => :get, :friends => true, :as => "friend_changesets"
+ match '/history/nearby' => 'changeset#list', :via => :get, :nearby => true, :as => "nearby_changesets"
+
+ 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
root :to => 'site#index', :via => [:get, :post]
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, :format => :atom
- match '/export' => 'site#index', :export => true, :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/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
+ 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")
# permalink
match '/go/:code' => 'site#permalink', :via => :get, :code => /[a-zA-Z0-9_@~]+[=-]*/
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, :format => :rss
- match '/user/:display_name/traces/rss' => 'trace#georss', :via => :get, :format => :rss
+ 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' => '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, :format => :rss
- match '/traces/rss' => 'trace#georss', :via => :get, :format => :rss
+ 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
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+/
- match '/trace/:id/edit' => 'trace#edit', :via => [:get, :post, :patch], :id => /\d+/
+ 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+/
# 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, :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/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 => /\d+/
match '/user/:display_name/diary/comments/' => 'diary_entry#comments', :via => :get
match '/user/:display_name/diary' => 'diary_entry#list', :via => :get
match '/users/:status' => 'user#list', :via => [:get, :post]
# geocoder
- match '/geocoder/search' => 'geocoder#search', :via => :post
+ 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_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
+ match '/geocoder/search_osm_nominatim_reverse' => 'geocoder#search_osm_nominatim_reverse', :via => :get
+ match '/geocoder/search_geonames_reverse' => 'geocoder#search_geonames_reverse', :via => :get
+
+ # directions
+ match '/directions' => 'directions#search', :via => :get, :as => :directions
# export
- match '/export/start' => 'export#start', :via => :get
match '/export/finish' => 'export#finish', :via => :post
match '/export/embed' => 'export#embed', :via => :get
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
- match '/oauth/request_token' => 'oauth#request_token', :via => :get, :as => :request_token
- match '/oauth/access_token' => 'oauth#access_token', :via => :get, :as => :access_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
# roles and banning pages
projects / rails.git / blobdiff