if !way.preconditions_ok?
render :text => "", :status => :precondition_failed
else
- way.version = 0
+ way.version = 0
way.user_id = @user.id
way.save_with_history!
new_way = Way.from_xml(request.raw_post)
if new_way and new_way.id == way.id
- way.update_from(new_way, @user)
- render :nothing => true
+ way.update_from(new_way, @user)
+ render :text => way.version.to_s, :content_type => "text/plain"
else
render :nothing => true, :status => :bad_request
end
rescue OSM::APIPreconditionFailedError
render :text => "", :status => :precondition_failed
+ rescue OSM::APIVersionMismatchError => ex
+ render :text => "Version mismatch: Provided " + ex.provided.to_s +
+ ", server had: " + ex.latest.to_s, :status => :bad_request
rescue ActiveRecord::RecordNotFound
render :nothing => true, :status => :not_found
end