From d7aca27f414a74eb37888e5deaaceca6caf544a2 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Tue, 5 Mar 2024 17:20:04 +0100 Subject: [PATCH] minor code readibility refactoring --- modules/actions/split.js | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/modules/actions/split.js b/modules/actions/split.js index 46bdbece6..fb67418f0 100644 --- a/modules/actions/split.js +++ b/modules/actions/split.js @@ -252,24 +252,25 @@ export function actionSplit(nodeIds, newWayIds) { let relation = graph.entity(relationId); const insertMembers = []; - for (let i = 0; i < relation.members.length; i++) { - const member = relation.members[i]; + const members = relation.members; + for (let i = 0; i < members.length; i++) { + const member = members[i]; if (member.id === wayA.id) { let wayAconnectsPrev = false; let wayAconnectsNext = false; let wayBconnectsPrev = false; let wayBconnectsNext = false; - if (i > 0 && graph.hasEntity(relation.members[i - 1].id)) { - const prevMember = relation.members[i - 1]; + if (i > 0 && graph.hasEntity(members[i - 1].id)) { + const prevMember = members[i - 1]; const prevEntity = graph.entity(prevMember.id); if (prevEntity.type === 'way' && prevEntity.id !== wayA.id && prevEntity.nodes.length > 0) { wayAconnectsPrev = connects(prevEntity, wayA); wayBconnectsPrev = connects(prevEntity, wayB); } } - if (i < relation.members.length - 1 && graph.hasEntity(relation.members[i + 1].id)) { - const nextMember = relation.members[i + 1]; + if (i < members.length - 1 && graph.hasEntity(members[i + 1].id)) { + const nextMember = members[i + 1]; const nextEntity = graph.entity(nextMember.id); if (nextEntity.type === 'way' && nextEntity.nodes.length > 0) { wayAconnectsNext = connects(nextEntity, wayA); @@ -293,8 +294,8 @@ export function actionSplit(nodeIds, newWayIds) { // check for loops if (wayAconnectsPrev && wayBconnectsPrev && wayAconnectsNext && wayBconnectsNext) { // try looking one more member ahead - if (i > 2 && graph.hasEntity(relation.members[i - 2].id)) { - const prev2Entity = graph.entity(relation.members[i - 2].id); + if (i > 2 && graph.hasEntity(members[i - 2].id)) { + const prev2Entity = graph.entity(members[i - 2].id); if (connects(prev2Entity, wayA) && !connects(prev2Entity, wayB)) { // prev-2 member connects only to A: insert B before A insertMembers.push({at: i, role: member.role}); @@ -306,8 +307,8 @@ export function actionSplit(nodeIds, newWayIds) { continue; } } - if (i < relation.members.length - 2 && graph.hasEntity(relation.members[i + 2].id)) { - const next2Entity = graph.entity(relation.members[i + 2].id); + if (i < members.length - 2 && graph.hasEntity(members[i + 2].id)) { + const next2Entity = graph.entity(members[i + 2].id); if (connects(next2Entity, wayA) && !connects(next2Entity, wayB)) { // next+2 member connects only to A: insert B after A insertMembers.push({at: i + 1, role: member.role});