fix: apply complex carriageway edge offsets

This commit is contained in:
que01 committed 2026-09-10 11:17:15 +08:00
1 parent 38dc9d6f52
commit 936354fec8
2 files changed
+18 -7

No files matched your search

+11 -4
View File
@@ -938,7 +938,7 @@ function solveConstraints(model, constraints, junctionData, diagnostics, cluster
const item = clusterItems
.get(String(constraint.anchor?.clusterId))
?.find((candidate) => candidate.key === constraint.anchor?.carriagewayKey);
const value = Number(
const rawValue =
constraint.kind === 'cluster-carriageway-width'
? constraint.value?.widthMeters
: constraint.kind === 'cluster-carriageway-transition-length'
@@ -949,8 +949,8 @@ function solveConstraints(model, constraints, junctionData, diagnostics, cluster
? constraint.value?.offsetDegrees
: constraint.kind === 'cluster-carriageway-edge-offset'
? constraint.value
: constraint.value?.cutbackMeters,
);
: constraint.value?.cutbackMeters;
const value = constraint.kind === 'cluster-carriageway-edge-offset' ? rawValue : Number(rawValue);
const cluster = clusters.find((candidate) => String(candidate.id) === String(item?.clusterId));
const cutbackMax = cluster ? clusterCutbackMaximum(cluster, item?.approach.length || 0) : 0;
const transitionMax = item && cluster ? transitionBounds(model, cluster, item, constraints).max : 0;
@@ -958,7 +958,14 @@ function solveConstraints(model, constraints, junctionData, diagnostics, cluster
blocking(diagnostics, constraint, 'direct-edit-cluster-carriageway-missing', '复杂路口车行道锚点不存在。');
applied = false;
} else if (
!Number.isFinite(value) ||
(constraint.kind !== 'cluster-carriageway-edge-offset' && !Number.isFinite(value)) ||
(constraint.kind === 'cluster-carriageway-edge-offset' &&
(!Number.isFinite(value.leftOffsetMeters) ||
!Number.isFinite(value.rightOffsetMeters) ||
value.leftOffsetMeters < -10 ||
value.leftOffsetMeters > 10 ||
value.rightOffsetMeters < -10 ||
value.rightOffsetMeters > 10)) ||
(constraint.kind === 'cluster-carriageway-width' &&
(value < Math.max(MIN_LANE_WIDTH_METERS, item.laneCount * MIN_LANE_WIDTH_METERS) ||
value > item.widthMeters * 2)) ||