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

Style adjustments

Browse Source
This commit is contained in:
John Firebaugh
2014-02-09 18:45:31 -08:00
parent 90fd8b6e51
commit 173108ae46
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/actions/merge_polygon.js
+5 -8
View File
@@ -86,14 +86,13 @@ iD.actions.MergePolygon = function(ids, newRelationId) {
graph = graph.remove(m);
});
entities.closedWay.forEach(function(cw) {
entities.closedWay.forEach(function(way) {
function isThisOuter(m) {
return m.id === cw.id && m.role !== "inner";
return m.id === way.id && m.role !== "inner";
}
if (members.some(isThisOuter)) {
var entity = graph.entity(cw.id);
relation = relation.mergeTags(entity.tags);
graph = graph.replace(entity.update({ tags: {} }));
relation = relation.mergeTags(way.tags);
graph = graph.replace(way.update({ tags: {} }));
}
});
@@ -108,9 +107,7 @@ iD.actions.MergePolygon = function(ids, newRelationId) {
if (entities.other.length > 0 ||
entities.closedWay.length + entities.multipolygon.length < 2)
return 'not_eligible';
if (!entities.multipolygon.every(function(r) {
return r.isComplete(graph);
}))
if (!entities.multipolygon.every(function(r) { return r.isComplete(graph); }))
return 'incomplete_relation';
};