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

+7 -1
View File
@@ -484,7 +484,10 @@ function reconcileConstraints(model, constraints, base, junctionData, context) {
}
if (
constraint.kind === 'cluster-carriageway-width' ||
constraint.kind === 'cluster-carriageway-transition-length'
constraint.kind === 'cluster-carriageway-transition-length' ||
constraint.kind === 'cluster-carriageway-position' ||
constraint.kind === 'cluster-carriageway-direction' ||
constraint.kind === 'cluster-carriageway-edge-offset'
) {
const item = clusterItems
.get(String(constraint.anchor.clusterId))
@@ -1768,6 +1771,9 @@ function resolveDirectEditConstraints(model, editDocument = null, context = {})
clusterPlans: solved.clusterPlans,
clusterCutbacks: solved.clusterCutbacks,
clusterTransitions: solved.clusterTransitions,
clusterPositions: solved.clusterPositions,
clusterDirections: solved.clusterDirections,
clusterEdgeOffsets: solved.clusterEdgeOffsets,
clusterCorners: solved.clusterCorners,
clusterCrossings: solved.clusterCrossings,
laneManeuvers: solved.laneManeuvers,
+12 -7
View File
@@ -45,7 +45,7 @@ function sectionAt(item, radius, center, widthMeters, helpers, explicitStation,
Math.min(item.length, explicitStation ?? stationAtDistanceFrom(item.approach.line, center, radius, helpers)),
);
const point = pointAtStation(item.approach.line, station, helpers);
const tangent = tangentAtStation(item.approach.line, station, helpers);
const tangent = tangentAtStation(item.approach.line, station, helpers) + (Number(edgeOffsets?.direction) || 0);
const halfWidth = Math.max(0, Number(widthMeters) || 0) / 2;
const leftOffset = Number(edgeOffsets?.left) || 0;
const rightOffset = Number(edgeOffsets?.right) || 0;
@@ -72,16 +72,22 @@ function buildJunctionBoundaryGraph(topology, center, radii, helpers, exclusionR
const requestedTransition = Number.isFinite(item.approach.transitionLengthMeters)
? Math.max(0, item.approach.transitionLengthMeters)
: null;
const edgeOffsets = { left: item.approach.leftEdgeOffsetMeters, right: item.approach.rightEdgeOffsetMeters };
const edgeOffsets = {
left: item.approach.leftEdgeOffsetMeters,
right: item.approach.rightEdgeOffsetMeters,
direction: item.approach.directionOffsetDegrees,
};
const baseInnerStation =
requestedTransition === null
? stationAtDistanceFrom(item.approach.line, center, innerRadius, helpers)
: outer.stationMeters - requestedTransition;
const inner = sectionAt(
item,
innerRadius,
center,
innerWidthMeters,
helpers,
(requestedTransition === null ? undefined : outer.stationMeters - requestedTransition) === undefined
? undefined
: outer.stationMeters - requestedTransition + positionOffset,
baseInnerStation + positionOffset,
edgeOffsets,
);
const key = `boundary:${item.key}`;
@@ -100,8 +106,7 @@ function buildJunctionBoundaryGraph(topology, center, radii, helpers, exclusionR
innerWidthMeters,
transitionMeters: Math.max(0, outer.stationMeters - inner.stationMeters),
transitionStatus:
requestedTransition !== null &&
Math.abs(requestedTransition - Math.max(0, outer.stationMeters - inner.stationMeters)) > 1e-6
Math.abs(baseInnerStation + positionOffset - inner.stationMeters) > 1e-6
? 'insufficient-source-length'
: outer.stationMeters - inner.stationMeters > 1e-6
? 'supported'
+3 -3
View File
@@ -1017,7 +1017,8 @@ function applyDirectClusterPlans(model, junctionPlans, directEdit, clusters) {
!directEdit?.clusterCutbacks?.size &&
!directEdit?.clusterTransitions?.size &&
!directEdit?.clusterPositions?.size &&
!directEdit?.clusterDirections?.size
!directEdit?.clusterDirections?.size &&
!directEdit?.clusterEdgeOffsets?.size
)
return;
const clusterIds = new Set([
@@ -1055,12 +1056,11 @@ function applyDirectClusterPlans(model, junctionPlans, directEdit, clusters) {
const position = directEdit.clusterPositions?.get(clusterId)?.get(item.key);
if (Number.isFinite(position)) item.approach.positionOffsetMeters = position;
const direction = directEdit.clusterDirections?.get(clusterId)?.get(item.key);
if (Number.isFinite(direction)) item.heading += direction;
if (Number.isFinite(direction)) item.approach.directionOffsetDegrees = direction;
const edges = directEdit.clusterEdgeOffsets?.get(clusterId)?.get(item.key);
if (edges && Number.isFinite(edges.leftOffsetMeters) && Number.isFinite(edges.rightOffsetMeters)) {
item.approach.leftEdgeOffsetMeters = edges.leftOffsetMeters;
item.approach.rightEdgeOffsetMeters = edges.rightOffsetMeters;
item.approach.widthMeters += edges.leftOffsetMeters + edges.rightOffsetMeters;
}
}
}
+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',
+3
View File
@@ -270,6 +270,9 @@ function App() {
(handle.kind === 'cluster-carriageway-width' ||
handle.kind === 'cluster-carriageway-cutback' ||
handle.kind === 'cluster-carriageway-transition-length' ||
handle.kind === 'cluster-carriageway-position' ||
handle.kind === 'cluster-carriageway-direction' ||
handle.kind === 'cluster-carriageway-edge-offset' ||
handle.kind === 'cluster-corner-radius' ||
handle.kind === 'cluster-crossing-inset' ||
handle.kind === 'cluster-stop-line-offset') &&
+3
View File
@@ -116,6 +116,9 @@ const KIND_LABELS: Record<ConstraintKind, string> = {
'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': '停止线偏移',
+6
View File
@@ -108,6 +108,12 @@ export function constraintValueFor(
return { cutbackMeters: Math.max(0, scalar) };
case 'cluster-carriageway-transition-length':
return { transitionLengthMeters: Math.max(0, scalar) };
case 'cluster-carriageway-position':
return { offsetMeters: scalar };
case 'cluster-carriageway-direction':
return { offsetDegrees: scalar };
case 'cluster-carriageway-edge-offset':
return { leftOffsetMeters: scalar, rightOffsetMeters: 0 };
case 'cluster-corner-radius':
return { radiusMeters: Math.max(0, scalar) };
case 'junction-cutback':
+6 -1
View File
@@ -34,6 +34,9 @@ export const JUNCTION_KINDS = [
'cluster-carriageway-width',
'cluster-carriageway-cutback',
'cluster-carriageway-transition-length',
'cluster-carriageway-position',
'cluster-carriageway-direction',
'cluster-carriageway-edge-offset',
'cluster-corner-radius',
'junction-cutback',
'junction-corner-radius',
@@ -129,7 +132,9 @@ export type ConstraintValue =
| { cutbackMeters: number }
| { transitionLengthMeters: number }
| { radiusMeters: number }
| { insetMeters: number };
| { insetMeters: number }
| { offsetDegrees: number }
| { leftOffsetMeters: number; rightOffsetMeters: number };
export interface LaneManeuverValue {
maneuver: string;
placementDistanceMeters: number;