Move the trackpoints call into its own controller (and rename to tracepoints)

[rails.git] / app / controllers / ways_controller.rb

diff --git a/app/controllers/ways_controller.rb b/app/controllers/ways_controller.rb
index 39129ebf3486494f9be7bf76f036747c86c03bf4..caf787105058777fc02cef641aedc77dd7f669b9 100644 (file)
--- a/app/controllers/ways_controller.rb
+++ b/app/controllers/ways_controller.rb
@@ -3,7 +3,10 @@ class WaysController < ApplicationController
 
   skip_before_action :verify_authenticity_token
   before_action :authorize, :only => [:create, :update, :delete]
 
   skip_before_action :verify_authenticity_token
   before_action :authorize, :only => [:create, :update, :delete]

-  before_action :require_allow_write_api, :only => [:create, :update, :delete]
+  before_action :api_deny_access_handler
+
+  authorize_resource
+

   before_action :require_public_data, :only => [:create, :update, :delete]
   before_action :check_api_writable, :only => [:create, :update, :delete]
   before_action :check_api_readable, :except => [:create, :update, :delete]
   before_action :require_public_data, :only => [:create, :update, :delete]
   before_action :check_api_writable, :only => [:create, :update, :delete]
   before_action :check_api_readable, :except => [:create, :update, :delete]


@@ -19,7 +22,7 @@ class WaysController < ApplicationController
     render :plain => way.id.to_s
   end
 
     render :plain => way.id.to_s
   end
 

-  def read
+  def show

     way = Way.find(params[:id])
 
     response.last_modified = way.timestamp
     way = Way.find(params[:id])
 
     response.last_modified = way.timestamp


@@ -79,7 +82,7 @@ class WaysController < ApplicationController
     end
   end
 
     end
   end
 

-  def ways
+  def index

     unless params["ways"]
       raise OSM::APIBadUserInput, "The parameter ways is required, and must be of the form ways=id[,id[,id...]]"
     end
     unless params["ways"]
       raise OSM::APIBadUserInput, "The parameter ways is required, and must be of the form ways=id[,id[,id...]]"
     end