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

Calculate bounding box when deleting relations

Browse source 
Closes #2030
Fixes #2020
This commit is contained in:
Simon Poole 2018-10-21 19:32:12 +01:00 • committed by Tom Hughes
parent 51b82a34f8
commit 07ffb4c3f6
2 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/relation.rb
View file

@ -384,7 +384,9 @@ class Relation < ActiveRecord::Base
changed_members.collect { |type, _id, _role| type == "Relation" }
.inject(false) { |acc, elem| acc || elem }
update_members = if tags_changed || any_relations
# if the relation is being deleted tags_changed will be true and members empty
# so we need to use changed_members to create a correct bounding box
update_members = if visible && (tags_changed || any_relations)
# add all non-relation bounding boxes to the changeset
# FIXME: check for tag changes along with element deletions and
# make sure that the deleted element's bounding box is hit.

25
test/models/relation_test.rb
View file

@ -207,4 +207,29 @@ class RelationTest < ActiveSupport::TestCase
assert_equal 39, changeset.min_lat
assert_equal 39, changeset.max_lat
end
def test_changeset_bbox_delete_relation
orig_relation = create(:relation)
node1 = create(:node, :longitude => 116, :latitude => 39)
node2 = create(:node, :longitude => 39, :latitude => 116)
create(:relation_member, :relation => orig_relation, :member_type => "Node", :member_id => node1.id)
create(:relation_member, :relation => orig_relation, :member_type => "Node", :member_id => node2.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 = orig_relation.id
new_relation.version = orig_relation.version
new_relation.changeset_id = changeset.id
orig_relation.delete_with_history!(new_relation, user)
changeset.reload
assert_equal 39, changeset.min_lon
assert_equal 116, changeset.max_lon
assert_equal 39, changeset.min_lat
assert_equal 116, changeset.max_lat
end
end