From 53a2cb3450453a689772e680ca6c76348fcc7b0e Mon Sep 17 00:00:00 2001 From: que01 Date: Tue, 8 Sep 2026 16:28:59 +0800 Subject: [PATCH] fix(junction): make complex corner radius responsive --- src/compile/complex-junction.js | 12 ++++--- test/e2e/workbench.spec.ts | 31 ++++++++++++++++--- workbench/client/src/App.tsx | 4 +++ .../client/src/components/ParameterPanel.tsx | 10 +++++- .../client/src/edit/preview-request.test.ts | 19 ++++++++++++ workbench/client/src/edit/preview-request.ts | 17 +++++++++- .../client/src/junction/JunctionWorkspace.tsx | 3 ++ workbench/client/src/styles.css | 18 +++++++++++ 8 files changed, 103 insertions(+), 11 deletions(-) diff --git a/src/compile/complex-junction.js b/src/compile/complex-junction.js index 7376204..91a0f24 100644 --- a/src/compile/complex-junction.js +++ b/src/compile/complex-junction.js @@ -457,11 +457,13 @@ function buildComplexJunctionGeometry(model, cluster, helpers) { continue; } // Tangent distance for a circle of `cornerRadius` inscribed in a wedge of - // opening `delta`, clamped so the tangent points stay on the built arms. - const tangentDistance = Math.min( - cornerRadius / Math.tan((delta * Math.PI) / 360), - Math.max(2, outerRadius - apexReach), - ); + // opening `delta`. + // Keep the radius control continuous. The previous handoff cap made a + // sizeable part of the advertised 1..25 m range geometry-inert: once the + // tangent distance hit the cap, pressing Enter only changed metadata. + // The solver's radius bounds and the generated arm envelope provide the + // validity boundary; this value must remain the direct geometric response. + const tangentDistance = cornerRadius / Math.tan((delta * Math.PI) / 360); const tangents = edges.map((edge) => helpers.offsetCoordinate(apex, edge.heading, tangentDistance)); const curve = quadraticCurve(tangents[0], apex, tangents[1], CORNER_FILLET_SEGMENTS); const ring = [...curve, center, curve[0]]; diff --git a/test/e2e/workbench.spec.ts b/test/e2e/workbench.spec.ts index 2bf1cbb..bffad7a 100644 --- a/test/e2e/workbench.spec.ts +++ b/test/e2e/workbench.spec.ts @@ -263,14 +263,37 @@ test.describe('workbench editing shell', () => { await expect(workspace.getByText(/车行道宽度/).first()).toBeVisible(); await expect(workspace.getByText(/车行道收口距离/).first()).toBeVisible(); await expect(workspace.getByText(/角部圆角/).first()).toBeVisible(); - const parameterInput = workspace.locator('.parameter-input').first(); + const cornerGroup = workspace.locator('.parameter-group').filter({ hasText: '角部圆角' }); + const parameterInput = cornerGroup.locator('.parameter-input').first(); const parameterValue = Number(await parameterInput.inputValue()); + const baselinePreview = await page.request + .post('/api/edit-preview', { data: { previewSeq: 0, document: scoped.document, selection: { cluster: id } } }) + .then((response) => response.json()); const previewRequest = page.waitForRequest( (request) => request.method() === 'POST' && request.url().endsWith('/api/edit-preview'), ); - await parameterInput.fill(String(parameterValue + 0.1)); - await previewRequest; - await expect(parameterInput).toHaveValue(String(parameterValue + 0.1)); + const previewResponse = page.waitForResponse( + (response) => response.request().method() === 'POST' && response.url().endsWith('/api/edit-preview'), + ); + await parameterInput.fill(String(parameterValue + 2)); + await parameterInput.press('Enter'); + const request = await previewRequest; + const response = await previewResponse; + const requestBody = request.postDataJSON() as { + constraints: Array<{ kind: string; value: { radiusMeters: number }; anchor: { cornerKey: string } }>; + }; + expect(requestBody.constraints).toHaveLength(structure.corners.length); + expect(requestBody.constraints.every((constraint) => constraint.kind === 'cluster-corner-radius')).toBe(true); + expect(requestBody.constraints.every((constraint) => constraint.value.radiusMeters === parameterValue + 2)).toBe( + true, + ); + const cornerKey = requestBody.constraints[0].anchor?.cornerKey; + const updatedPreview = await response.json(); + const cornerGeometry = (preview: { + layers: { roadSurface: { features: Array<{ properties: { corner_key?: string }; geometry: unknown }> } }; + }) => preview.layers.roadSurface.features.find((feature) => feature.properties.corner_key === cornerKey)?.geometry; + expect(cornerGeometry(updatedPreview)).not.toEqual(cornerGeometry(baselinePreview)); + await expect(parameterInput).toHaveValue(String(parameterValue + 2)); await page.reload(); await expect(armButtons).toHaveCount(structure.arms.length); await expect(armButtons.first()).toHaveAttribute('aria-pressed', 'false'); diff --git a/workbench/client/src/App.tsx b/workbench/client/src/App.tsx index 5142043..c6e0c57 100644 --- a/workbench/client/src/App.tsx +++ b/workbench/client/src/App.tsx @@ -99,6 +99,7 @@ function App() { const [scene, setScene] = useState(false); const [junctionHotspots, setJunctionHotspots] = useState(true); const [status, setStatus] = useState('正在加载工作台...'); + const [previewPending, setPreviewPending] = useState(false); const [filter, setFilter] = useState<'all' | 'candidates' | 'other'>('all'); const [marking, setMarking] = useState | null>(null); const [selectedObjectKey, setSelectedObjectKey] = useState(null); @@ -471,6 +472,7 @@ function App() { return new PreviewRequester({ session: owner, send: (request, signal) => api.editPreview({ ...request, selection: selectionRef.current }, signal), + onPendingChange: setPreviewPending, onSettled: (outcome, response) => { setEditDiagnostics(response.diagnostics); // The response carries a re-solved manifest. Keeping the stale one made the @@ -490,6 +492,7 @@ function App() { : 'area'; useEffect(() => { requester?.invalidate(); + setPreviewPending(false); // Preview geometry is scoped server output. Retaining it during an A -> B // transition would draw A while B's manifest is loading. setPreview(null); @@ -1340,6 +1343,7 @@ function App() { resetHandle(handle); setJunctionSession((current) => (current ? { ...current, status: 'draft', dirty: true } : current)); }} + previewPending={previewPending} roads={junctionRoads} junctionCoordinate={junctionDescriptor.coordinate} selectedFacility={element} diff --git a/workbench/client/src/components/ParameterPanel.tsx b/workbench/client/src/components/ParameterPanel.tsx index c55b2fa..d3ef748 100644 --- a/workbench/client/src/components/ParameterPanel.tsx +++ b/workbench/client/src/components/ParameterPanel.tsx @@ -233,12 +233,15 @@ export function ParameterPanel({ handles, hasSelection, grouped = false, + previewPending = false, ref, ...callbacks }: RowCallbacks & { handles: EditHandle[]; hasSelection: boolean; grouped?: boolean; + /** An authoritative preview is queued or being solved for the shown values. */ + previewPending?: boolean; ref?: Ref; }) { const nodes = useRef(new Map()); @@ -307,7 +310,12 @@ export function ParameterPanel({ return (
-

