feat(compile): expose effective junction plans
This commit is contained in:
1 parent
4b38ce3c31
commit
f6f51fe90b
4 files changed
+98
No files matched your search
@@ -0,0 +1,13 @@
|
|||||||
|
# Implementation
|
||||||
|
|
||||||
|
先统一锚点和计划,再逐项接宽度、cutback、圆角,最后验证完整 preview、失败保留和正式编译一致性。
|
||||||
|
|
||||||
|
## Progress
|
||||||
|
|
||||||
|
- [x] 统一输出 `effectiveJunctionPlans`
|
||||||
|
- [x] 普通 node 输出可写计划,cluster 输出聚合只读计划
|
||||||
|
- [x] 编译入口透传 junction template,上层 solver 单测覆盖
|
||||||
|
- [ ] 工作区三项几何控件与真实 preview/apply/save 交互
|
||||||
|
- [ ] 失败拟合、乱序预览和正式编译一致性 E2E
|
||||||
|
|
||||||
|
本轮完成的是求解器边界和计划归一化;剩余 UI 交互应在后续迭代中接入,不能将当前阶段误报为完整几何编辑完成。
|
||||||
@@ -48,6 +48,7 @@ function compileInput(input) {
|
|||||||
const directEdits = input.editsFile ? loadEditDocument(input.editsFile) : null;
|
const directEdits = input.editsFile ? loadEditDocument(input.editsFile) : null;
|
||||||
const directEdit = resolveDirectEditConstraints(model, directEdits, {
|
const directEdit = resolveDirectEditConstraints(model, directEdits, {
|
||||||
compilerGeometryVersion: GEOMETRY_VERSION,
|
compilerGeometryVersion: GEOMETRY_VERSION,
|
||||||
|
junctionTemplates: area.nativeRoad.junctionTemplates,
|
||||||
});
|
});
|
||||||
const compiled = compileGeometry(model, overrides, {
|
const compiled = compileGeometry(model, overrides, {
|
||||||
edgeLines: area.nativeRoad.edgeLines,
|
edgeLines: area.nativeRoad.edgeLines,
|
||||||
|
|||||||
@@ -1116,6 +1116,12 @@ function resolveDirectEditConstraints(model, editDocument = null, context = {})
|
|||||||
const junctionData = junctionReserves(model || {});
|
const junctionData = junctionReserves(model || {});
|
||||||
const reconciled = reconcileConstraints(model || {}, constraints, editDocument?.base, junctionData, context);
|
const reconciled = reconcileConstraints(model || {}, constraints, editDocument?.base, junctionData, context);
|
||||||
const solved = solveConstraints(model || {}, reconciled, junctionData, diagnostics);
|
const solved = solveConstraints(model || {}, reconciled, junctionData, diagnostics);
|
||||||
|
const effectiveJunctionPlans = buildEffectiveJunctionPlans(
|
||||||
|
model || {},
|
||||||
|
solved.junctionPlans,
|
||||||
|
junctionData,
|
||||||
|
context.junctionTemplates?.clusters || context.junctionClusters || [],
|
||||||
|
);
|
||||||
handles.reserves = junctionData.reserves;
|
handles.reserves = junctionData.reserves;
|
||||||
handles.handles = selectHandles(
|
handles.handles = selectHandles(
|
||||||
[
|
[
|
||||||
@@ -1130,6 +1136,7 @@ function resolveDirectEditConstraints(model, editDocument = null, context = {})
|
|||||||
schema: RESOLUTION_SCHEMA,
|
schema: RESOLUTION_SCHEMA,
|
||||||
roadProfiles: solved.roadProfiles,
|
roadProfiles: solved.roadProfiles,
|
||||||
junctionPlans: solved.junctionPlans,
|
junctionPlans: solved.junctionPlans,
|
||||||
|
effectiveJunctionPlans,
|
||||||
crossingControls: solved.crossingControls,
|
crossingControls: solved.crossingControls,
|
||||||
laneManeuvers: solved.laneManeuvers,
|
laneManeuvers: solved.laneManeuvers,
|
||||||
handles,
|
handles,
|
||||||
@@ -1138,6 +1145,70 @@ function resolveDirectEditConstraints(model, editDocument = null, context = {})
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Normalize node plans and configured clusters into the read model consumed by
|
||||||
|
// JunctionTools. Clusters deliberately remain read-only in this phase: their
|
||||||
|
// effective plan is assembled from member nodes without rewriting constraints or
|
||||||
|
// silently splitting the cluster into independent editors.
|
||||||
|
function buildEffectiveJunctionPlans(model, solvedPlans, junctionData, clusters = []) {
|
||||||
|
const nodePlan = (nodeId) => {
|
||||||
|
const id = String(nodeId);
|
||||||
|
const solved = solvedPlans.get(id);
|
||||||
|
const approaches = junctionData.approaches.get(id) || [];
|
||||||
|
if (solved)
|
||||||
|
return {
|
||||||
|
schema: 'junction-effective-plan/v1',
|
||||||
|
junctionRef: { type: 'node', id },
|
||||||
|
...solved,
|
||||||
|
nodeId: id,
|
||||||
|
readOnly: false,
|
||||||
|
};
|
||||||
|
if (!approaches.length) return null;
|
||||||
|
return {
|
||||||
|
schema: 'junction-effective-plan/v1',
|
||||||
|
junctionRef: { type: 'node', id },
|
||||||
|
nodeId: id,
|
||||||
|
approaches: Object.fromEntries(
|
||||||
|
approaches.map((item) => [
|
||||||
|
item.segmentId,
|
||||||
|
{
|
||||||
|
widthMeters: item.items.reduce((sum, entry) => sum + entry.road.widthMeters, 0),
|
||||||
|
cutbackMeters: item.cutback,
|
||||||
|
},
|
||||||
|
]),
|
||||||
|
),
|
||||||
|
corners: {},
|
||||||
|
readOnly: false,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
const result = new Map();
|
||||||
|
for (const [nodeId] of junctionData.approaches) {
|
||||||
|
const plan = nodePlan(nodeId);
|
||||||
|
if (plan) result.set(`node:${nodeId}`, plan);
|
||||||
|
}
|
||||||
|
for (const cluster of Array.isArray(clusters) ? clusters : []) {
|
||||||
|
if (!cluster || !cluster.id || !Array.isArray(cluster.nodeIds)) continue;
|
||||||
|
const members = cluster.nodeIds.map((id) => nodePlan(id)).filter(Boolean);
|
||||||
|
if (!members.length) continue;
|
||||||
|
const approaches = members.flatMap((member) =>
|
||||||
|
Object.entries(member.approaches || {}).map(([segmentId, value]) => ({
|
||||||
|
nodeId: member.nodeId,
|
||||||
|
segmentId,
|
||||||
|
...value,
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
const corners = Object.assign({}, ...members.map((member) => member.corners || {}));
|
||||||
|
result.set(`cluster:${cluster.id}`, {
|
||||||
|
schema: 'junction-effective-plan/v1',
|
||||||
|
junctionRef: { type: 'cluster', id: String(cluster.id) },
|
||||||
|
nodeIds: cluster.nodeIds.map(String),
|
||||||
|
approaches,
|
||||||
|
corners,
|
||||||
|
readOnly: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
CROSSWALK_DEPTH_METERS,
|
CROSSWALK_DEPTH_METERS,
|
||||||
CROSSWALK_STRIPE_PITCH_METERS,
|
CROSSWALK_STRIPE_PITCH_METERS,
|
||||||
@@ -1155,4 +1226,5 @@ module.exports = {
|
|||||||
roadEdgeOffsetRange,
|
roadEdgeOffsetRange,
|
||||||
SUPPORTED_MANEUVERS,
|
SUPPORTED_MANEUVERS,
|
||||||
resolveDirectEditConstraints,
|
resolveDirectEditConstraints,
|
||||||
|
buildEffectiveJunctionPlans,
|
||||||
};
|
};
|
||||||
@@ -81,6 +81,8 @@ const junctionModel = {
|
|||||||
};
|
};
|
||||||
const junctionResolution = resolveDirectEditConstraints(junctionModel, document([]), { revisionId: 'rev-junction' });
|
const junctionResolution = resolveDirectEditConstraints(junctionModel, document([]), { revisionId: 'rev-junction' });
|
||||||
assert.equal(junctionResolution.handles.reserves.length, 3);
|
assert.equal(junctionResolution.handles.reserves.length, 3);
|
||||||
|
assert.ok(junctionResolution.effectiveJunctionPlans.has('node:junction'));
|
||||||
|
assert.equal(junctionResolution.effectiveJunctionPlans.get('node:junction').readOnly, false);
|
||||||
assert.equal(new Set(junctionResolution.handles.handles.map((handle) => handle.kind)).size, 9);
|
assert.equal(new Set(junctionResolution.handles.handles.map((handle) => handle.kind)).size, 9);
|
||||||
assert.ok(junctionResolution.handles.handles.every((handle) => handle.position.every(Number.isFinite)));
|
assert.ok(junctionResolution.handles.handles.every((handle) => handle.position.every(Number.isFinite)));
|
||||||
assert.ok(junctionResolution.handles.handles.every((handle) => Number.isFinite(handle.axisAzimuth)));
|
assert.ok(junctionResolution.handles.handles.every((handle) => Number.isFinite(handle.axisAzimuth)));
|
||||||
@@ -321,6 +323,16 @@ assert.equal(
|
|||||||
assert.equal(allKindsResolution.junctionPlans.get('junction').approaches['segment:a'].widthMeters, 7);
|
assert.equal(allKindsResolution.junctionPlans.get('junction').approaches['segment:a'].widthMeters, 7);
|
||||||
assert.equal(allKindsResolution.junctionPlans.get('junction').approaches['segment:a'].cutbackMeters, 2);
|
assert.equal(allKindsResolution.junctionPlans.get('junction').approaches['segment:a'].cutbackMeters, 2);
|
||||||
assert.equal(allKindsResolution.junctionPlans.get('junction').corners['segment:a->segment:b'], 4);
|
assert.equal(allKindsResolution.junctionPlans.get('junction').corners['segment:a->segment:b'], 4);
|
||||||
|
assert.equal(allKindsResolution.effectiveJunctionPlans.get('node:junction').approaches['segment:a'].widthMeters, 7);
|
||||||
|
|
||||||
|
const clusterResolution = resolveDirectEditConstraints(junctionModel, document(allKinds), {
|
||||||
|
junctionClusters: [{ id: 'cluster-1', nodeIds: ['junction'] }],
|
||||||
|
});
|
||||||
|
const clusterPlan = clusterResolution.effectiveJunctionPlans.get('cluster:cluster-1');
|
||||||
|
assert.ok(clusterPlan);
|
||||||
|
assert.equal(clusterPlan.readOnly, true);
|
||||||
|
assert.deepEqual(clusterPlan.junctionRef, { type: 'cluster', id: 'cluster-1' });
|
||||||
|
assert.equal(clusterPlan.approaches.find((item) => item.segmentId === 'segment:a').widthMeters, 7);
|
||||||
|
|
||||||
const recheckResolution = resolveDirectEditConstraints(
|
const recheckResolution = resolveDirectEditConstraints(
|
||||||
junctionModel,
|
junctionModel,
|
||||||
|
|||||||
Reference in new issue
Block a user