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

Better testing of bbox handling in relations. Maybe fixes #1861, but wasn't able to reproduce the exact case. Fixed bug handling bboxes where element is repeated in relation.

Browse source
This commit is contained in:
Matt Amos 2009-05-26 15:37:29 +00:00
parent 20992870ab
commit 04dbf32b73
2 changed files with 98 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

47
app/models/relation.rb
View file

@ -208,7 +208,7 @@ class Relation < ActiveRecord::Base
def add_member(type,id,role) def add_member(type,id,role)
@members = Array.new unless @members @members = Array.new unless @members
@members += [[type,id,role]] @members += [[type,id.to_i,role]]
end end
def add_tag_keyval(k, v) def add_tag_keyval(k, v)
@ -385,21 +385,18 @@ class Relation < ActiveRecord::Base
# changed members in an array, as the bounding box updates for # changed members in an array, as the bounding box updates for
# elements are per-element, not blanked on/off like for tags. # elements are per-element, not blanked on/off like for tags.
changed_members = Array.new changed_members = Array.new
members = Hash.new members = self.members.clone
self.members.each do |m| self.relation_members.each do |old_member|
# should be: h[[m.id, m.type]] = m.role, but someone prefers arrays key = [old_member.member_type, old_member.member_id, old_member.member_role]
members[[m[1], m[0]]] = m[2] i = members.index key
end if i.nil?
relation_members.each do |old_member|
key = [old_member.member_id.to_s, old_member.member_type]
if members.has_key? key
members.delete key
else
changed_members << key changed_members << key
else
members.delete_at i
end end
end end
# any remaining members must be new additions # any remaining members must be new additions
changed_members += members.keys changed_members += members
# update the members. first delete all the old members, as the new # update the members. first delete all the old members, as the new
# members may be in a different order and i don't feel like implementing # members may be in a different order and i don't feel like implementing
@ -433,21 +430,17 @@ class Relation < ActiveRecord::Base
changed_members.collect { |id,type| type == "relation" }. changed_members.collect { |id,type| type == "relation" }.
inject(false) { |b,s| b or s } inject(false) { |b,s| b or s }
if tags_changed or any_relations update_members = if tags_changed or any_relations
# add all non-relation bounding boxes to the changeset # add all non-relation bounding boxes to the changeset
# FIXME: check for tag changes along with element deletions and # FIXME: check for tag changes along with element deletions and
# make sure that the deleted element's bounding box is hit. # make sure that the deleted element's bounding box is hit.
self.members.each do |type, id, role| self.members
if type != "Relation" else
update_changeset_element(type, id) changed_members
end end
end update_members.each do |type, id, role|
else if type != "Relation"
# add only changed members to the changeset update_changeset_element(type, id)
changed_members.each do |id, type|
if type != "Relation"
update_changeset_element(type, id)
end
end end
end end

115
test/functional/relation_controller_test.rb
View file