{grouped ? '路口参数' : '道路参数'}

+
+

{grouped ? '路口参数' : '道路参数'}

+ + 正在更新预览… + +
{handles.length ? ( grouped ? ( diff --git a/workbench/client/src/edit/preview-request.test.ts b/workbench/client/src/edit/preview-request.test.ts index fbf7d93..c35b0c4 100644 --- a/workbench/client/src/edit/preview-request.test.ts +++ b/workbench/client/src/edit/preview-request.test.ts @@ -78,6 +78,25 @@ describe('pointerup flush', () => { await vi.advanceTimersByTimeAsync(500); expect(send).toHaveBeenCalledTimes(1); }); + + it('reports pending from a queued draft until its request settles', async () => { + const { send, pending } = deferredTransport(); + const changes: boolean[] = []; + const requester = new PreviewRequester({ + session, + send, + onSettled, + onPendingChange: (value) => changes.push(value), + debounceMs: 1, + }); + requester.schedule({ constraints: [] }); + expect(changes).toEqual([true]); + await vi.advanceTimersByTimeAsync(1); + expect(pending).toHaveLength(1); + pending[0].resolve(preview(1)); + await vi.advanceTimersByTimeAsync(0); + expect(changes).toEqual([true, false]); + }); }); describe('cancellation', () => { diff --git a/workbench/client/src/edit/preview-request.ts b/workbench/client/src/edit/preview-request.ts index 0eab7f7..98ff724 100644 --- a/workbench/client/src/edit/preview-request.ts +++ b/workbench/client/src/edit/preview-request.ts @@ -24,6 +24,8 @@ export type PreviewDraft = Pick void; /** Called for every response the session accepted, stale ones excluded. */ onSettled: (outcome: PreviewOutcome, response: EditPreviewResponse) => void; /** Real failures only; an abort is expected and never reported. */ @@ -40,6 +42,7 @@ export class PreviewRequester { private inFlight: AbortController | null = null; /** Changes whenever the owning map/junction scope changes. */ private generation = 0; + private pending = false; private readonly debounceMs: number; constructor(private readonly options: PreviewRequesterOptions) { @@ -48,6 +51,7 @@ export class PreviewRequester { /** During a drag: coalesce to one request per debounce window. */ schedule(draft: PreviewDraft): void { + this.setPending(true); if (this.timer) clearTimeout(this.timer); this.timer = setTimeout(() => { this.timer = null; @@ -60,6 +64,7 @@ export class PreviewRequester { * meant, so it must not be dropped by a pending timer or lost to the debounce. */ flush(draft: PreviewDraft): void { + this.setPending(true); if (this.timer) { clearTimeout(this.timer); this.timer = null; @@ -75,6 +80,7 @@ export class PreviewRequester { } this.inFlight?.abort(); this.inFlight = null; + this.setPending(false); } /** @@ -106,7 +112,16 @@ export class PreviewRequester { } catch (error) { if (!isAbort(error)) this.options.onError?.(error); } finally { - if (this.inFlight === controller) this.inFlight = null; + if (this.inFlight === controller) { + this.inFlight = null; + if (!this.timer) this.setPending(false); + } } } + + private setPending(pending: boolean): void { + if (this.pending === pending) return; + this.pending = pending; + this.options.onPendingChange?.(pending); + } } diff --git a/workbench/client/src/junction/JunctionWorkspace.tsx b/workbench/client/src/junction/JunctionWorkspace.tsx index 279e732..0f77793 100644 --- a/workbench/client/src/junction/JunctionWorkspace.tsx +++ b/workbench/client/src/junction/JunctionWorkspace.tsx @@ -38,6 +38,7 @@ interface Props { onSettleGroup?: (handles: EditHandle[], value: number) => void; onAbandon?: () => void; onReset?: (handle: EditHandle) => void; + previewPending?: boolean; roads?: Road[]; junctionCoordinate?: Coordinate; selectedFacility?: ElementSelection | null; @@ -77,6 +78,7 @@ export function JunctionWorkspace({ onSettleGroup, onAbandon, onReset, + previewPending = false, roads = [], junctionCoordinate = descriptor.coordinate, selectedFacility, @@ -472,6 +474,7 @@ export function JunctionWorkspace({ handles={handles} hasSelection grouped + previewPending={previewPending} onDraft={onDraft ?? (() => undefined)} onDraftGroup={onDraftGroup} onSettle={onSettle ?? (() => undefined)} diff --git a/workbench/client/src/styles.css b/workbench/client/src/styles.css index 95bc3c7..edb9d8e 100644 --- a/workbench/client/src/styles.css +++ b/workbench/client/src/styles.css @@ -311,6 +311,24 @@ pre { .parameters { margin-bottom: 16px; } +.parameters-heading { + display: flex; + align-items: baseline; + justify-content: space-between; + gap: 8px; +} +.parameters-heading h1 { + margin: 0; +} +.parameters-pending { + min-width: 78px; + color: #286956; + font-size: 12px; + white-space: nowrap; +} +.parameters-pending.is-idle { + visibility: hidden; +} .parameters ul { display: grid; gap: 6px;