CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-14 21:28:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prevent duplicate consecutive nodes in addNode, updateNode, and

Browse Source 
replaceNode, and add some comments.
This commit is contained in:
slhh
2016-12-16 15:43:29 +01:00
parent fa70d79622
commit 7817d6dff1
1 changed files with 59 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/osm/way.js
+59 -23
View File
@@ -187,34 +187,70 @@ _.extend(osmWay.prototype, {
});
},
// Adds a node (id) in front of the node which is currently at position index.
// If index is negative, it will be counted from the end of the way.
// If index is 0 or < -length, the node (id) will be added at the start of the way.
// If index is undefined or >= length, the node (id) will be added at the end of the way.
// Generating consecutive duplicates is silently prevented
addNode: function(id, index) {
var nodes = this.nodes.slice();
nodes.splice(index === undefined ? nodes.length : index, 0, id);
return this.update({nodes: nodes});
},
updateNode: function(id, index) {
var nodes = this.nodes.slice();
nodes.splice(index, 1, id);
return this.update({nodes: nodes});
},
replaceNode: function(needle, replacement) {
if (this.nodes.indexOf(needle) < 0)
return this;
var nodes = this.nodes.slice();
for (var i = 0; i < nodes.length; i++) {
if (nodes[i] === needle) {
nodes[i] = replacement;
}
var nodes = this.nodes.slice(),
spliceIndex = index === undefined ? nodes.length : index;
if (spliceIndex > nodes.length) spliceIndex = nodes.length;
if (spliceIndex < 0) spliceIndex = nodes.length + index;
if (spliceIndex < 0) spliceIndex = 0;
if (nodes[spliceIndex] !== id&& nodes[spliceIndex-1] !== id) {
nodes.splice(spliceIndex, 0, id);
}
return this.update({nodes: nodes});
},
// Replaces the node which is currently at position index with the given node (id).
// If index is negative, it will be counted from the end of the way.
// Consecutive duplicates are eliminated including existing ones.
updateNode: function(id, index) {
var nodes = [];
if (index < 0) index = this.nodes.length + index;
for (var i = 0; i < this.nodes.length; i++) {
var node = this.nodes[i];
if (i === index) {
if (nodes[nodes.length - 1] !== id)
nodes.push(id);
} else {
if (nodes[nodes.length - 1] !== node)
nodes.push(node);
}
}
return this.update({nodes: nodes});
},
// Replaces each occurrence of node id needle with replacement.
// Consecutive duplicates are eliminated including existing ones.
replaceNode: function(needle, replacement) {
var nodes = [];
for (var i = 0; i < this.nodes.length; i++) {
var node = this.nodes[i];
if (node === needle) {
if (nodes[nodes.length - 1] !== replacement)
nodes.push(replacement);
} else {
if (nodes[nodes.length - 1] !== node)
nodes.push(node);
}
}
return this.update({nodes: nodes});
},
// Removes each occurrence of node id needle with replacement.
// Consecutive duplicates are eliminated. Circularity is preserved.
removeNode: function(id) {
var nodes = [];