feat: complete complex junction transition editing
This commit is contained in:
1 parent
801d8be980
commit
79f83412e6
18 files changed
+400
-59
No files matched your search
@@ -775,3 +775,61 @@ assert.equal(
|
||||
);
|
||||
|
||||
console.log('direct edit solver tests passed');
|
||||
|
||||
const transitionHandle = clusterHandleResolution.handles.handles.find(
|
||||
(handle) => handle.kind === 'cluster-carriageway-transition-length',
|
||||
);
|
||||
assert.ok(transitionHandle);
|
||||
assert.ok(
|
||||
transitionHandle.value.current >= transitionHandle.value.min &&
|
||||
transitionHandle.value.current <= transitionHandle.value.max,
|
||||
);
|
||||
const transitionConstraint = constraint({
|
||||
id: 'transition-complete',
|
||||
kind: 'cluster-carriageway-transition-length',
|
||||
anchor: transitionHandle.anchor,
|
||||
value: { transitionLengthMeters: (transitionHandle.value.min + transitionHandle.value.max) / 2 },
|
||||
});
|
||||
const resolveTransition = (value) =>
|
||||
resolveDirectEditConstraints(junctionModel, document([value]), {
|
||||
junctionClusters: [{ id: 'cluster-1', nodeIds: ['junction'] }],
|
||||
});
|
||||
const appliedTransition = resolveTransition(transitionConstraint);
|
||||
assert.equal(appliedTransition.constraintStates[0].applied, true);
|
||||
assert.equal(
|
||||
appliedTransition.clusterTransitions.get('cluster-1').get(transitionHandle.anchor.carriagewayKey),
|
||||
transitionConstraint.value.transitionLengthMeters,
|
||||
);
|
||||
assert.equal(
|
||||
appliedTransition.clusterCutbacks.size,
|
||||
0,
|
||||
'transition length must not move the outer seam through cutback',
|
||||
);
|
||||
assert.equal(
|
||||
resolveTransition({ ...transitionConstraint, value: { transitionLengthMeters: transitionHandle.value.max + 1 } })
|
||||
.constraintStates[0].applied,
|
||||
false,
|
||||
);
|
||||
assert.equal(
|
||||
resolveTransition({ ...transitionConstraint, anchor: { ...transitionConstraint.anchor, sourceRoadIds: ['missing'] } })
|
||||
.constraintStates[0].applied,
|
||||
false,
|
||||
);
|
||||
assert.equal(resolveTransition({ ...transitionConstraint, enabled: false }).clusterTransitions.size, 0);
|
||||
|
||||
const rejectedCutback = constraint({
|
||||
id: 'transition-invalid-cutback',
|
||||
kind: 'cluster-carriageway-cutback',
|
||||
anchor: transitionHandle.anchor,
|
||||
value: { cutbackMeters: 999 },
|
||||
});
|
||||
const mixedTransition = resolveDirectEditConstraints(junctionModel, document([rejectedCutback, transitionConstraint]), {
|
||||
junctionClusters: [{ id: 'cluster-1', nodeIds: ['junction'] }],
|
||||
});
|
||||
assert.equal(mixedTransition.constraintStates[0].applied, false);
|
||||
assert.equal(mixedTransition.constraintStates[1].applied, true);
|
||||
assert.equal(
|
||||
mixedTransition.handles.handles.find((handle) => handle.handleId === transitionHandle.handleId).value.max,
|
||||
transitionHandle.value.max,
|
||||
'a rejected cutback must not move transition bounds away from the effective outer seam',
|
||||
);
|
||||
@@ -199,6 +199,7 @@ test.describe('workbench editing shell', () => {
|
||||
});
|
||||
|
||||
test('keeps complex junction structure and map selection linked across reload', async ({ page }) => {
|
||||
test.setTimeout(60_000);
|
||||
const initial = await page.request.get('/api/state').then((response) => response.json());
|
||||
const candidate = initial.debug.junctionCandidates.find((item: { nodeIds: string[] }) => item.nodeIds.length >= 3);
|
||||
expect(candidate).toBeTruthy();
|
||||
@@ -251,6 +252,7 @@ test.describe('workbench editing shell', () => {
|
||||
[
|
||||
'cluster-carriageway-width',
|
||||
'cluster-carriageway-cutback',
|
||||
'cluster-carriageway-transition-length',
|
||||
'cluster-corner-radius',
|
||||
'cluster-crossing-inset',
|
||||
'cluster-stop-line-offset',
|
||||
@@ -297,6 +299,58 @@ test.describe('workbench editing shell', () => {
|
||||
await page.reload();
|
||||
await expect(armButtons).toHaveCount(structure.arms.length);
|
||||
await expect(armButtons.first()).toHaveAttribute('aria-pressed', 'false');
|
||||
const transitionGroup = workspace.locator('.parameter-group').filter({ hasText: '车行道过渡长度' });
|
||||
await expect(transitionGroup).toBeVisible();
|
||||
const expandTransition = transitionGroup.getByRole('button', { name: '展开单独定制' });
|
||||
if (await expandTransition.count()) await expandTransition.click();
|
||||
const transitionHandle = scoped.handles.handles.find(
|
||||
(handle: { kind: string; value: { min: number; max: number } }) =>
|
||||
handle.kind === 'cluster-carriageway-transition-length' && handle.value.max - handle.value.min > 1,
|
||||
);
|
||||
expect(transitionHandle).toBeTruthy();
|
||||
const transitionInput = transitionGroup.locator(`[data-handle-id="${transitionHandle.handleId}"] .parameter-input`);
|
||||
const originalTransitionValue = await transitionInput.inputValue();
|
||||
const transitionValue = Math.round(((transitionHandle.value.min + transitionHandle.value.max) / 2) * 100) / 100;
|
||||
|
||||
const transitionResponse = page.waitForResponse(
|
||||
(response) =>
|
||||
response.request().method() === 'POST' &&
|
||||
response.url().endsWith('/api/edit-preview') &&
|
||||
response
|
||||
.request()
|
||||
.postDataJSON()
|
||||
?.constraints?.some(
|
||||
(constraint: { kind: string }) => constraint.kind === 'cluster-carriageway-transition-length',
|
||||
),
|
||||
);
|
||||
await transitionInput.fill(String(transitionValue));
|
||||
await transitionInput.press('Enter');
|
||||
const transitionResult = await (await transitionResponse).json();
|
||||
expect(transitionResult.constraintStates.length).toBeGreaterThan(0);
|
||||
expect(transitionResult.constraintStates.every((state: { applied: boolean }) => state.applied)).toBe(true);
|
||||
await expect(transitionInput).toHaveValue(String(transitionValue));
|
||||
await page.getByRole('button', { name: '撤销', exact: true }).click();
|
||||
await expect(transitionInput).toHaveValue(originalTransitionValue);
|
||||
await expect(page.getByRole('button', { name: '重做', exact: true })).toBeEnabled();
|
||||
await page.getByRole('button', { name: '重做', exact: true }).click();
|
||||
await expect(transitionInput).toHaveValue(String(transitionValue));
|
||||
await page
|
||||
.getByRole('region', { name: '路口编辑工作区' })
|
||||
.getByRole('button', { name: '保存', exact: true })
|
||||
.click();
|
||||
await expect(page.getByRole('status')).toHaveText('已保存并重新生成', { timeout: 30_000 });
|
||||
await page.reload();
|
||||
await expect(transitionGroup).toBeVisible();
|
||||
if (await expandTransition.count()) await expandTransition.click();
|
||||
await expect(transitionInput).toHaveValue(String(transitionValue));
|
||||
|
||||
const transitionRow = transitionGroup.locator(`[data-handle-id="${transitionHandle.handleId}"]`);
|
||||
await transitionRow.getByRole('button', { name: '重置', exact: true }).click();
|
||||
await expect(transitionInput).toHaveValue(originalTransitionValue);
|
||||
await workspace.getByRole('button', { name: '放弃草稿', exact: true }).click();
|
||||
await expect(transitionInput).toHaveValue(String(transitionValue));
|
||||
await expect(workspace.getByRole('button', { name: '保存', exact: true })).toBeDisabled();
|
||||
|
||||
const refreshed = await page.request.get('/api/state').then((response) => response.json());
|
||||
expect(refreshed.junctionStructures[`cluster:${id}`].arms.map((arm: { key: string }) => arm.key)).toEqual(
|
||||
structure.arms.map((arm: { key: string }) => arm.key),
|
||||
|
||||
@@ -586,3 +586,26 @@ assert.equal(transitionLengthForCutback(transitionMetrics, 5), 19);
|
||||
assert.equal(transitionLengthForCutback(transitionMetrics, 100), 0);
|
||||
assert.equal(transitionLengthForCutback(transitionMetrics, 0, 6), 6);
|
||||
assert.equal(transitionLengthForCutback(transitionMetrics, 0, 0), 0);
|
||||
|
||||
const curvedTransition = topology('curved-transition', [
|
||||
{ widthMeters: 4, line: [point(0, 0), point(0, 15), point(15, 30), point(15, 50)] },
|
||||
{ widthMeters: 4, line: [point(0, 0), point(50, 0)] },
|
||||
{ widthMeters: 4, line: [point(0, 0), point(-50, 0)] },
|
||||
]);
|
||||
const curvedRadii = { outerRadiusFor: () => 35, innerRadiusFor: () => 10 };
|
||||
const originalCurvedGraph = buildJunctionBoundaryGraph(
|
||||
curvedTransition.topology,
|
||||
point(0, 0),
|
||||
curvedRadii,
|
||||
curvedTransition.helpers,
|
||||
);
|
||||
curvedTransition.topology.carriageways[0].approach.transitionLengthMeters = 16;
|
||||
const editedCurvedGraph = buildJunctionBoundaryGraph(
|
||||
curvedTransition.topology,
|
||||
point(0, 0),
|
||||
curvedRadii,
|
||||
curvedTransition.helpers,
|
||||
);
|
||||
assert.deepEqual(editedCurvedGraph.sections[0].outer, originalCurvedGraph.sections[0].outer);
|
||||
assert.ok(Math.abs(editedCurvedGraph.sections[0].transitionMeters - 16) < 1e-9);
|
||||
assert.notDeepEqual(editedCurvedGraph.sections[0].inner, originalCurvedGraph.sections[0].inner);
|
||||
@@ -261,6 +261,7 @@ assert.ok(
|
||||
[
|
||||
'cluster-carriageway-width',
|
||||
'cluster-carriageway-cutback',
|
||||
'cluster-carriageway-transition-length',
|
||||
'cluster-corner-radius',
|
||||
'cluster-crossing-inset',
|
||||
'cluster-stop-line-offset',
|
||||
@@ -365,6 +366,48 @@ assert.notDeepEqual(
|
||||
stopLineForCarriageway(clusterPreview).geometry,
|
||||
'a local width correction must update its final stop-line geometry',
|
||||
);
|
||||
const transitionHandle = clusterState.handles.handles.find(
|
||||
(handle) =>
|
||||
handle.kind === 'cluster-carriageway-transition-length' &&
|
||||
handle.anchor.carriagewayKey === complexWidthHandle.anchor.carriagewayKey,
|
||||
);
|
||||
assert.ok(transitionHandle);
|
||||
const transitionConstraint = {
|
||||
...complexWidthConstraint,
|
||||
kind: 'cluster-carriageway-transition-length',
|
||||
value: { transitionLengthMeters: transitionHandle.value.max - 1 },
|
||||
};
|
||||
const transitionPreview = editPreview(complexArea, {
|
||||
document: {
|
||||
...emptyDocument,
|
||||
constraints: [transitionConstraint],
|
||||
operations: [
|
||||
{
|
||||
id: 'operation:complex-width',
|
||||
createdAt: '2026-09-08T00:00:00.000Z',
|
||||
constraintIds: [transitionConstraint.id],
|
||||
},
|
||||
],
|
||||
},
|
||||
selection: { cluster: cluster.id },
|
||||
});
|
||||
assert.equal(transitionPreview.constraintStates[0].applied, true);
|
||||
const transitionedRing = complexSurface(transitionPreview).geometry.coordinates[0];
|
||||
assert.deepEqual(
|
||||
[transitionedRing[0], transitionedRing[3]],
|
||||
[baselineApproachRing[0], baselineApproachRing[3]],
|
||||
'transition edit must preserve the outer seam',
|
||||
);
|
||||
assert.ok(
|
||||
Math.abs(
|
||||
complexSurface(transitionPreview).properties.transition_length_m -
|
||||
transitionConstraint.value.transitionLengthMeters,
|
||||
) <= 0.1,
|
||||
'compiled transition length must match the requested meters',
|
||||
);
|
||||
|
||||
assert.notDeepEqual(complexSurface(transitionPreview).geometry, complexSurface(clusterPreview).geometry);
|
||||
|
||||
const complexCrossingHandle = clusterState.handles.handles.find((handle) => handle.kind === 'cluster-crossing-inset');
|
||||
assert.ok(complexCrossingHandle, 'the complex fixture must publish grouped crossing handles');
|
||||
const renderedComplexCrosswalk = clusterPreview.layers.crosswalks.features.find(
|
||||
@@ -519,5 +562,21 @@ for (const tracked of complexTracked) {
|
||||
assert.equal(fs.statSync(tracked.file).mtimeMs, tracked.mtimeMs);
|
||||
}
|
||||
|
||||
const transitionSaved = saveEdits(complexArea, {
|
||||
expectedDocumentVersion: emptyDocument.documentVersion,
|
||||
constraints: [transitionConstraint],
|
||||
operations: [
|
||||
{ id: 'operation:complex-width', createdAt: '2026-09-08T00:00:00.000Z', constraintIds: [transitionConstraint.id] },
|
||||
],
|
||||
});
|
||||
assert.ok(transitionSaved.documentVersion > emptyDocument.documentVersion);
|
||||
const transitionReloaded = editState(complexArea, selectionFrom({ cluster: cluster.id }));
|
||||
const replayedTransition = editPreview(complexArea, {
|
||||
document: transitionReloaded.document,
|
||||
selection: { cluster: cluster.id },
|
||||
});
|
||||
assert.equal(replayedTransition.constraintStates[0].applied, true);
|
||||
assert.deepEqual(complexSurface(replayedTransition).geometry, complexSurface(transitionPreview).geometry);
|
||||
|
||||
fs.rmSync(workspace, { recursive: true, force: true });
|
||||
console.log('workbench edit API tests passed');
|
||||
Reference in new issue
Block a user