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

Test and fix for #1567, for teh betterer osmChange compliance.

Browse source
This commit is contained in:
Matt Amos 2009-02-08 16:54:28 +00:00
parent 12b779f0b4
commit 5143fbcd5b
2 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/diff_reader.rb
View file

@ -179,14 +179,23 @@ class DiffReader
# delete action. this takes a payload in API 0.6, so we need to do # delete action. this takes a payload in API 0.6, so we need to do
# most of the same checks that are done for the modify. # most of the same checks that are done for the modify.
with_model do |model, xml| with_model do |model, xml|
new = model.from_xml_node(xml, false) # delete doesn't have to contain a full payload, according to
check(model, xml, new) # the wiki docs, so we just extract the things we need.
new_id = xml['id'].to_i
raise API::APIBadXMLError.new(model, xml, "ID attribute is required") if new_id.nil?
# if the ID is a placeholder then map it to the real ID # if the ID is a placeholder then map it to the real ID
model_sym = model.to_s.downcase.to_sym model_sym = model.to_s.downcase.to_sym
is_placeholder = ids[model_sym].include? new.id is_placeholder = ids[model_sym].include? new_id
id = is_placeholder ? ids[model_sym][new.id] : new.id id = is_placeholder ? ids[model_sym][new_id] : new_id
# build the "new" element by modifying the existing one
new = model.find(id)
new.changeset_id = xml['changeset'].to_i
new.version = xml['version'].to_i
check(model, xml, new)
# fetch the matching old element from the DB
old = model.find(id) old = model.find(id)
# can a delete have placeholders under any circumstances? # can a delete have placeholders under any circumstances?
@ -197,7 +206,7 @@ class DiffReader
xml_result = XML::Node.new model.to_s.downcase xml_result = XML::Node.new model.to_s.downcase
# oh, the irony... the "new" element actually contains the "old" ID # oh, the irony... the "new" element actually contains the "old" ID
# a better name would have been client/server, but anyway... # a better name would have been client/server, but anyway...
xml_result["old_id"] = new.id.to_s xml_result["old_id"] = new_id.to_s
result.root << xml_result result.root << xml_result
end end

23
test/functional/changeset_controller_test.rb
View file

@ -217,6 +217,29 @@ EOF
assert_equal false, Relation.find(current_relations(:used_relation).id).visible assert_equal false, Relation.find(current_relations(:used_relation).id).visible
end end
##
# test uploading a delete with no lat/lon, as they are optional in
# the osmChange spec.
def test_upload_nolatlon_delete
basic_authorization "test@openstreetmap.org", "test"
node = current_nodes(:visible_node)
cs = changesets(:normal_user_first_change)
diff = "<osmChange><delete><node id='#{node.id}' version='#{node.version}' changeset='#{cs.id}'/></delete></osmChange>"
# upload it
content diff
post :upload, :id => cs.id
assert_response :success,
"can't upload a deletion diff to changeset: #{@response.body}"
# check the response is well-formed
assert_select "diffResult>node", 1
# check that everything was deleted
assert_equal false, Node.find(node.id).visible
end
## ##
# test that deleting stuff in a transaction doesn't bypass the checks # test that deleting stuff in a transaction doesn't bypass the checks
# to ensure that used elements are not deleted. # to ensure that used elements are not deleted.