fix(junction): keep complex carriageways connected
This commit is contained in:
1 parent
53a2cb3450
commit
855400fba2
3 files changed
+77
-6
No files matched your search
@@ -14,6 +14,7 @@ const {
|
|||||||
connectionConnectorId,
|
connectionConnectorId,
|
||||||
} = require('./native-ids');
|
} = require('./native-ids');
|
||||||
const { topologyIdentity } = require('./junction-topology');
|
const { topologyIdentity } = require('./junction-topology');
|
||||||
|
const { complexJunctionMetrics } = require('./complex-junction');
|
||||||
|
|
||||||
const RESOLUTION_SCHEMA = 'road-edit-resolution/v1';
|
const RESOLUTION_SCHEMA = 'road-edit-resolution/v1';
|
||||||
const HANDLE_MANIFEST_SCHEMA = 'road-edit-handles/v1';
|
const HANDLE_MANIFEST_SCHEMA = 'road-edit-handles/v1';
|
||||||
@@ -300,6 +301,13 @@ function numericValue(constraint, key, fallback) {
|
|||||||
return Number.isFinite(value) ? value : fallback;
|
return Number.isFinite(value) ? value : fallback;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function clusterCutbackMaximum(cluster, approachLength) {
|
||||||
|
const metrics = complexJunctionMetrics(cluster);
|
||||||
|
// The carriageway's outer edge may retreat only to the core safety envelope.
|
||||||
|
// The other cap preserves a usable part of a short source approach.
|
||||||
|
return Math.min(approachLength * 0.45, Math.max(1, metrics.approachOuterRadius - (metrics.coreRadius + 4)));
|
||||||
|
}
|
||||||
|
|
||||||
function roadGroups(model) {
|
function roadGroups(model) {
|
||||||
const groups = new Map();
|
const groups = new Map();
|
||||||
for (const road of Array.isArray(model?.roads) ? model.roads : []) {
|
for (const road of Array.isArray(model?.roads) ? model.roads : []) {
|
||||||
@@ -841,6 +849,8 @@ function solveConstraints(model, constraints, junctionData, diagnostics, cluster
|
|||||||
? constraint.value?.widthMeters
|
? constraint.value?.widthMeters
|
||||||
: constraint.value?.cutbackMeters,
|
: constraint.value?.cutbackMeters,
|
||||||
);
|
);
|
||||||
|
const cluster = clusters.find((candidate) => String(candidate.id) === String(item?.clusterId));
|
||||||
|
const cutbackMax = cluster ? clusterCutbackMaximum(cluster, item?.approach.length || 0) : 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;
|
||||||
@@ -849,7 +859,7 @@ 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 > item.approach.length * 0.45))
|
(constraint.kind === 'cluster-carriageway-cutback' && (value < 1 || value > cutbackMax))
|
||||||
) {
|
) {
|
||||||
blocking(
|
blocking(
|
||||||
diagnostics,
|
diagnostics,
|
||||||
@@ -1355,6 +1365,8 @@ function makeJunctionHandles(model, junctionData, constraints) {
|
|||||||
function makeClusterCarriagewayHandles(model, junctionData, constraints, clusters) {
|
function makeClusterCarriagewayHandles(model, junctionData, constraints, clusters) {
|
||||||
const handles = [];
|
const handles = [];
|
||||||
for (const [clusterId, items] of clusterCarriageways(model, junctionData, clusters)) {
|
for (const [clusterId, items] of clusterCarriageways(model, junctionData, clusters)) {
|
||||||
|
const cluster = clusters.find((item) => String(item.id) === String(clusterId));
|
||||||
|
if (!cluster) continue;
|
||||||
for (const item of items) {
|
for (const item of items) {
|
||||||
const road = item.roads[0];
|
const road = item.roads[0];
|
||||||
const line = item.approach.endpoint.side === 'start' ? road.centerline : [...road.centerline].reverse();
|
const line = item.approach.endpoint.side === 'start' ? road.centerline : [...road.centerline].reverse();
|
||||||
@@ -1408,7 +1420,7 @@ function makeClusterCarriagewayHandles(model, junctionData, constraints, cluster
|
|||||||
value: {
|
value: {
|
||||||
current: numericValue(cutbackConstraint, 'cutbackMeters', item.approach.cutback),
|
current: numericValue(cutbackConstraint, 'cutbackMeters', item.approach.cutback),
|
||||||
min: 1,
|
min: 1,
|
||||||
max: item.approach.length * 0.45,
|
max: clusterCutbackMaximum(cluster, item.approach.length),
|
||||||
unit: 'meter',
|
unit: 'meter',
|
||||||
},
|
},
|
||||||
...(cutbackConstraint ? { constraintId: cutbackConstraint.id } : {}),
|
...(cutbackConstraint ? { constraintId: cutbackConstraint.id } : {}),
|
||||||
|
|||||||
@@ -653,6 +653,10 @@ function compileGeometry(model, overrides = { overrides: [] }, options = {}) {
|
|||||||
const generatedComplexSidewalks = [];
|
const generatedComplexSidewalks = [];
|
||||||
const generatedComplexCrosswalks = [];
|
const generatedComplexCrosswalks = [];
|
||||||
const generatedComplexStopLines = [];
|
const generatedComplexStopLines = [];
|
||||||
|
// The external road and its complex-junction carriageway must end at the
|
||||||
|
// same radial boundary. A fixed outer radius here while the carriageway used
|
||||||
|
// its per-arm cutback left a visible asphalt gap between the two surfaces.
|
||||||
|
const complexApproachBoundaries = complexApproachBoundaryRadii(model, activeClusters, junctionPlans);
|
||||||
for (const road of model.roads) {
|
for (const road of model.roads) {
|
||||||
const segmentKey = road.segmentId;
|
const segmentKey = road.segmentId;
|
||||||
if (emittedSegments.has(segmentKey)) continue;
|
if (emittedSegments.has(segmentKey)) continue;
|
||||||
@@ -689,6 +693,7 @@ function compileGeometry(model, overrides = { overrides: [] }, options = {}) {
|
|||||||
junctionPlans,
|
junctionPlans,
|
||||||
cluster,
|
cluster,
|
||||||
complexClusterCenters.get(cluster.id),
|
complexClusterCenters.get(cluster.id),
|
||||||
|
complexApproachBoundaries.get(cluster.id)?.get(road.id),
|
||||||
)
|
)
|
||||||
: trimLineAtJunctions(road.centerline, road.sourceNodeIds, junctionPlans);
|
: trimLineAtJunctions(road.centerline, road.sourceNodeIds, junctionPlans);
|
||||||
const ring = roadRing(line, totalWidth);
|
const ring = roadRing(line, totalWidth);
|
||||||
@@ -3193,20 +3198,44 @@ function trimLineAtJunctions(line, sourceNodeIds, junctionPlans) {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
function trimLineAtComplexCluster(line, sourceNodeIds, junctionPlans, cluster, center) {
|
function trimLineAtComplexCluster(line, sourceNodeIds, junctionPlans, cluster, center, boundaryRadius) {
|
||||||
if (!center || line.length < 2) return trimLineAtJunctions(line, sourceNodeIds, junctionPlans);
|
if (!center || line.length < 2) return trimLineAtJunctions(line, sourceNodeIds, junctionPlans);
|
||||||
const boundaryRadius = complexJunctionMetrics(cluster).approachOuterRadius;
|
const radius = Number.isFinite(boundaryRadius) ? boundaryRadius : complexJunctionMetrics(cluster).approachOuterRadius;
|
||||||
const startInCluster = cluster.nodeIds.map(String).includes(String(sourceNodeIds[0]));
|
const startInCluster = cluster.nodeIds.map(String).includes(String(sourceNodeIds[0]));
|
||||||
const endInCluster = cluster.nodeIds.map(String).includes(String(sourceNodeIds.at(-1)));
|
const endInCluster = cluster.nodeIds.map(String).includes(String(sourceNodeIds.at(-1)));
|
||||||
const available = lineLengthMeters(line);
|
const available = lineLengthMeters(line);
|
||||||
const startDistance = startInCluster ? distanceAlongLineToRadius(line, center, boundaryRadius) : 0;
|
const startDistance = startInCluster ? distanceAlongLineToRadius(line, center, radius) : 0;
|
||||||
const endDistance = endInCluster ? distanceAlongLineToRadius([...line].reverse(), center, boundaryRadius) : 0;
|
const endDistance = endInCluster ? distanceAlongLineToRadius([...line].reverse(), center, radius) : 0;
|
||||||
const startCutback = startDistance > 0 && available > startDistance + 1 ? startDistance : 0;
|
const startCutback = startDistance > 0 && available > startDistance + 1 ? startDistance : 0;
|
||||||
const endCutback = endDistance > 0 && available > endDistance + 1 ? endDistance : 0;
|
const endCutback = endDistance > 0 && available > endDistance + 1 ? endDistance : 0;
|
||||||
if (!startCutback && !endCutback) return line;
|
if (!startCutback && !endCutback) return line;
|
||||||
return trimLineRange(line, startCutback, endCutback);
|
return trimLineRange(line, startCutback, endCutback);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function complexApproachBoundaryRadii(model, clusters, junctionPlans) {
|
||||||
|
const result = new Map();
|
||||||
|
for (const cluster of clusters) {
|
||||||
|
if (cluster.template !== 'complex-junction-v1') continue;
|
||||||
|
const outerRadius = complexJunctionMetrics(cluster).approachOuterRadius;
|
||||||
|
const topology = resolveComplexJunctionTopology(model, cluster, {
|
||||||
|
junctionPlans,
|
||||||
|
distanceMeters,
|
||||||
|
lineLengthMeters,
|
||||||
|
headingAtEndpoint,
|
||||||
|
});
|
||||||
|
const radii = new Map();
|
||||||
|
for (const item of topology.carriageways) {
|
||||||
|
const radius = Math.max(
|
||||||
|
complexJunctionMetrics(cluster).coreRadius + 4,
|
||||||
|
outerRadius - Math.max(0, item.approach.cutback || 0),
|
||||||
|
);
|
||||||
|
for (const roadId of item.approach.roadIds) radii.set(roadId, radius);
|
||||||
|
}
|
||||||
|
result.set(cluster.id, radii);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
function distanceAlongLineToRadius(line, center, radius) {
|
function distanceAlongLineToRadius(line, center, radius) {
|
||||||
if (!center || line.length < 2) return 0;
|
if (!center || line.length < 2) return 0;
|
||||||
const heading = headingAtEndpoint(line);
|
const heading = headingAtEndpoint(line);
|
||||||
|
|||||||
@@ -366,6 +366,36 @@ const clusterWidthHandle = clusterHandleResolution.handles.handles.find(
|
|||||||
(handle) => handle.kind === 'cluster-carriageway-width',
|
(handle) => handle.kind === 'cluster-carriageway-width',
|
||||||
);
|
);
|
||||||
assert.ok(clusterWidthHandle, 'a cluster selection publishes only its external carriageway widths');
|
assert.ok(clusterWidthHandle, 'a cluster selection publishes only its external carriageway widths');
|
||||||
|
const clusterCutbackHandle = clusterHandleResolution.handles.handles.find(
|
||||||
|
(handle) => handle.kind === 'cluster-carriageway-cutback',
|
||||||
|
);
|
||||||
|
assert.ok(clusterCutbackHandle, 'a cluster selection publishes its carriageway cutback handles');
|
||||||
|
const cutbackAtLimit = resolveDirectEditConstraints(
|
||||||
|
junctionModel,
|
||||||
|
document([
|
||||||
|
constraint({
|
||||||
|
id: 'cluster-carriageway-cutback',
|
||||||
|
kind: 'cluster-carriageway-cutback',
|
||||||
|
anchor: clusterCutbackHandle.anchor,
|
||||||
|
value: { cutbackMeters: clusterCutbackHandle.value.max },
|
||||||
|
}),
|
||||||
|
]),
|
||||||
|
{ junctionClusters: [{ id: 'cluster-1', nodeIds: ['junction'] }] },
|
||||||
|
);
|
||||||
|
assert.equal(cutbackAtLimit.constraintStates[0].applied, true);
|
||||||
|
const cutbackPastLimit = resolveDirectEditConstraints(
|
||||||
|
junctionModel,
|
||||||
|
document([
|
||||||
|
constraint({
|
||||||
|
id: 'cluster-carriageway-cutback-invalid',
|
||||||
|
kind: 'cluster-carriageway-cutback',
|
||||||
|
anchor: clusterCutbackHandle.anchor,
|
||||||
|
value: { cutbackMeters: clusterCutbackHandle.value.max + 0.1 },
|
||||||
|
}),
|
||||||
|
]),
|
||||||
|
{ junctionClusters: [{ id: 'cluster-1', nodeIds: ['junction'] }] },
|
||||||
|
);
|
||||||
|
assert.equal(cutbackPastLimit.constraintStates[0].applied, false);
|
||||||
const widenedCluster = resolveDirectEditConstraints(
|
const widenedCluster = resolveDirectEditConstraints(
|
||||||
junctionModel,
|
junctionModel,
|
||||||
document([
|
document([
|
||||||
|
|||||||
Reference in new issue
Block a user