@ -529,23 +529,36 @@ class RelationControllerTest < ActionController::TestCase
# add a member to a relation and check the bounding box is only that # add a member to a relation and check the bounding box is only that
# element. # element.
def test_add_member_bounding_box def test_add_member_bounding_box
check_changeset_modify([4,4,4,4]) do |changeset_id| relation_id = current_relations(:visible_relation).id
# add node 4 (4,4) to an existing relation
relation_xml = current_relations(:visible_relation).to_xml [current_nodes(:used_node_1),
relation_element = relation_xml.find("//osm/relation").first current_nodes(:used_node_2),
new_member = XML::Node.new("member") current_ways(:used_way),
new_member['ref'] = current_nodes(:used_node_2).id.to_s current_ways(:way_with_versions)
new_member['type'] = "node" ].each_with_index do |element, version|
new_member['role'] = "some_role" bbox = element.bbox.collect { |x| x / SCALE }
relation_element << new_member check_changeset_modify(bbox) do |changeset_id|
relation_xml = Relation.find(relation_id).to_xml
relation_element = relation_xml.find("//osm/relation").first
new_member = XML::Node.new("member")
new_member['ref'] = element.id.to_s
new_member['type'] = element.class.to_s.downcase
new_member['role'] = "some_role"
relation_element << new_member
# update changeset ID to point to new changeset # update changeset ID to point to new changeset
update_changeset(relation_xml, changeset_id) update_changeset(relation_xml, changeset_id)
# upload the change # upload the change
content relation_xml content relation_xml
put :update, :id => current_relations(:visible_relation).id put :update, :id => current_relations(:visible_relation).id
assert_response :success, "can't update relation for add node/bbox test" assert_response :success, "can't update relation for add #{element.class}/bbox test: #{@response.body}"
# get it back and check the ordering
get :read, :id => relation_id
assert_response :success, "can't read back the relation: #{@response.body}"
check_ordering(relation_xml, @response.body)
end
end end
end end
@ -617,14 +630,18 @@ OSM
get :read, :id => relation_id get :read, :id => relation_id
assert_response :success, "can't read back the relation: #{@response.body}" assert_response :success, "can't read back the relation: #{@response.body}"
check_ordering(doc, @response.body) check_ordering(doc, @response.body)
# check the ordering in the history tables:
with_controller(OldRelationController.new) do
get :version, :id => relation_id, :version => 2
assert_response :success, "can't read back version 2 of the relation #{relation_id}"
check_ordering(doc, @response.body)
end
end end
## ##
# check that relations can contain duplicate members # check that relations can contain duplicate members
def test_relation_member_duplicates def test_relation_member_duplicates
## First try with the private user
basic_authorization(users(:normal_user).email, "test");
doc_str = <<OSM doc_str = <<OSM
<osm> <osm>
<relation changeset='4'> <relation changeset='4'>
@ -637,26 +654,16 @@ OSM
OSM OSM
doc = XML::Parser.string(doc_str).parse doc = XML::Parser.string(doc_str).parse
## First try with the private user
basic_authorization(users(:normal_user).email, "test");
content doc content doc
put :create put :create
assert_response :forbidden assert_response :forbidden
## Now try with the public user ## Now try with the public user
basic_authorization(users(:public_user).email, "test"); basic_authorization(users(:public_user).email, "test");
doc_str = <<OSM
<osm>
<relation changeset='4'>
<member ref='1' type='node' role='forward'/>
<member ref='3' type='node' role='forward'/>
<member ref='1' type='node' role='forward'/>
<member ref='3' type='node' role='forward'/>
</relation>
</osm>
OSM
doc = XML::Parser.string(doc_str).parse
content doc content doc
put :create put :create
assert_response :success, "can't create a relation: #{@response.body}" assert_response :success, "can't create a relation: #{@response.body}"
@ -664,8 +671,42 @@ OSM
# get it back and check the ordering # get it back and check the ordering
get :read, :id => relation_id get :read, :id => relation_id
assert_response :success, "can't read back the relation: #{relation_id}"
check_ordering(doc, @response.body)
end
##
# test that the ordering of elements in the history is the same as in current.
def test_history_ordering
doc_str = <<OSM
<osm>
<relation changeset='4'>
<member ref='1' type='node' role='forward'/>
<member ref='5' type='node' role='forward'/>
<member ref='4' type='node' role='forward'/>
<member ref='3' type='node' role='forward'/>
</relation>
</osm>
OSM
doc = XML::Parser.string(doc_str).parse
basic_authorization(users(:public_user).email, "test");
content doc
put :create
assert_response :success, "can't create a relation: #{@response.body}"
relation_id = @response.body.to_i
# check the ordering in the current tables:
get :read, :id => relation_id
assert_response :success, "can't read back the relation: #{@response.body}" assert_response :success, "can't read back the relation: #{@response.body}"
check_ordering(doc, @response.body) check_ordering(doc, @response.body)
# check the ordering in the history tables:
with_controller(OldRelationController.new) do
get :version, :id => relation_id, :version => 1
assert_response :success, "can't read back version 1 of the relation: #{@response.body}"
check_ordering(doc, @response.body)
end
end end
# ============================================================ # ============================================================
@ -726,12 +767,12 @@ OSM
with_controller(ChangesetController.new) do with_controller(ChangesetController.new) do
get :read, :id => changeset_id get :read, :id => changeset_id
assert_response :success, "can't re-read changeset for modify test" assert_response :success, "can't re-read changeset for modify test"
assert_select "osm>changeset", 1 assert_select "osm>changeset", 1, "Changeset element doesn't exist in #{@response.body}"
assert_select "osm>changeset[id=#{changeset_id}]", 1 assert_select "osm>changeset[id=#{changeset_id}]", 1, "Changeset id=#{changeset_id} doesn't exist in #{@response.body}"
assert_select "osm>changeset[min_lon=#{bbox[0].to_f}]", 1 assert_select "osm>changeset[min_lon=#{bbox[0].to_f}]", 1, "Changeset min_lon wrong in #{@response.body}"
assert_select "osm>changeset[min_lat=#{bbox[1].to_f}]", 1 assert_select "osm>changeset[min_lat=#{bbox[1].to_f}]", 1, "Changeset min_lat wrong in #{@response.body}"
assert_select "osm>changeset[max_lon=#{bbox[2].to_f}]", 1 assert_select "osm>changeset[max_lon=#{bbox[2].to_f}]", 1, "Changeset max_lon wrong in #{@response.body}"
assert_select "osm>changeset[max_lat=#{bbox[3].to_f}]", 1 assert_select "osm>changeset[max_lat=#{bbox[3].to_f}]", 1, "Changeset max_lat wrong in #{@response.body}"
end end
end end