From 44fa82299bac5cd4f82b3482724987d17d2ff1f6 Mon Sep 17 00:00:00 2001 From: que01 Date: Thu, 10 Sep 2026 15:33:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=9D=E5=AD=98=E8=BD=A6=E8=A1=8C?= =?UTF-8?q?=E9=81=93=E5=B7=A6=E5=8F=B3=E8=BE=B9=E7=95=8C=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/compile/direct-edit-solver.js | 23 ++++++++---- test/direct-edit-solver.js | 37 +++++++++++++++++++ .../client/src/components/ParameterPanel.tsx | 8 +++- 3 files changed, 59 insertions(+), 9 deletions(-) diff --git a/src/compile/direct-edit-solver.js b/src/compile/direct-edit-solver.js index 1ab0eba..37bfa7d 100644 --- a/src/compile/direct-edit-solver.js +++ b/src/compile/direct-edit-solver.js @@ -1005,7 +1005,11 @@ function solveConstraints(model, constraints, junctionData, diagnostics, cluster ? clusterEdgeOffsets : clusterCutbacks; if (!target.has(item.clusterId)) target.set(item.clusterId, new Map()); - target.get(item.clusterId).set(item.key, value); + if (constraint.kind === 'cluster-carriageway-edge-offset' && constraint.anchor.side) { + const previous = target.get(item.clusterId).get(item.key) || { leftOffsetMeters: 0, rightOffsetMeters: 0 }; + const field = `${constraint.anchor.side}OffsetMeters`; + target.get(item.clusterId).set(item.key, { ...previous, [field]: value[field] }); + } else target.get(item.clusterId).set(item.key, value); applied = true; } } else if (constraint.kind === 'cluster-corner-radius') { @@ -1621,12 +1625,17 @@ function makeClusterCarriagewayHandles(model, junctionData, constraints, cluster editable: true, }); } - const edgeConstraint = constraintFor(constraints, 'cluster-carriageway-edge-offset', { - clusterId, - carriagewayKey: item.key, - }); - const edgeValue = edgeConstraint?.value || {}; for (const side of ['left', 'right']) { + const candidates = constraints.filter( + (edit) => + edit.enabled !== false && + edit.kind === 'cluster-carriageway-edge-offset' && + edit.anchor.clusterId === clusterId && + edit.anchor.carriagewayKey === item.key && + (!edit.anchor.side || edit.anchor.side === side), + ); + const edgeConstraint = candidates.at(-1); + const edgeValue = edgeConstraint?.value || {}; handles.push({ handleId: `handle:cluster-carriageway-edge-offset:${side}:${item.key}`, kind: 'cluster-carriageway-edge-offset', @@ -1641,7 +1650,7 @@ function makeClusterCarriagewayHandles(model, junctionData, constraints, cluster position: point, axisAzimuth: (tangentAzimuth(line, station) + (side === 'left' ? 270 : 90)) % 360, value: { current: Number(edgeValue[`${side}OffsetMeters`]) || 0, min: -10, max: 10, unit: 'meter' }, - ...(edgeConstraint ? { constraintId: edgeConstraint.id } : {}), + ...(edgeConstraint?.anchor.side === side ? { constraintId: edgeConstraint.id } : {}), affects: [`complex-junction:${clusterId}:carriageway:${item.approach.segmentId}`], editable: true, }); diff --git a/test/direct-edit-solver.js b/test/direct-edit-solver.js index e023178..a59eb92 100644 --- a/test/direct-edit-solver.js +++ b/test/direct-edit-solver.js @@ -446,6 +446,43 @@ for (const [kind, value, resultKey] of [ ); assert.equal(result.clusterCutbacks.size, 0); } +for (const sides of [ + ['left', 'right'], + ['right', 'left'], +]) { + const result = resolveDirectEditConstraints( + junctionModel, + document( + sides.map((side) => + constraint({ + id: `edge-${side}`, + kind: 'cluster-carriageway-edge-offset', + anchor: { ...clusterWidthHandle.anchor, side }, + value: + side === 'left' + ? { leftOffsetMeters: 0.4, rightOffsetMeters: 0 } + : { leftOffsetMeters: 0, rightOffsetMeters: 0.7 }, + }), + ), + ), + { junctionClusters: [{ id: 'cluster-1', nodeIds: ['junction'] }] }, + ); + assert.ok(result.constraintStates.every((state) => state.applied)); + assert.deepEqual(result.clusterEdgeOffsets.get('cluster-1').get(clusterWidthHandle.anchor.carriagewayKey), { + leftOffsetMeters: 0.4, + rightOffsetMeters: 0.7, + }); + for (const side of sides) { + const handle = result.handles.handles.find( + (handle) => + handle.kind === 'cluster-carriageway-edge-offset' && + handle.anchor.carriagewayKey === clusterWidthHandle.anchor.carriagewayKey && + handle.anchor.side === side, + ); + assert.equal(handle.constraintId, `edge-${side}`); + assert.equal(handle.value.current, side === 'left' ? 0.4 : 0.7); + } +} const recheckResolution = resolveDirectEditConstraints( junctionModel, { ...document([anchored]), base: { compilerGeometryVersion: 'old-geometry' } }, diff --git a/workbench/client/src/components/ParameterPanel.tsx b/workbench/client/src/components/ParameterPanel.tsx index c4f3486..26d16e5 100644 --- a/workbench/client/src/components/ParameterPanel.tsx +++ b/workbench/client/src/components/ParameterPanel.tsx @@ -303,9 +303,13 @@ export function ParameterPanel({ const groupedHandles = new Map(); for (const handle of handles) { - const list = groupedHandles.get(handle.kind) ?? []; + const group = + handle.kind === 'cluster-carriageway-edge-offset' && handle.anchor.type === 'cluster-carriageway' + ? `${handle.kind}:${handle.anchor.side}` + : handle.kind; + const list = groupedHandles.get(group) ?? []; list.push(handle); - groupedHandles.set(handle.kind, list); + groupedHandles.set(group, list); } return (