The ordering of these shouldn't have mattered, but it did, because I didn't put a...

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 2c7f4d0fcab5628479fda2e52d10ac35190e9e0c..5ca4f5a5362efd90b288a636827732a174691cc8 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,8 +3,8 @@ ActionController::Routing::Routes.draw do |map|
   # API
   map.connect "api/#{API_VERSION}/changeset/create", :controller => 'changeset', :action => 'create'
   map.connect "api/#{API_VERSION}/changeset/upload", :controller => 'changeset', :action => 'upload'
   # API
   map.connect "api/#{API_VERSION}/changeset/create", :controller => 'changeset', :action => 'create'
   map.connect "api/#{API_VERSION}/changeset/upload", :controller => 'changeset', :action => 'upload'

-  map.connect "api/#{API_VERSION}/changeset/:id", :controller => 'changeset', :action => 'read'
-  map.connect "api/#{API_VERSION}/changeset/:id/close", :controller => 'changeset', :action => 'close'
+  map.connect "api/#{API_VERSION}/changeset/:id", :controller => 'changeset', :action => 'read', :id => /\d+/
+  map.connect "api/#{API_VERSION}/changeset/:id/close", :controller => 'changeset', :action => 'close', :id =>/\d+/

   
   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/create", :controller => 'node', :action => 'create'
   map.connect "api/#{API_VERSION}/node/:id/ways", :controller => 'way', :action => 'ways_for_node', :id => /\d+/


@@ -59,6 +59,7 @@ ActionController::Routing::Routes.draw do |map|
   
   # Potlatch API
   
   
   # Potlatch API
   

+  map.connect "api/0.5/amf", :controller =>'amf', :action =>'talk'

   map.connect "api/#{API_VERSION}/amf", :controller =>'amf', :action =>'talk'
   map.connect "api/#{API_VERSION}/swf/trackpoints", :controller =>'swf', :action =>'trackpoints'
   
   map.connect "api/#{API_VERSION}/amf", :controller =>'amf', :action =>'talk'
   map.connect "api/#{API_VERSION}/swf/trackpoints", :controller =>'swf', :action =>'trackpoints'