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

Prevent duplicate consecutive nodes (#1296)

Browse Source
This commit is contained in:
John Firebaugh
2013-04-12 10:55:53 -04:00
parent 5dda54ea52
commit 94e2c8d8d6
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
js/id/core/way.js
View File

@@ -98,10 +98,17 @@ _.extend(iD.Way.prototype, {
},
removeNode: function(id) {
var nodes = _.without(this.nodes, id);
var nodes = [];
for (var i = 0; i < this.nodes.length; i++) {
var node = this.nodes[i];
if (node != id && nodes[nodes.length - 1] != node) {
nodes.push(node);
}
}
// Preserve circularity
if (this.nodes.length > 1 && this.first() === id && this.last() === id) {
if (this.nodes.length > 1 && this.first() === id && this.last() === id && nodes[nodes.length - 1] != nodes[0]) {
nodes.push(nodes[0]);
}

19
test/spec/core/way.js
View File

@@ -221,6 +221,15 @@ describe('iD.Way', function() {
expect(w.removeNode('a').nodes).to.eql([]);
});
it("prevents duplicate consecutive nodes", function () {
var a = iD.Node({id: 'a'}),
b = iD.Node({id: 'b'}),
c = iD.Node({id: 'c'}),
w = iD.Way({nodes: ['a', 'b', 'c', 'b']});
expect(w.removeNode('c').nodes).to.eql(['a', 'b']);
});
it("preserves circularity", function () {
var a = iD.Node({id: 'a'}),
b = iD.Node({id: 'b'}),
@@ -230,6 +239,16 @@ describe('iD.Way', function() {
expect(w.removeNode('a').nodes).to.eql(['b', 'c', 'd', 'b']);
});
it("prevents duplicate consecutive nodes when preserving circularity", function () {
var a = iD.Node({id: 'a'}),
b = iD.Node({id: 'b'}),
c = iD.Node({id: 'c'}),
d = iD.Node({id: 'd'}),
w = iD.Way({nodes: ['a', 'b', 'c', 'd', 'b', 'a']});
expect(w.removeNode('a').nodes).to.eql(['b', 'c', 'd', 'b']);
});
});
describe("#asJXON", function () {