From d353b48a0bf77a61ce6676d4513f20bf4c6fc82d Mon Sep 17 00:00:00 2001 From: que01 Date: Wed, 9 Sep 2026 10:21:26 +0800 Subject: [PATCH] fix(junction): anchor controls to sourced crossings --- src/compile/direct-edit-solver.js | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/src/compile/direct-edit-solver.js b/src/compile/direct-edit-solver.js index 63f047f..2993700 100644 --- a/src/compile/direct-edit-solver.js +++ b/src/compile/direct-edit-solver.js @@ -301,6 +301,30 @@ function clusterArmRadiusPoint(arm, center, radius) { : reference; } +function clusterCrossingBaseRadius(model, arm, center, inferredRadius) { + const inferredCenter = clusterArmRadiusPoint(arm, center, inferredRadius); + if (!inferredCenter) return inferredRadius; + const osmWayIds = new Set( + arm.members.flatMap((member) => member.roads.flatMap((road) => (road.osmWayIds || []).map(String))), + ); + const maximumDistance = Math.max( + 8, + arm.members.reduce((width, member) => width + (Number(member.approach.widthMeters) || 0), 0) / 2 + 3, + ); + const crossing = (model.crossings || []) + .filter( + (item) => + (item.osmWayIds || []).some((wayId) => osmWayIds.has(String(wayId))) && + haversineMeters(item.coordinate, inferredCenter) <= maximumDistance, + ) + .sort( + (first, second) => + haversineMeters(first.coordinate, inferredCenter) - haversineMeters(second.coordinate, inferredCenter) || + String(first.id).localeCompare(String(second.id)), + )[0]; + return crossing ? haversineMeters(center, crossing.coordinate) : inferredRadius; +} + function clusterArms(clusterId, items) { const byArm = new Map(); for (const item of items) { @@ -1508,7 +1532,12 @@ function makeClusterCrossingHandles(model, junctionData, constraints, clusters) const pointAt = (distance) => clusterArmRadiusPoint(arm, center, distance) || coordinateAt(line, Math.min(0.9, Math.max(0.05, distance / length))); - const baseCrosswalkDistance = Math.max(2, complexJunctionMetrics(cluster).coreRadius * 0.68); + const baseCrosswalkDistance = clusterCrossingBaseRadius( + model, + arm, + center, + Math.max(2, complexJunctionMetrics(cluster).coreRadius * 0.68), + ); const insetConstraint = constraintFor(constraints, 'cluster-crossing-inset', anchor); const inset = numericValue(insetConstraint, 'insetMeters', 0); handles.push({