feat(workbench): stage traffic signal edits
This commit is contained in:
1 parent
9c83392b97
commit
9b7c3d59bd
1 file changed
+108
-21
+108
-21
@@ -110,6 +110,12 @@ function App() {
|
||||
const [state, setState] = useState<WorkbenchState>();
|
||||
const [selected, setSelected] = useState<Road | null>(null);
|
||||
const [staged, setStaged] = useState<Override[]>([]);
|
||||
const [signalDirty, setSignalDirty] = useState(false);
|
||||
const signalDraftRef = useRef<GeoFeature[] | null>(null);
|
||||
const signalUndoRef = useRef<GeoFeature[][]>([]);
|
||||
const signalRedoRef = useRef<GeoFeature[][]>([]);
|
||||
const signalSavedRef = useRef<GeoFeature[] | null>(null);
|
||||
const signalMoveActiveRef = useRef(false);
|
||||
const [layers, setLayers] = useState(defaultLayers);
|
||||
const [scene, setScene] = useState(false);
|
||||
const [status, setStatus] = useState('正在加载工作台...');
|
||||
@@ -136,6 +142,7 @@ function App() {
|
||||
.then((value) => {
|
||||
if ('compiled' in value) {
|
||||
setState(value);
|
||||
signalSavedRef.current = value.trafficSignals.assemblies.features;
|
||||
setStatus(`已加载 ${value.compiled.model.roads.length} 条方向道路`);
|
||||
} else setStatus('请导入 OSM 文件以开始');
|
||||
})
|
||||
@@ -497,6 +504,24 @@ function App() {
|
||||
const undoEdit = () => {
|
||||
// A saved gesture cannot be un-applied — persisted history is append-only — so
|
||||
// it is reversed by an inverse operation, which needs its own identity.
|
||||
if (!session?.canUndo && signalUndoRef.current.length) {
|
||||
const previous = signalUndoRef.current.pop()!;
|
||||
signalRedoRef.current.push(state?.trafficSignals.assemblies.features || []);
|
||||
setState((current) =>
|
||||
current
|
||||
? {
|
||||
...current,
|
||||
trafficSignals: {
|
||||
...current.trafficSignals,
|
||||
assemblies: { ...current.trafficSignals.assemblies, features: previous },
|
||||
},
|
||||
}
|
||||
: current,
|
||||
);
|
||||
signalDraftRef.current = previous;
|
||||
setSignalDirty(true);
|
||||
return;
|
||||
}
|
||||
const reversed = session?.undo({
|
||||
operationId: `operation:undo:${Date.now()}`,
|
||||
createdAt: new Date().toISOString(),
|
||||
@@ -506,14 +531,48 @@ function App() {
|
||||
previewSession();
|
||||
};
|
||||
const redoEdit = () => {
|
||||
if (!session?.canRedo && signalRedoRef.current.length) {
|
||||
const next = signalRedoRef.current.pop()!;
|
||||
signalUndoRef.current.push(state?.trafficSignals.assemblies.features || []);
|
||||
setState((current) =>
|
||||
current
|
||||
? {
|
||||
...current,
|
||||
trafficSignals: {
|
||||
...current.trafficSignals,
|
||||
assemblies: { ...current.trafficSignals.assemblies, features: next },
|
||||
},
|
||||
}
|
||||
: current,
|
||||
);
|
||||
signalDraftRef.current = next;
|
||||
setSignalDirty(true);
|
||||
return;
|
||||
}
|
||||
if (!session?.redo()) return;
|
||||
touch();
|
||||
previewSession();
|
||||
};
|
||||
const discardEdits = () => {
|
||||
if (!session) return;
|
||||
requester?.cancel();
|
||||
session.discard();
|
||||
session?.discard();
|
||||
if (signalDirty && signalSavedRef.current) {
|
||||
setState((current) =>
|
||||
current
|
||||
? {
|
||||
...current,
|
||||
trafficSignals: {
|
||||
...current.trafficSignals,
|
||||
assemblies: { ...current.trafficSignals.assemblies, features: signalSavedRef.current! },
|
||||
},
|
||||
}
|
||||
: current,
|
||||
);
|
||||
}
|
||||
signalDraftRef.current = null;
|
||||
signalUndoRef.current = [];
|
||||
signalRedoRef.current = [];
|
||||
setSignalDirty(false);
|
||||
setStaged([]);
|
||||
gesture.current = null;
|
||||
touch();
|
||||
@@ -595,6 +654,21 @@ function App() {
|
||||
const compile = async () => {
|
||||
if (!(await save())) return;
|
||||
if (!(await saveDirectEdits(false))) return;
|
||||
if (signalDirty && signalDraftRef.current && state) {
|
||||
try {
|
||||
const result = await api.signals({
|
||||
...state.trafficSignals,
|
||||
assemblies: { ...state.trafficSignals.assemblies, features: signalDraftRef.current },
|
||||
});
|
||||
setState((value) => (value ? { ...value, ...result } : value));
|
||||
signalSavedRef.current = signalDraftRef.current;
|
||||
signalDraftRef.current = null;
|
||||
setSignalDirty(false);
|
||||
} catch (error) {
|
||||
setStatus(`红绿灯保存失败:${(error as Error).message}`);
|
||||
return;
|
||||
}
|
||||
}
|
||||
try {
|
||||
setStatus('正在重新生成...');
|
||||
const next = await api.compile();
|
||||
@@ -606,6 +680,23 @@ function App() {
|
||||
setStatus((error as Error).message);
|
||||
}
|
||||
};
|
||||
const updateSignal = async (features: GeoFeature[]) => {
|
||||
if (state) signalUndoRef.current.push(state.trafficSignals.assemblies.features);
|
||||
signalRedoRef.current = [];
|
||||
signalDraftRef.current = features;
|
||||
setSignalDirty(true);
|
||||
setState((current) =>
|
||||
current
|
||||
? {
|
||||
...current,
|
||||
trafficSignals: {
|
||||
...current.trafficSignals,
|
||||
assemblies: { ...current.trafficSignals.assemblies, features },
|
||||
},
|
||||
}
|
||||
: current,
|
||||
);
|
||||
};
|
||||
if (!state)
|
||||
return (
|
||||
<ImportScreen
|
||||
@@ -643,6 +734,11 @@ function App() {
|
||||
const moveSignal = (uid: string, coordinate: Coordinate) => {
|
||||
setState((current) => {
|
||||
if (!current) return current;
|
||||
if (!signalMoveActiveRef.current) {
|
||||
signalUndoRef.current.push(current.trafficSignals.assemblies.features);
|
||||
signalRedoRef.current = [];
|
||||
signalMoveActiveRef.current = true;
|
||||
}
|
||||
return {
|
||||
...current,
|
||||
trafficSignals: {
|
||||
@@ -658,6 +754,7 @@ function App() {
|
||||
},
|
||||
};
|
||||
});
|
||||
setSignalDirty(true);
|
||||
};
|
||||
const finishSignalMove = (uid: string, coordinate: Coordinate) => {
|
||||
const current = state;
|
||||
@@ -667,10 +764,9 @@ function App() {
|
||||
? { ...feature, geometry: { type: 'Point', coordinates: coordinate } }
|
||||
: feature,
|
||||
);
|
||||
void api
|
||||
.signals({ ...current.trafficSignals, assemblies: { ...current.trafficSignals.assemblies, features } })
|
||||
.then((result) => setState((value) => (value ? { ...value, ...result } : value)))
|
||||
.catch((error: Error) => setStatus(`红绿灯位置保存失败:${error.message}`));
|
||||
signalDraftRef.current = features;
|
||||
signalMoveActiveRef.current = false;
|
||||
setSignalDirty(true);
|
||||
};
|
||||
return (
|
||||
<>
|
||||
@@ -724,13 +820,13 @@ function App() {
|
||||
<Button onClick={() => void saveDirectEdits()} disabled={!session?.dirty}>
|
||||
<Save size={15} /> 保存直接编辑
|
||||
</Button>
|
||||
<Button onClick={undoEdit} disabled={!session?.canUndo}>
|
||||
<Button onClick={undoEdit} disabled={!session?.canUndo && !signalUndoRef.current.length}>
|
||||
撤销
|
||||
</Button>
|
||||
<Button onClick={redoEdit} disabled={!session?.canRedo}>
|
||||
<Button onClick={redoEdit} disabled={!session?.canRedo && !signalRedoRef.current.length}>
|
||||
重做
|
||||
</Button>
|
||||
<Button onClick={discardEdits} disabled={!session?.dirty && !staged.length}>
|
||||
<Button onClick={discardEdits} disabled={!session?.dirty && !staged.length && !signalDirty}>
|
||||
放弃
|
||||
</Button>
|
||||
</>
|
||||
@@ -878,6 +974,7 @@ function App() {
|
||||
setState={setState}
|
||||
session={session}
|
||||
onLaneManeuverChange={applyLaneManeuver}
|
||||
updateSignal={updateSignal}
|
||||
>
|
||||
{editMode ? (
|
||||
<ParameterPanel
|
||||
@@ -941,6 +1038,7 @@ function Inspector({
|
||||
setState,
|
||||
session,
|
||||
onLaneManeuverChange,
|
||||
updateSignal,
|
||||
children,
|
||||
}: {
|
||||
road: Road | null;
|
||||
@@ -953,6 +1051,7 @@ function Inspector({
|
||||
setState: (next: WorkbenchState) => void;
|
||||
session: EditSession | null;
|
||||
onLaneManeuverChange: (maneuver: string, placementDistanceMeters: number) => void;
|
||||
updateSignal: (features: GeoFeature[]) => Promise<void>;
|
||||
children?: ReactNode;
|
||||
}) {
|
||||
const [width, setWidth] = useState(0);
|
||||
@@ -972,18 +1071,6 @@ function Inspector({
|
||||
const effective = (id: string, fallback: boolean) =>
|
||||
((staged.find((item) => item.id === id) || state.overrides.overrides.find((item) => item.id === id))?.enabled as
|
||||
boolean | undefined) ?? fallback;
|
||||
const updateSignal = async (features: GeoFeature[]) => {
|
||||
try {
|
||||
const result = await api.signals({
|
||||
...state.trafficSignals,
|
||||
assemblies: { ...state.trafficSignals.assemblies, features },
|
||||
});
|
||||
setState({ ...state, trafficSignals: result.trafficSignals, trafficRuntime: result.trafficRuntime });
|
||||
status('红绿灯已保存');
|
||||
} catch (error) {
|
||||
status((error as Error).message);
|
||||
}
|
||||
};
|
||||
const signalUid = typeof marking?.signal_uid === 'string' ? marking.signal_uid : '';
|
||||
const signal = state.trafficSignals.assemblies.features.find((item) => item.properties?.signal_uid === signalUid);
|
||||
const [open, setOpen] = useState<'road' | 'element' | 'connections' | 'advanced' | null>('road');
|
||||
|
||||
Reference in new issue
Block a user