Merge remote-tracking branch 'osmlab/hash'

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 4c1c637d245afdd435ed4d5b7527dfb998f53ae7..bc473a4b0d74d86724add2413aef7d6f05addc63 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -90,6 +90,7 @@ OpenStreetMap::Application.routes.draw do
       member do
         post 'comment'
         post 'close'
+        post 'reopen'
       end
     end
 
@@ -109,7 +110,7 @@ OpenStreetMap::Application.routes.draw do
   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 '/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 '/user/:display_name/notes' => 'notes#mine', :via => :get
@@ -131,8 +132,10 @@ OpenStreetMap::Application.routes.draw do
   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 '/user/new' => 'user#new', :via => :get
-  match '/user/terms' => 'user#terms', :via => [:get, :post]
+  match '/user/new' => 'user#create', :via => :post
+  match '/user/terms' => 'user#terms', :via => :get
   match '/user/save' => 'user#save', :via => :post
   match '/user/:display_name/confirm/resend' => 'user#confirm_resend', :via => :get
   match '/user/:display_name/confirm' => 'user#confirm', :via => [:get, :post]
@@ -225,6 +228,7 @@ OpenStreetMap::Application.routes.draw do
   # export
   match '/export/start' => 'export#start', :via => :get
   match '/export/finish' => 'export#finish', :via => :post
+  match '/export/embed' => 'export#embed', :via => :get
 
   # messages
   match '/user/:display_name/inbox' => 'message#inbox', :via => :get, :as => "inbox"