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;
}
}
}