X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b95e9d27599ee55b2fd61a444acc3264c7637265..f98e6aac0a33ed8c179841c3c3dc7e2c0393d869:/app/controllers/way_controller.rb diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb index 49a3b3bfe..b443a67c0 100644 --- a/app/controllers/way_controller.rb +++ b/app/controllers/way_controller.rb @@ -10,8 +10,6 @@ class WayController < ApplicationController if way way.user_id = @user.id if way.save_with_history - - render :text => way.id else render :nothing => true, :status => 500 @@ -50,9 +48,32 @@ class WayController < ApplicationController way.visible = false way.save_with_history + render :nothing => true + return + when :put + way = Way.from_xml(request.raw_post, true) + if way + way_in_db = Way.find(way.id) + if way_in_db + way_in_db.user_id = @user.id + way_in_db.tags = way.tags + way_in_db.segs = way.segs + way_in_db.timestamp = way.timestamp + way_in_db.visible = true + if way_in_db.save_with_history + render :text => way.id + else + render :nothing => true, :status => 500 + end + return + else + render :nothing => true, :status => 404 # way doesn't exist yet + end + else + render :nothing => true, :status => 400 # if we got here the doc didnt parse + return + end end - end - end