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

Add support for conditional deletes in changeset uploads

Browse source 
A delete element in an osmChange upload can now have an if-unused
attribute to indicate that the delete should not be done if the
object is still in use.
This commit is contained in:
Tom Hughes 2010-12-13 00:21:47 +00:00
parent f20a85a5c5
commit 2d937f94d5
2 changed files with 76 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

50
test/functional/changeset_controller_test.rb
View file

@ -497,6 +497,56 @@ EOF
assert_equal true, Relation.find(current_relations(:visible_relation).id).visible
end
##
# test that a conditional delete of an in use object works.
def test_upload_delete_if_unused
basic_authorization users(:public_user).email, "test"
diff = XML::Document.new
diff.root = XML::Node.new "osmChange"
delete = XML::Node.new "delete"
diff.root << delete
delete["if-unused"] = ""
delete << current_relations(:public_used_relation).to_xml_node
delete << current_ways(:used_way).to_xml_node
delete << current_nodes(:node_used_by_relationship).to_xml_node
# upload it
content diff
post :upload, :id => 2
assert_response :success,
"can't do a conditional delete of in use objects: #{@response.body}"
# check the returned payload
assert_select "diffResult[version=#{API_VERSION}][generator=\"OpenStreetMap server\"]", 1
assert_select "diffResult>node", 1
assert_select "diffresult>way", 1
assert_select "diffResult>relation", 1
# parse the response
doc = XML::Parser.string(@response.body).parse
# check the old IDs are all present and what we expect
assert_equal current_nodes(:node_used_by_relationship).id, doc.find("//diffResult/node").first["old_id"].to_i
assert_equal current_ways(:used_way).id, doc.find("//diffResult/way").first["old_id"].to_i
assert_equal current_relations(:public_used_relation).id, doc.find("//diffResult/relation").first["old_id"].to_i
# check the new IDs are all present and unchanged
assert_equal current_nodes(:node_used_by_relationship).id, doc.find("//diffResult/node").first["new_id"].to_i
assert_equal current_ways(:used_way).id, doc.find("//diffResult/way").first["new_id"].to_i
assert_equal current_relations(:public_used_relation).id, doc.find("//diffResult/relation").first["new_id"].to_i
# check the new versions are all present and unchanged
assert_equal current_nodes(:node_used_by_relationship).version, doc.find("//diffResult/node").first["new_version"].to_i
assert_equal current_ways(:used_way).version, doc.find("//diffResult/way").first["new_version"].to_i
assert_equal current_relations(:public_used_relation).version, doc.find("//diffResult/relation").first["new_version"].to_i
# check that nothing was, in fact, deleted
assert_equal true, Node.find(current_nodes(:node_used_by_relationship).id).visible
assert_equal true, Way.find(current_ways(:used_way).id).visible
assert_equal true, Relation.find(current_relations(:public_used_relation).id).visible
end
##
# upload an element with a really long tag value
def test_upload_invalid_too_long_tag