fix: complete complex carriageway edit data flow

This commit is contained in:
que01 committed 2026-09-10 12:18:52 +08:00
1 parent 655e7efaef
commit 7e4d77afbe
10 files changed
+89 -12

No files matched your search

+17
View File
@@ -429,6 +429,23 @@ assert.equal(
clusterWidthHandle.value.current + 0.5,
);
for (const [kind, value, resultKey] of [
['cluster-carriageway-position', { offsetMeters: 1 }, 'clusterPositions'],
['cluster-carriageway-direction', { offsetDegrees: 5 }, 'clusterDirections'],
['cluster-carriageway-edge-offset', { leftOffsetMeters: 0.4, rightOffsetMeters: -0.2 }, 'clusterEdgeOffsets'],
]) {
const result = resolveDirectEditConstraints(
junctionModel,
document([constraint({ kind, anchor: clusterWidthHandle.anchor, value })]),
{ junctionClusters: [{ id: 'cluster-1', nodeIds: ['junction'] }] },
);
assert.equal(result.constraintStates[0].applied, true, kind);
assert.deepEqual(
result[resultKey].get('cluster-1').get(clusterWidthHandle.anchor.carriagewayKey),
kind.endsWith('edge-offset') ? value : Object.values(value)[0],
);
assert.equal(result.clusterCutbacks.size, 0);
}
const recheckResolution = resolveDirectEditConstraints(
junctionModel,
{ ...document([anchored]), base: { compilerGeometryVersion: 'old-geometry' } },
@@ -147,6 +147,29 @@ const teeBoundaryGraph = buildJunctionBoundaryGraph(
tee.helpers,
);
const teeCore = buildCoreClosure(tee.topology, teeBoundaryGraph, point(0, 0));
for (const [field, value] of [
['positionOffsetMeters', 1],
['directionOffsetDegrees', 5],
['leftEdgeOffsetMeters', 0.5],
['rightEdgeOffsetMeters', 0.5],
]) {
const edited = structuredClone(tee.topology);
edited.carriageways[0].approach[field] = value;
const result = buildJunctionBoundaryGraph(
edited,
point(0, 0),
{ outerRadiusFor: () => 30, innerRadiusFor: () => 10 },
tee.helpers,
);
const before = teeBoundaryGraph.sections[0];
const after = result.sections[0];
assert.deepEqual(after.outer, before.outer, `${field} preserves external seam`);
assert.notDeepEqual(after.inner, before.inner, `${field} changes actual geometry`);
assert.equal(after.transitionStatus, 'supported');
if (field === 'leftEdgeOffsetMeters') assert.deepEqual(after.inner.right, before.inner.right);
if (field === 'rightEdgeOffsetMeters') assert.deepEqual(after.inner.left, before.inner.left);
assert.deepEqual(result.sections.slice(1), teeBoundaryGraph.sections.slice(1));
}
assert.equal(teeCore.status, 'supported');
assert.equal(teeCore.sharedEdgeRefs.length, teeBoundaryGraph.sections.length);
assert.ok(teeCore.ring.every((coordinate) => coordinate.every(Number.isFinite)));
+9
View File
@@ -70,6 +70,12 @@ function valueFor(kind) {
return { cutbackMeters: 4 };
case 'cluster-carriageway-transition-length':
return { transitionLengthMeters: 12 };
case 'cluster-carriageway-position':
return { offsetMeters: 1 };
case 'cluster-carriageway-direction':
return { offsetDegrees: 5 };
case 'cluster-carriageway-edge-offset':
return { leftOffsetMeters: 0.5, rightOffsetMeters: 0 };
case 'cluster-corner-radius':
return { radiusMeters: 6 };
case 'cluster-crossing-inset':
@@ -139,6 +145,9 @@ assert.deepEqual(CONSTRAINT_KINDS, [
'cluster-carriageway-width',
'cluster-carriageway-cutback',
'cluster-carriageway-transition-length',
'cluster-carriageway-position',
'cluster-carriageway-direction',
'cluster-carriageway-edge-offset',
'cluster-corner-radius',
'cluster-crossing-inset',
'cluster-stop-line-offset',