Merge branch 'master' into openstreetbugs

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 0a617b6a30a8ed4c766c43704dd599b0aa1a52cc..62c263f0d45c4fd1dd97e8c8ec0c8fdd003b9dde 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -70,11 +70,28 @@ OpenStreetMap::Application.routes.draw do
   match 'api/0.6/gpx/:id/data.:format' => 'trace#api_data'
   
   # 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'
 
+  # Map notes API
+  match 'api/0.6/notes' => 'note#list'
+  match 'api/0.6/notes.:format' => 'note#list'
+  match 'api/0.6/notes/search' => 'note#search'
+  match 'api/0.6/notes/rss'  => 'notes#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+/
+  match 'api/0.6/note/:id.:format' => 'note#read', :via => :get, :id => /\d+/
+  match 'api/0.6/note/:id' => 'note#delete', :via => :delete, :id => /\d+/
+  match 'api/0.6/notes/getBugs' => 'note#list'
+  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'
+
   # Data browsing
   match '/browse/start' => 'browse#start'
   match '/browse/way/:id' => 'browse#way', :id => /\d+/
@@ -86,8 +103,11 @@ OpenStreetMap::Application.routes.draw do
   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/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'
 
   # web site