CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 01:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Protect against relation loops (fixes #2072)

Browse Source
This commit is contained in:
John Firebaugh
2014-01-02 17:42:57 -08:00
parent 4ce9bedb9c
commit 7bbca76a20
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
js/id/core/relation.js
View File

@@ -20,12 +20,15 @@ _.extend(iD.Relation.prototype, {
type: 'relation',
members: [],
extent: function(resolver) {
extent: function(resolver, memo) {
return resolver.transient(this, 'extent', function() {
if (memo && memo[this.id]) return iD.geo.Extent();
memo = memo || {};
memo[this.id] = true;
return this.members.reduce(function(extent, member) {
member = resolver.hasEntity(member.id);
if (member) {
return extent.extend(member.extent(resolver));
return extent.extend(member.extent(resolver, memo));
} else {
return extent;
}

6
test/spec/core/relation.js
View File

@@ -44,6 +44,12 @@ describe('iD.Relation', function () {
expect(r.extent(graph)).to.eql([[0, 0], [0, 0]])
});
it("does not error on self-referencing relations", function () {
var r = iD.Relation();
r = r.addMember({id: r.id});
expect(r.extent(iD.Graph([r]))).to.eql(iD.geo.Extent())
});
});
describe("#geometry", function () {