feat(junction): validate transition length constraints
This commit is contained in:
1 parent
95c49722d4
commit
413b3d9b89
3 files changed
+24
-3
No files matched your search
@@ -26,6 +26,7 @@ const SOLVED_KINDS = new Set([
|
|||||||
'junction-approach-width',
|
'junction-approach-width',
|
||||||
'cluster-carriageway-width',
|
'cluster-carriageway-width',
|
||||||
'cluster-carriageway-cutback',
|
'cluster-carriageway-cutback',
|
||||||
|
'cluster-carriageway-transition-length',
|
||||||
'cluster-corner-radius',
|
'cluster-corner-radius',
|
||||||
'cluster-crossing-inset',
|
'cluster-crossing-inset',
|
||||||
'cluster-stop-line-offset',
|
'cluster-stop-line-offset',
|
||||||
@@ -43,6 +44,7 @@ const KINDS = [
|
|||||||
'junction-approach-width',
|
'junction-approach-width',
|
||||||
'cluster-carriageway-width',
|
'cluster-carriageway-width',
|
||||||
'cluster-carriageway-cutback',
|
'cluster-carriageway-cutback',
|
||||||
|
'cluster-carriageway-transition-length',
|
||||||
'cluster-corner-radius',
|
'cluster-corner-radius',
|
||||||
'cluster-crossing-inset',
|
'cluster-crossing-inset',
|
||||||
'cluster-stop-line-offset',
|
'cluster-stop-line-offset',
|
||||||
@@ -884,17 +886,25 @@ function solveConstraints(model, constraints, junctionData, diagnostics, cluster
|
|||||||
]),
|
]),
|
||||||
);
|
);
|
||||||
let applied;
|
let applied;
|
||||||
if (constraint.kind === 'cluster-carriageway-width' || constraint.kind === 'cluster-carriageway-cutback') {
|
if (
|
||||||
|
constraint.kind === 'cluster-carriageway-width' ||
|
||||||
|
constraint.kind === 'cluster-carriageway-cutback' ||
|
||||||
|
constraint.kind === 'cluster-carriageway-transition-length'
|
||||||
|
) {
|
||||||
const item = clusterItems
|
const item = clusterItems
|
||||||
.get(String(constraint.anchor?.clusterId))
|
.get(String(constraint.anchor?.clusterId))
|
||||||
?.find((candidate) => candidate.key === constraint.anchor?.carriagewayKey);
|
?.find((candidate) => candidate.key === constraint.anchor?.carriagewayKey);
|
||||||
const value = Number(
|
const value = Number(
|
||||||
constraint.kind === 'cluster-carriageway-width'
|
constraint.kind === 'cluster-carriageway-width'
|
||||||
? constraint.value?.widthMeters
|
? constraint.value?.widthMeters
|
||||||
|
: constraint.kind === 'cluster-carriageway-transition-length'
|
||||||
|
? constraint.value?.transitionLengthMeters
|
||||||
: 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));
|
||||||
const cutbackMax = cluster ? clusterCutbackMaximum(cluster, item?.approach.length || 0) : 0;
|
const cutbackMax = cluster ? clusterCutbackMaximum(cluster, item?.approach.length || 0) : 0;
|
||||||
|
const metrics = cluster ? complexJunctionMetrics(cluster) : null;
|
||||||
|
const transitionMax = metrics ? metrics.approachOuterRadius - metrics.approachInnerRadius : 0;
|
||||||
if (!item) {
|
if (!item) {
|
||||||
blocking(diagnostics, constraint, 'direct-edit-cluster-carriageway-missing', '复杂路口车行道锚点不存在。');
|
blocking(diagnostics, constraint, 'direct-edit-cluster-carriageway-missing', '复杂路口车行道锚点不存在。');
|
||||||
applied = false;
|
applied = false;
|
||||||
@@ -903,7 +913,9 @@ function solveConstraints(model, constraints, junctionData, diagnostics, cluster
|
|||||||
(constraint.kind === 'cluster-carriageway-width' &&
|
(constraint.kind === 'cluster-carriageway-width' &&
|
||||||
(value < Math.max(MIN_LANE_WIDTH_METERS, item.laneCount * MIN_LANE_WIDTH_METERS) ||
|
(value < Math.max(MIN_LANE_WIDTH_METERS, item.laneCount * MIN_LANE_WIDTH_METERS) ||
|
||||||
value > item.widthMeters * 2)) ||
|
value > item.widthMeters * 2)) ||
|
||||||
(constraint.kind === 'cluster-carriageway-cutback' && (value < 1 || value > cutbackMax))
|
(constraint.kind === 'cluster-carriageway-cutback' && (value < 1 || value > cutbackMax)) ||
|
||||||
|
(constraint.kind === 'cluster-carriageway-transition-length' &&
|
||||||
|
(value < (metrics?.minimumTransitionMeters || 0) || value > transitionMax))
|
||||||
) {
|
) {
|
||||||
blocking(
|
blocking(
|
||||||
diagnostics,
|
diagnostics,
|
||||||
@@ -915,7 +927,9 @@ function solveConstraints(model, constraints, junctionData, diagnostics, cluster
|
|||||||
} else {
|
} else {
|
||||||
const target = constraint.kind === 'cluster-carriageway-width' ? clusterPlans : clusterCutbacks;
|
const target = constraint.kind === 'cluster-carriageway-width' ? clusterPlans : 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);
|
const derivedCutback =
|
||||||
|
constraint.kind === 'cluster-carriageway-transition-length' ? Math.max(0, transitionMax - value) : value;
|
||||||
|
target.get(item.clusterId).set(item.key, derivedCutback);
|
||||||
applied = true;
|
applied = true;
|
||||||
}
|
}
|
||||||
} else if (constraint.kind === 'cluster-corner-radius') {
|
} else if (constraint.kind === 'cluster-corner-radius') {
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ const CONSTRAINT_ANCHORS = {
|
|||||||
'junction-approach-width': 'junction-approach',
|
'junction-approach-width': 'junction-approach',
|
||||||
'cluster-carriageway-width': 'cluster-carriageway',
|
'cluster-carriageway-width': 'cluster-carriageway',
|
||||||
'cluster-carriageway-cutback': 'cluster-carriageway',
|
'cluster-carriageway-cutback': 'cluster-carriageway',
|
||||||
|
'cluster-carriageway-transition-length': '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',
|
||||||
@@ -178,6 +179,9 @@ function validateValue(scope, kind, value) {
|
|||||||
} else if (kind === 'junction-cutback' || kind === 'cluster-carriageway-cutback') {
|
} else if (kind === 'junction-cutback' || kind === 'cluster-carriageway-cutback') {
|
||||||
if (!isFiniteNumber(value.cutbackMeters) || value.cutbackMeters < 0)
|
if (!isFiniteNumber(value.cutbackMeters) || value.cutbackMeters < 0)
|
||||||
fail(scope, 'value.cutbackMeters', 'must be a non-negative number of meters');
|
fail(scope, 'value.cutbackMeters', 'must be a non-negative number of meters');
|
||||||
|
} else if (kind === 'cluster-carriageway-transition-length') {
|
||||||
|
if (!isFiniteNumber(value.transitionLengthMeters) || value.transitionLengthMeters < 0)
|
||||||
|
fail(scope, 'value.transitionLengthMeters', 'must be a non-negative number of meters');
|
||||||
} 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');
|
||||||
|
|||||||
@@ -68,6 +68,8 @@ function valueFor(kind) {
|
|||||||
return { widthMeters: 12.5 };
|
return { widthMeters: 12.5 };
|
||||||
case 'cluster-carriageway-cutback':
|
case 'cluster-carriageway-cutback':
|
||||||
return { cutbackMeters: 4 };
|
return { cutbackMeters: 4 };
|
||||||
|
case 'cluster-carriageway-transition-length':
|
||||||
|
return { transitionLengthMeters: 12 };
|
||||||
case 'cluster-corner-radius':
|
case 'cluster-corner-radius':
|
||||||
return { radiusMeters: 6 };
|
return { radiusMeters: 6 };
|
||||||
case 'cluster-crossing-inset':
|
case 'cluster-crossing-inset':
|
||||||
@@ -136,6 +138,7 @@ assert.deepEqual(CONSTRAINT_KINDS, [
|
|||||||
'junction-approach-width',
|
'junction-approach-width',
|
||||||
'cluster-carriageway-width',
|
'cluster-carriageway-width',
|
||||||
'cluster-carriageway-cutback',
|
'cluster-carriageway-cutback',
|
||||||
|
'cluster-carriageway-transition-length',
|
||||||
'cluster-corner-radius',
|
'cluster-corner-radius',
|
||||||
'cluster-crossing-inset',
|
'cluster-crossing-inset',
|
||||||
'cluster-stop-line-offset',
|
'cluster-stop-line-offset',
|
||||||
|
|||||||
Reference in new issue
Block a user