cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove method tests that are now enforced by the routes

Browse source
This commit is contained in:
Tom Hughes 2012-03-09 20:19:55 +00:00
parent c74180ba0f
commit 6391ea5a7a
2 changed files with 59 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

90
app/controllers/amf_controller.rb
View file

@ -45,66 +45,58 @@ class AmfController < ApplicationController
# calls each action (private method) accordingly.
def amf_read
if request.post?
self.status = :ok
self.content_type = Mime::AMF
self.response_body = Dispatcher.new(request.raw_post) do |message,*args|
logger.info("Executing AMF #{message}(#{args.join(',')})")
self.status = :ok
self.content_type = Mime::AMF
self.response_body = Dispatcher.new(request.raw_post) do |message,*args|
logger.info("Executing AMF #{message}(#{args.join(',')})")
case message
when 'getpresets'; result = getpresets(*args)
when 'whichways'; result = whichways(*args)
when 'whichways_deleted'; result = whichways_deleted(*args)
when 'getway'; result = getway(args[0].to_i)
when 'getrelation'; result = getrelation(args[0].to_i)
when 'getway_old'; result = getway_old(args[0].to_i,args[1])
when 'getway_history'; result = getway_history(args[0].to_i)
when 'getnode_history'; result = getnode_history(args[0].to_i)
when 'findgpx'; result = findgpx(*args)
when 'findrelations'; result = findrelations(*args)
when 'getpoi'; result = getpoi(*args)
end
result
case message
when 'getpresets'; result = getpresets(*args)
when 'whichways'; result = whichways(*args)
when 'whichways_deleted'; result = whichways_deleted(*args)
when 'getway'; result = getway(args[0].to_i)
when 'getrelation'; result = getrelation(args[0].to_i)
when 'getway_old'; result = getway_old(args[0].to_i,args[1])
when 'getway_history'; result = getway_history(args[0].to_i)
when 'getnode_history'; result = getnode_history(args[0].to_i)
when 'findgpx'; result = findgpx(*args)
when 'findrelations'; result = findrelations(*args)
when 'getpoi'; result = getpoi(*args)
end
else
render :nothing => true, :status => :method_not_allowed
result
end
end
def amf_write
if request.post?
renumberednodes = {} # Shared across repeated putways
renumberedways = {} # Shared across repeated putways
err = false # Abort batch on error
renumberednodes = {} # Shared across repeated putways
renumberedways = {} # Shared across repeated putways
err = false # Abort batch on error
self.status = :ok
self.content_type = Mime::AMF
self.response_body = Dispatcher.new(request.raw_post) do |message,*args|
logger.info("Executing AMF #{message}")
self.status = :ok
self.content_type = Mime::AMF
self.response_body = Dispatcher.new(request.raw_post) do |message,*args|
logger.info("Executing AMF #{message}")
if err
result = [-5, nil]
else
case message
when 'putway'; orn = renumberednodes.dup
result = putway(renumberednodes, *args)
result[4] = renumberednodes.reject { |k,v| orn.has_key?(k) }
if result[0] == 0 and result[2] != result[3] then renumberedways[result[2]] = result[3] end
when 'putrelation'; result = putrelation(renumberednodes, renumberedways, *args)
when 'deleteway'; result = deleteway(*args)
when 'putpoi'; result = putpoi(*args)
if result[0] == 0 and result[2] != result[3] then renumberednodes[result[2]] = result[3] end
when 'startchangeset'; result = startchangeset(*args)
end
err = true if result[0] == -3 # If a conflict is detected, don't execute any more writes
if err
result = [-5, nil]
else
case message
when 'putway'; orn = renumberednodes.dup
result = putway(renumberednodes, *args)
result[4] = renumberednodes.reject { |k,v| orn.has_key?(k) }
if result[0] == 0 and result[2] != result[3] then renumberedways[result[2]] = result[3] end
when 'putrelation'; result = putrelation(renumberednodes, renumberedways, *args)
when 'deleteway'; result = deleteway(*args)
when 'putpoi'; result = putpoi(*args)
if result[0] == 0 and result[2] != result[3] then renumberednodes[result[2]] = result[3] end
when 'startchangeset'; result = startchangeset(*args)
end
result
err = true if result[0] == -3 # If a conflict is detected, don't execute any more writes
end
else
render :nothing => true, :status => :method_not_allowed
result
end
end

40
app/controllers/trace_controller.rb
View file

@ -201,13 +201,13 @@ class TraceController < ApplicationController
trace = Trace.find(params[:id])
if @user and trace.user == @user
if request.post? and trace.visible?
if trace.visible?
trace.visible = false
trace.save
flash[:notice] = t 'trace.delete.scheduled_for_deletion'
redirect_to :action => :list, :display_name => @user.display_name
else
render :nothing => true, :status => :bad_request
render :nothing => true, :status => :not_found
end
else
render :nothing => true, :status => :forbidden
@ -333,34 +333,30 @@ class TraceController < ApplicationController
end
def api_create
if request.post?
tags = params[:tags] || ""
description = params[:description] || ""
visibility = params[:visibility]
tags = params[:tags] || ""
description = params[:description] || ""
visibility = params[:visibility]
if visibility.nil?
if params[:public] && params[:public].to_i.nonzero?
visibility = "public"
else
visibility = "private"
end
if visibility.nil?
if params[:public] && params[:public].to_i.nonzero?
visibility = "public"
else
visibility = "private"
end
end
if params[:file].respond_to?(:read)
do_create(params[:file], tags, description, visibility)
if params[:file].respond_to?(:read)
do_create(params[:file], tags, description, visibility)
if @trace.id
render :text => @trace.id.to_s, :content_type => "text/plain"
elsif @trace.valid?
render :nothing => true, :status => :internal_server_error
else
render :nothing => true, :status => :bad_request
end
if @trace.id
render :text => @trace.id.to_s, :content_type => "text/plain"
elsif @trace.valid?
render :nothing => true, :status => :internal_server_error
else
render :nothing => true, :status => :bad_request
end
else
render :nothing => true, :status => :method_not_allowed
render :nothing => true, :status => :bad_request
end
end