fix(junction): keep complex carriageways connected
This commit is contained in:
1 parent
53a2cb3450
commit
855400fba2
3 files changed
+77
-6
No files matched your search
@@ -653,6 +653,10 @@ function compileGeometry(model, overrides = { overrides: [] }, options = {}) {
|
||||
const generatedComplexSidewalks = [];
|
||||
const generatedComplexCrosswalks = [];
|
||||
const generatedComplexStopLines = [];
|
||||
// The external road and its complex-junction carriageway must end at the
|
||||
// same radial boundary. A fixed outer radius here while the carriageway used
|
||||
// its per-arm cutback left a visible asphalt gap between the two surfaces.
|
||||
const complexApproachBoundaries = complexApproachBoundaryRadii(model, activeClusters, junctionPlans);
|
||||
for (const road of model.roads) {
|
||||
const segmentKey = road.segmentId;
|
||||
if (emittedSegments.has(segmentKey)) continue;
|
||||
@@ -689,6 +693,7 @@ function compileGeometry(model, overrides = { overrides: [] }, options = {}) {
|
||||
junctionPlans,
|
||||
cluster,
|
||||
complexClusterCenters.get(cluster.id),
|
||||
complexApproachBoundaries.get(cluster.id)?.get(road.id),
|
||||
)
|
||||
: trimLineAtJunctions(road.centerline, road.sourceNodeIds, junctionPlans);
|
||||
const ring = roadRing(line, totalWidth);
|
||||
@@ -3193,20 +3198,44 @@ function trimLineAtJunctions(line, sourceNodeIds, junctionPlans) {
|
||||
return result;
|
||||
}
|
||||
|
||||
function trimLineAtComplexCluster(line, sourceNodeIds, junctionPlans, cluster, center) {
|
||||
function trimLineAtComplexCluster(line, sourceNodeIds, junctionPlans, cluster, center, boundaryRadius) {
|
||||
if (!center || line.length < 2) return trimLineAtJunctions(line, sourceNodeIds, junctionPlans);
|
||||
const boundaryRadius = complexJunctionMetrics(cluster).approachOuterRadius;
|
||||
const radius = Number.isFinite(boundaryRadius) ? boundaryRadius : complexJunctionMetrics(cluster).approachOuterRadius;
|
||||
const startInCluster = cluster.nodeIds.map(String).includes(String(sourceNodeIds[0]));
|
||||
const endInCluster = cluster.nodeIds.map(String).includes(String(sourceNodeIds.at(-1)));
|
||||
const available = lineLengthMeters(line);
|
||||
const startDistance = startInCluster ? distanceAlongLineToRadius(line, center, boundaryRadius) : 0;
|
||||
const endDistance = endInCluster ? distanceAlongLineToRadius([...line].reverse(), center, boundaryRadius) : 0;
|
||||
const startDistance = startInCluster ? distanceAlongLineToRadius(line, center, radius) : 0;
|
||||
const endDistance = endInCluster ? distanceAlongLineToRadius([...line].reverse(), center, radius) : 0;
|
||||
const startCutback = startDistance > 0 && available > startDistance + 1 ? startDistance : 0;
|
||||
const endCutback = endDistance > 0 && available > endDistance + 1 ? endDistance : 0;
|
||||
if (!startCutback && !endCutback) return line;
|
||||
return trimLineRange(line, startCutback, endCutback);
|
||||
}
|
||||
|
||||
function complexApproachBoundaryRadii(model, clusters, junctionPlans) {
|
||||
const result = new Map();
|
||||
for (const cluster of clusters) {
|
||||
if (cluster.template !== 'complex-junction-v1') continue;
|
||||
const outerRadius = complexJunctionMetrics(cluster).approachOuterRadius;
|
||||
const topology = resolveComplexJunctionTopology(model, cluster, {
|
||||
junctionPlans,
|
||||
distanceMeters,
|
||||
lineLengthMeters,
|
||||
headingAtEndpoint,
|
||||
});
|
||||
const radii = new Map();
|
||||
for (const item of topology.carriageways) {
|
||||
const radius = Math.max(
|
||||
complexJunctionMetrics(cluster).coreRadius + 4,
|
||||
outerRadius - Math.max(0, item.approach.cutback || 0),
|
||||
);
|
||||
for (const roadId of item.approach.roadIds) radii.set(roadId, radius);
|
||||
}
|
||||
result.set(cluster.id, radii);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
function distanceAlongLineToRadius(line, center, radius) {
|
||||
if (!center || line.length < 2) return 0;
|
||||
const heading = headingAtEndpoint(line);
|
||||
|
||||
Reference in new issue
Block a user