fix(workbench): preview staged lane arrow overrides

This commit is contained in:
que01 committed 2026-09-01 14:46:22 +08:00
1 parent 0318876e6a
commit fe73d993a9
3 files changed
+49 -5

No files matched your search

+41 -2
View File
@@ -284,6 +284,7 @@ function App() {
* same id in the document, which `validateEditDocument()` rejects outright. * same id in the document, which `validateEditDocument()` rejects outright.
*/ */
const gesture = useRef<{ operationId: string; createdAt: string } | null>(null); const gesture = useRef<{ operationId: string; createdAt: string } | null>(null);
const overridePreviewRef = useRef<AbortController | null>(null);
const gestureIdentity = () => { const gestureIdentity = () => {
if (!gesture.current) if (!gesture.current)
gesture.current = { gesture.current = {
@@ -457,7 +458,10 @@ function App() {
const discardEdits = () => { const discardEdits = () => {
if (!session) return; if (!session) return;
requester?.cancel(); requester?.cancel();
overridePreviewRef.current?.abort();
overridePreviewRef.current = null;
session.discard(); session.discard();
setStaged([]);
gesture.current = null; gesture.current = null;
touch(); touch();
setPreview(null); setPreview(null);
@@ -511,10 +515,45 @@ function App() {
setStatus(`直接编辑已保存(版本 ${version}),但重新生成失败:${(error as Error).message}`); setStatus(`直接编辑已保存(版本 ${version}),但重新生成失败:${(error as Error).message}`);
} }
}; };
const previewOverrides = (overrides: Override[]) => {
if (!session) return;
const fragment = session.fragment();
overridePreviewRef.current?.abort();
const controller = new AbortController();
overridePreviewRef.current = controller;
void api
.editPreview(
{
previewSeq: session.nextPreviewSeq(),
constraints: fragment.constraints,
operations: fragment.operations,
overrides,
selection: selectionRef.current,
},
controller.signal,
)
.then((response) => {
setEditDiagnostics(response.diagnostics);
setManifest(response.handles);
setPreview(response.layers);
})
.catch((error) => {
if ((error as Error)?.name !== 'AbortError') setStatus(`箭头预览失败:${(error as Error).message}`);
})
.finally(() => {
if (overridePreviewRef.current === controller) overridePreviewRef.current = null;
});
};
const stage = (change: Override) => const stage = (change: Override) =>
setStaged((current) => [...current.filter((item) => item.id !== change.id), change]); setStaged((current) => {
const next = [...current.filter((item) => item.id !== change.id), change];
if (change.kind === 'lane-maneuver' && state) previewOverrides([...state.overrides.overrides, ...next]);
return next;
});
const save = async () => { const save = async () => {
if (!state || !staged.length) return true; if (!state || !staged.length) return true;
overridePreviewRef.current?.abort();
overridePreviewRef.current = null;
try { try {
const overrides = [ const overrides = [
...state.overrides.overrides.filter((item) => !staged.some((change) => change.id === item.id)), ...state.overrides.overrides.filter((item) => !staged.some((change) => change.id === item.id)),
@@ -626,7 +665,7 @@ function App() {
<Button onClick={redoEdit} disabled={!session?.canRedo}> <Button onClick={redoEdit} disabled={!session?.canRedo}>
重做 重做
</Button> </Button>
<Button onClick={discardEdits} disabled={!session?.dirty}> <Button onClick={discardEdits} disabled={!session?.dirty && !staged.length}>
放弃 放弃
</Button> </Button>
</> </>
+2 -1
View File
@@ -6,7 +6,7 @@
// imports from here rather than casting response fields locally, so there is one // imports from here rather than casting response fields locally, so there is one
// definition of "a valid manifest" on this side of the wire. // definition of "a valid manifest" on this side of the wire.
import type { GeoJson } from '../types/state'; import type { GeoJson, Override } from '../types/state';
export type Side = 'left' | 'right'; export type Side = 'left' | 'right';
export type Transition = 'smoothstep' | 'linear'; export type Transition = 'smoothstep' | 'linear';
@@ -207,6 +207,7 @@ export type EditSelection = { segment: string } | { junction: string };
*/ */
export interface EditPreviewRequest { export interface EditPreviewRequest {
previewSeq: number; previewSeq: number;
overrides?: Override[];
constraints?: RoadConstraint[]; constraints?: RoadConstraint[];
operations?: RoadEditOperation[]; operations?: RoadEditOperation[];
document?: RoadEditDocument; document?: RoadEditDocument;
+6 -2
View File
@@ -331,7 +331,11 @@ function editPreview(area, body = {}) {
...(Array.isArray(body.operations) ? { operations: body.operations } : {}), ...(Array.isArray(body.operations) ? { operations: body.operations } : {}),
}); });
const activeState = readJson(activeStateFile); const activeState = readJson(activeStateFile);
const model = compileRoadModel(fs.readFileSync(area.input, 'utf8'), loadOverrides(area.outputs.nativeRoadOverrides)); const persistedOverrides = loadOverrides(area.outputs.nativeRoadOverrides);
const model = compileRoadModel(fs.readFileSync(area.input, 'utf8'), persistedOverrides);
const previewOverrides = Array.isArray(body.overrides)
? validateOverrides({ schema: 'native-road-overrides/v1', overrides: body.overrides }, model)
: persistedOverrides;
const previewSeq = Number.isInteger(body.previewSeq) ? body.previewSeq : 0; const previewSeq = Number.isInteger(body.previewSeq) ? body.previewSeq : 0;
const resolution = resolveDirectEditConstraints(model, draft, { const resolution = resolveDirectEditConstraints(model, draft, {
revisionId: activeState.activeRevisionId, revisionId: activeState.activeRevisionId,
@@ -339,7 +343,7 @@ function editPreview(area, body = {}) {
compilerGeometryVersion: GEOMETRY_VERSION, compilerGeometryVersion: GEOMETRY_VERSION,
selection: selectionFrom(body.selection), selection: selectionFrom(body.selection),
}); });
const compiled = compileGeometry(model, loadOverrides(area.outputs.nativeRoadOverrides), { const compiled = compileGeometry(model, previewOverrides, {
edgeLines: area.nativeRoad.edgeLines, edgeLines: area.nativeRoad.edgeLines,
junctionTemplates: area.nativeRoad.junctionTemplates, junctionTemplates: area.nativeRoad.junctionTemplates,
directEdit: resolution, directEdit: resolution,