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

handle closed roundabout ways like a single junction "point"

Browse Source
This commit is contained in:
Martin Raifer
2024-03-04 17:58:12 +01:00
parent 088db7ccc1
commit 7268a8538c
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/actions/split.js
View File

@@ -234,6 +234,15 @@ export function actionSplit(nodeIds, newWayIds) {
function splitWayMember(graph, relationId, wayA, wayB) {
function connects(way1, way2) {
if (way1.nodes.length < 2 || way2.nodes.length < 2) return false;
if (way1.tags.junction === 'roundabout' && way1.isClosed()) {
return way1.nodes.some(nodeId =>
nodeId === way2.nodes[0] ||
nodeId === way2.nodes[way2.nodes.length - 1]);
} else if (way2.tags.junction === 'roundabout' && way2.isClosed()) {
return way2.nodes.some(nodeId =>
nodeId === way1.nodes[0] ||
nodeId === way1.nodes[way1.nodes.length - 1]);
}
if (way1.nodes[0] === way2.nodes[0]) return true;
if (way1.nodes[0] === way2.nodes[way2.nodes.length - 1]) return true;
if (way1.nodes[way1.nodes.length - 1] === way2.nodes[way2.nodes.length - 1]) return true;
@@ -283,7 +292,7 @@ export function actionSplit(nodeIds, newWayIds) {
// check for loops
if (wayAconnectsPrev && wayBconnectsPrev && wayAconnectsNext && wayBconnectsNext) {
// look one more member ahead
// 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 (connects(prev2Entity, wayA) && !connects(prev2Entity, wayB)) {
@@ -316,10 +325,8 @@ export function actionSplit(nodeIds, newWayIds) {
// just make sure before/after still connect
if (wayA.nodes[wayA.nodes.length - 1] === wayB.nodes[0]) {
insertMembers.push({at: i + 1, role: member.role});
continue;
} else {
insertMembers.push({at: i, role: member.role});
continue;
}
}
}