From 280b726c6f76747320fa53797e1ddbb5489edc72 Mon Sep 17 00:00:00 2001 From: que01 Date: Wed, 9 Sep 2026 10:24:57 +0800 Subject: [PATCH] feat(junction): taper complex carriageway edits --- src/compile/complex-junction.js | 5 ++++- src/compile/junction-boundary-graph.js | 12 ++++++++---- src/compile/native-road.js | 8 +++++++- test/workbench-edit-api.js | 12 ++++++++++++ 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/compile/complex-junction.js b/src/compile/complex-junction.js index 7aceaeb..e8b24db 100644 --- a/src/compile/complex-junction.js +++ b/src/compile/complex-junction.js @@ -507,8 +507,11 @@ function buildComplexJunctionGeometry(model, cluster, helpers) { 0, ), width_m: item.approach.widthMeters, + outer_width_m: section.outerWidthMeters, + inner_width_m: section.innerWidthMeters, + transition_length_m: Math.round((section.outer.stationMeters - section.inner.stationMeters) * 10) / 10, boundary_refs: section.edgeRefs, - provenance: 'native-road-complex-junction/v5', + provenance: 'native-road-complex-junction/v6-shared-transition-sections', }, geometry: { type: 'Polygon', coordinates: [ring] }, }); diff --git a/src/compile/junction-boundary-graph.js b/src/compile/junction-boundary-graph.js index 5216e91..b2e6ffd 100644 --- a/src/compile/junction-boundary-graph.js +++ b/src/compile/junction-boundary-graph.js @@ -39,11 +39,11 @@ function offsetCoordinate(point, heading, meters) { ]; } -function sectionAt(item, radius, center, helpers) { +function sectionAt(item, radius, center, widthMeters, helpers) { const station = Math.min(item.length, stationAtDistanceFrom(item.approach.line, center, radius, helpers)); const point = pointAtStation(item.approach.line, station, helpers); const tangent = tangentAtStation(item.approach.line, station, helpers); - const halfWidth = Math.max(0, Number(item.approach.widthMeters) || 0) / 2; + const halfWidth = Math.max(0, Number(widthMeters) || 0) / 2; return { stationMeters: station, point, @@ -60,13 +60,17 @@ function buildJunctionBoundaryGraph(topology, center, radii, helpers, exclusionR const sections = topology.carriageways.map((item) => { const outerRadius = radii.outerRadiusFor(item); const innerRadius = radii.innerRadiusFor(item); - const outer = sectionAt(item, outerRadius, center, helpers); - const inner = sectionAt(item, innerRadius, center, helpers); + const outerWidthMeters = Number(item.approach.sourceWidthMeters) || item.approach.widthMeters; + const innerWidthMeters = item.approach.widthMeters; + const outer = sectionAt(item, outerRadius, center, outerWidthMeters, helpers); + const inner = sectionAt(item, innerRadius, center, innerWidthMeters, helpers); const key = `boundary:${item.key}`; return { key, carriagewayKey: item.key, armKey: item.armKey, + outerWidthMeters, + innerWidthMeters, outer, inner, edgeRefs: { diff --git a/src/compile/native-road.js b/src/compile/native-road.js index 24a2aac..88d8527 100644 --- a/src/compile/native-road.js +++ b/src/compile/native-road.js @@ -988,7 +988,13 @@ function applyDirectClusterPlans(model, junctionPlans, directEdit, clusters) { }); for (const item of topology.carriageways) { const width = widths.get(item.key); - if (Number.isFinite(width)) item.approach.widthMeters = width; + if (Number.isFinite(width)) { + // The outer section stays attached to the untouched source road. The + // complex approach then tapers from that fixed width to this local + // correction instead of opening a seam at the cluster boundary. + item.approach.sourceWidthMeters ??= item.approach.widthMeters; + item.approach.widthMeters = width; + } const cutback = cutbacks.get(item.key); if (Number.isFinite(cutback)) item.approach.cutback = cutback; } diff --git a/test/workbench-edit-api.js b/test/workbench-edit-api.js index f4ee3eb..84b20d5 100644 --- a/test/workbench-edit-api.js +++ b/test/workbench-edit-api.js @@ -328,6 +328,18 @@ assert.notDeepEqual( complexSurface(clusterPreview).geometry, 'a cluster carriageway constraint must change compiled complex geometry', ); +const baselineApproachRing = complexSurface(clusterPreview).geometry.coordinates[0]; +const widenedApproachRing = complexSurface(widenedClusterPreview).geometry.coordinates[0]; +assert.deepEqual( + [widenedApproachRing[0], widenedApproachRing[3]], + [baselineApproachRing[0], baselineApproachRing[3]], + 'a local width correction must preserve the source-road outer seam', +); +assert.notDeepEqual( + [widenedApproachRing[1], widenedApproachRing[2]], + [baselineApproachRing[1], baselineApproachRing[2]], + 'a local width correction must taper into the edited inner section', +); const complexCrossingHandle = clusterState.handles.handles.find((handle) => handle.kind === 'cluster-crossing-inset'); assert.ok(complexCrossingHandle, 'the complex fixture must publish grouped crossing handles'); const renderedComplexCrosswalk = clusterPreview.layers.crosswalks.features.find(