feat: support complex carriageway direction edits

This commit is contained in:
que01 committed 2026-09-10 10:44:43 +08:00
1 parent 88b7e17f4d
commit 3e74732190
3 files changed
+24 -3

No files matched your search

+15 -2
View File
@@ -28,6 +28,7 @@ const SOLVED_KINDS = new Set([
'cluster-carriageway-cutback', 'cluster-carriageway-cutback',
'cluster-carriageway-transition-length', 'cluster-carriageway-transition-length',
'cluster-carriageway-position', 'cluster-carriageway-position',
'cluster-carriageway-direction',
'cluster-corner-radius', 'cluster-corner-radius',
'cluster-crossing-inset', 'cluster-crossing-inset',
'cluster-stop-line-offset', 'cluster-stop-line-offset',
@@ -47,6 +48,7 @@ const KINDS = [
'cluster-carriageway-cutback', 'cluster-carriageway-cutback',
'cluster-carriageway-transition-length', 'cluster-carriageway-transition-length',
'cluster-carriageway-position', 'cluster-carriageway-position',
'cluster-carriageway-direction',
'cluster-corner-radius', 'cluster-corner-radius',
'cluster-crossing-inset', 'cluster-crossing-inset',
'cluster-stop-line-offset', 'cluster-stop-line-offset',
@@ -870,6 +872,7 @@ function solveConstraints(model, constraints, junctionData, diagnostics, cluster
const clusterCutbacks = new Map(); const clusterCutbacks = new Map();
const clusterTransitions = new Map(); const clusterTransitions = new Map();
const clusterPositions = new Map(); const clusterPositions = new Map();
const clusterDirections = new Map();
const clusterCorners = new Map(); const clusterCorners = new Map();
const clusterCrossings = new Map(); const clusterCrossings = new Map();
const clusterItems = clusterCarriageways(model, junctionData, clusters); const clusterItems = clusterCarriageways(model, junctionData, clusters);
@@ -906,6 +909,7 @@ function solveConstraints(model, constraints, junctionData, diagnostics, cluster
const cutbackSnapshot = new Map([...clusterCutbacks].map(([key, value]) => [key, new Map(value)])); const cutbackSnapshot = new Map([...clusterCutbacks].map(([key, value]) => [key, new Map(value)]));
const transitionSnapshot = new Map([...clusterTransitions].map(([key, value]) => [key, new Map(value)])); const transitionSnapshot = new Map([...clusterTransitions].map(([key, value]) => [key, new Map(value)]));
const positionSnapshot = new Map([...clusterPositions].map(([key, value]) => [key, new Map(value)])); const positionSnapshot = new Map([...clusterPositions].map(([key, value]) => [key, new Map(value)]));
const directionSnapshot = new Map([...clusterDirections].map(([key, value]) => [key, new Map(value)]));
const cornerSnapshot = new Map([...clusterCorners].map(([key, value]) => [key, new Map(value)])); const cornerSnapshot = new Map([...clusterCorners].map(([key, value]) => [key, new Map(value)]));
const crossingClusterSnapshot = new Map([...clusterCrossings].map(([key, value]) => [key, new Map(value)])); const crossingClusterSnapshot = new Map([...clusterCrossings].map(([key, value]) => [key, new Map(value)]));
const junctionSnapshot = new Map( const junctionSnapshot = new Map(
@@ -923,7 +927,8 @@ function solveConstraints(model, constraints, junctionData, diagnostics, cluster
constraint.kind === 'cluster-carriageway-width' || constraint.kind === 'cluster-carriageway-width' ||
constraint.kind === 'cluster-carriageway-cutback' || constraint.kind === 'cluster-carriageway-cutback' ||
constraint.kind === 'cluster-carriageway-transition-length' || constraint.kind === 'cluster-carriageway-transition-length' ||
constraint.kind === 'cluster-carriageway-position' constraint.kind === 'cluster-carriageway-position' ||
constraint.kind === 'cluster-carriageway-direction'
) { ) {
const item = clusterItems const item = clusterItems
.get(String(constraint.anchor?.clusterId)) .get(String(constraint.anchor?.clusterId))
@@ -935,6 +940,8 @@ function solveConstraints(model, constraints, junctionData, diagnostics, cluster
? constraint.value?.transitionLengthMeters ? constraint.value?.transitionLengthMeters
: constraint.kind === 'cluster-carriageway-position' : constraint.kind === 'cluster-carriageway-position'
? constraint.value?.offsetMeters ? constraint.value?.offsetMeters
: constraint.kind === 'cluster-carriageway-direction'
? constraint.value?.offsetDegrees
: constraint.value?.cutbackMeters, : constraint.value?.cutbackMeters,
); );
const cluster = clusters.find((candidate) => String(candidate.id) === String(item?.clusterId)); const cluster = clusters.find((candidate) => String(candidate.id) === String(item?.clusterId));
@@ -951,7 +958,8 @@ function solveConstraints(model, constraints, junctionData, diagnostics, cluster
(constraint.kind === 'cluster-carriageway-cutback' && (value < 1 || value > cutbackMax)) || (constraint.kind === 'cluster-carriageway-cutback' && (value < 1 || value > cutbackMax)) ||
(constraint.kind === 'cluster-carriageway-transition-length' && (constraint.kind === 'cluster-carriageway-transition-length' &&
(value < transitionBounds(model, cluster, item, constraints).min || value > transitionMax)) || (value < transitionBounds(model, cluster, item, constraints).min || value > transitionMax)) ||
(constraint.kind === 'cluster-carriageway-position' && (value < -20 || value > 20)) (constraint.kind === 'cluster-carriageway-position' && (value < -20 || value > 20)) ||
(constraint.kind === 'cluster-carriageway-direction' && (value < -15 || value > 15))
) { ) {
blocking( blocking(
diagnostics, diagnostics,
@@ -968,6 +976,8 @@ function solveConstraints(model, constraints, junctionData, diagnostics, cluster
? clusterTransitions ? clusterTransitions
: constraint.kind === 'cluster-carriageway-position' : constraint.kind === 'cluster-carriageway-position'
? clusterPositions ? clusterPositions
: constraint.kind === 'cluster-carriageway-direction'
? clusterDirections
: clusterCutbacks; : clusterCutbacks;
if (!target.has(item.clusterId)) target.set(item.clusterId, new Map()); if (!target.has(item.clusterId)) target.set(item.clusterId, new Map());
target.get(item.clusterId).set(item.key, value); target.get(item.clusterId).set(item.key, value);
@@ -1052,6 +1062,8 @@ function solveConstraints(model, constraints, junctionData, diagnostics, cluster
for (const [key, value] of transitionSnapshot) clusterTransitions.set(key, value); for (const [key, value] of transitionSnapshot) clusterTransitions.set(key, value);
clusterPositions.clear(); clusterPositions.clear();
for (const [key, value] of positionSnapshot) clusterPositions.set(key, value); for (const [key, value] of positionSnapshot) clusterPositions.set(key, value);
clusterDirections.clear();
for (const [key, value] of directionSnapshot) clusterDirections.set(key, value);
clusterCorners.clear(); clusterCorners.clear();
for (const [key, value] of cornerSnapshot) clusterCorners.set(key, value); for (const [key, value] of cornerSnapshot) clusterCorners.set(key, value);
clusterCrossings.clear(); clusterCrossings.clear();
@@ -1068,6 +1080,7 @@ function solveConstraints(model, constraints, junctionData, diagnostics, cluster
clusterCutbacks, clusterCutbacks,
clusterTransitions, clusterTransitions,
clusterPositions, clusterPositions,
clusterDirections,
clusterCorners, clusterCorners,
clusterCrossings, clusterCrossings,
states, states,
+4
View File
@@ -17,6 +17,7 @@ const CONSTRAINT_ANCHORS = {
'cluster-carriageway-cutback': 'cluster-carriageway', 'cluster-carriageway-cutback': 'cluster-carriageway',
'cluster-carriageway-transition-length': 'cluster-carriageway', 'cluster-carriageway-transition-length': 'cluster-carriageway',
'cluster-carriageway-position': 'cluster-carriageway', 'cluster-carriageway-position': 'cluster-carriageway',
'cluster-carriageway-direction': 'cluster-carriageway',
'cluster-corner-radius': 'cluster-corner', 'cluster-corner-radius': 'cluster-corner',
'cluster-crossing-inset': 'cluster-crossing', 'cluster-crossing-inset': 'cluster-crossing',
'cluster-stop-line-offset': 'cluster-crossing', 'cluster-stop-line-offset': 'cluster-crossing',
@@ -185,6 +186,9 @@ function validateValue(scope, kind, value) {
fail(scope, 'value.transitionLengthMeters', 'must be a non-negative number of meters'); fail(scope, 'value.transitionLengthMeters', 'must be a non-negative number of meters');
} else if (kind === 'cluster-carriageway-position') { } else if (kind === 'cluster-carriageway-position') {
if (!isFiniteNumber(value.offsetMeters)) fail(scope, 'value.offsetMeters', 'must be a finite number of meters'); if (!isFiniteNumber(value.offsetMeters)) fail(scope, 'value.offsetMeters', 'must be a finite number of meters');
} else if (kind === 'cluster-carriageway-direction') {
if (!isFiniteNumber(value.offsetDegrees) || value.offsetDegrees < -15 || value.offsetDegrees > 15)
fail(scope, 'value.offsetDegrees', 'must be between -15 and 15 degrees');
} else if (kind === 'junction-corner-radius' || kind === 'cluster-corner-radius') { } else if (kind === 'junction-corner-radius' || kind === 'cluster-corner-radius') {
if (!isFiniteNumber(value.radiusMeters) || value.radiusMeters < 0) if (!isFiniteNumber(value.radiusMeters) || value.radiusMeters < 0)
fail(scope, 'value.radiusMeters', 'must be a non-negative number of meters'); fail(scope, 'value.radiusMeters', 'must be a non-negative number of meters');
+5 -1
View File
@@ -1016,7 +1016,8 @@ function applyDirectClusterPlans(model, junctionPlans, directEdit, clusters) {
!directEdit?.clusterPlans?.size && !directEdit?.clusterPlans?.size &&
!directEdit?.clusterCutbacks?.size && !directEdit?.clusterCutbacks?.size &&
!directEdit?.clusterTransitions?.size && !directEdit?.clusterTransitions?.size &&
!directEdit?.clusterPositions?.size !directEdit?.clusterPositions?.size &&
!directEdit?.clusterDirections?.size
) )
return; return;
const clusterIds = new Set([ const clusterIds = new Set([
@@ -1024,6 +1025,7 @@ function applyDirectClusterPlans(model, junctionPlans, directEdit, clusters) {
...(directEdit.clusterCutbacks || new Map()).keys(), ...(directEdit.clusterCutbacks || new Map()).keys(),
...(directEdit.clusterTransitions || new Map()).keys(), ...(directEdit.clusterTransitions || new Map()).keys(),
...(directEdit.clusterPositions || new Map()).keys(), ...(directEdit.clusterPositions || new Map()).keys(),
...(directEdit.clusterDirections || new Map()).keys(),
]); ]);
for (const clusterId of clusterIds) { for (const clusterId of clusterIds) {
const widths = directEdit.clusterPlans?.get(clusterId) || new Map(); const widths = directEdit.clusterPlans?.get(clusterId) || new Map();
@@ -1051,6 +1053,8 @@ function applyDirectClusterPlans(model, junctionPlans, directEdit, clusters) {
if (Number.isFinite(transition)) item.approach.transitionLengthMeters = transition; if (Number.isFinite(transition)) item.approach.transitionLengthMeters = transition;
const position = directEdit.clusterPositions?.get(clusterId)?.get(item.key); const position = directEdit.clusterPositions?.get(clusterId)?.get(item.key);
if (Number.isFinite(position)) item.approach.positionOffsetMeters = position; if (Number.isFinite(position)) item.approach.positionOffsetMeters = position;
const direction = directEdit.clusterDirections?.get(clusterId)?.get(item.key);
if (Number.isFinite(direction)) item.heading += direction;
} }
} }
} }