parent
de29e9b3f5
commit
d0e45c7c8e
2 changed files with 28 additions and 1 deletions
|
@ -381,7 +381,7 @@ class Relation < ActiveRecord::Base
|
||||||
# reasonable on the assumption that adding or removing members doesn't
|
# reasonable on the assumption that adding or removing members doesn't
|
||||||
# materially change the rest of the relation.
|
# materially change the rest of the relation.
|
||||||
any_relations =
|
any_relations =
|
||||||
changed_members.collect { |_id, type| type == "relation" }
|
changed_members.collect { |type, _id, _role| type == "Relation" }
|
||||||
.inject(false) { |acc, elem| acc || elem }
|
.inject(false) { |acc, elem| acc || elem }
|
||||||
|
|
||||||
update_members = if tags_changed || any_relations
|
update_members = if tags_changed || any_relations
|
||||||
|
|
|
@ -180,4 +180,31 @@ class RelationTest < ActiveSupport::TestCase
|
||||||
assert_equal 1, cr.size
|
assert_equal 1, cr.size
|
||||||
assert_equal super_relation.id, cr.first.id
|
assert_equal super_relation.id, cr.first.id
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_update_changeset_bbox_any_relation
|
||||||
|
relation = create(:relation)
|
||||||
|
super_relation = create(:relation)
|
||||||
|
node = create(:node, :longitude => 116, :latitude => 39)
|
||||||
|
create(:relation_member, :relation => super_relation, :member_type => "Relation", :member_id => relation.id)
|
||||||
|
node_member = create(:relation_member, :relation => super_relation, :member_type => "Node", :member_id => node.id)
|
||||||
|
user = create(:user)
|
||||||
|
changeset = create(:changeset, :user => user)
|
||||||
|
assert_nil changeset.min_lon
|
||||||
|
assert_nil changeset.max_lon
|
||||||
|
assert_nil changeset.max_lat
|
||||||
|
assert_nil changeset.min_lat
|
||||||
|
new_relation = Relation.new
|
||||||
|
new_relation.id = super_relation.id
|
||||||
|
new_relation.version = super_relation.version
|
||||||
|
new_relation.changeset = changeset
|
||||||
|
new_relation.add_member node_member.member_type, node_member.member_id, node_member.member_role
|
||||||
|
# one member(relation type) was removed, so any_relation flag is expected to be true.
|
||||||
|
super_relation.update_from(new_relation, user)
|
||||||
|
|
||||||
|
# changeset updated by node member, representing any_relation flag true.
|
||||||
|
assert_equal 116, changeset.min_lon
|
||||||
|
assert_equal 116, changeset.max_lon
|
||||||
|
assert_equal 39, changeset.min_lat
|
||||||
|
assert_equal 39, changeset.max_lat
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue