fix(workbench): show junction traffic signals
This commit is contained in:
1 parent
f10a5da325
commit
1f439d98de
15 files changed
+529
-60
No files matched your search
@@ -265,7 +265,9 @@ function App() {
|
||||
nodeIds.has(String(feature.properties?.crossing_node_id)),
|
||||
).length;
|
||||
const signals = state.trafficSignals.assemblies.features.filter((feature) =>
|
||||
nodeIds.has(String(feature.properties?.node_id)),
|
||||
[feature.properties?.node_id, feature.properties?.control_id].some(
|
||||
(value) => value !== undefined && value !== null && nodeIds.has(String(value)),
|
||||
),
|
||||
).length;
|
||||
return { crosswalks: crossingIds.size, stopLines, signals };
|
||||
}, [junctionDescriptor, state]);
|
||||
@@ -610,11 +612,27 @@ function App() {
|
||||
previewSession();
|
||||
};
|
||||
const discardJunctionDraft = () => {
|
||||
if (!session) return;
|
||||
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);
|
||||
}
|
||||
gesture.current = null;
|
||||
panelRef.current?.clearLive();
|
||||
previewSession();
|
||||
if (session) previewSession();
|
||||
setJunctionSession((current) => (current ? cancelJunctionSession(current) : current));
|
||||
};
|
||||
/** A settled value from either channel: one undoable command, or nothing. */
|
||||
@@ -796,9 +814,9 @@ function App() {
|
||||
}
|
||||
return true;
|
||||
};
|
||||
const compile = async () => {
|
||||
if (!(await save())) return;
|
||||
if (!(await saveDirectEdits(false))) return;
|
||||
const compile = async (): Promise<boolean> => {
|
||||
if (!(await save())) return false;
|
||||
if (!(await saveDirectEdits(false))) return false;
|
||||
if (signalDirty && signalDraftRef.current && state) {
|
||||
try {
|
||||
const result = await api.signals({
|
||||
@@ -811,7 +829,7 @@ function App() {
|
||||
setSignalDirty(false);
|
||||
} catch (error) {
|
||||
setStatus(`红绿灯保存失败:${(error as Error).message}`);
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
try {
|
||||
@@ -822,8 +840,10 @@ function App() {
|
||||
setSelected((current) => next.compiled.model.roads.find((road) => road.id === current?.id) || null);
|
||||
setPreview(null);
|
||||
setStatus('已保存并重新生成');
|
||||
return true;
|
||||
} catch (error) {
|
||||
setStatus((error as Error).message);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
if (!state)
|
||||
@@ -858,11 +878,16 @@ function App() {
|
||||
setJunctionRoute(ref);
|
||||
};
|
||||
const closeJunction = () => {
|
||||
if (junctionSession?.dirty) {
|
||||
if (junctionSession?.dirty || signalDirty) {
|
||||
const choice = window.prompt('路口有未应用草稿:输入 1 应用并返回,2 放弃并返回,3 留在工作区', '3');
|
||||
if (choice === '3' || !choice) return;
|
||||
if (choice === '1') setJunctionSession(applyJunctionDraft(junctionSession));
|
||||
else if (choice === '2') {
|
||||
if (choice === '1') {
|
||||
if (signalDirty) {
|
||||
setStatus('信号灯草稿仍未保存,请在工作区内完成保存或放弃。');
|
||||
return;
|
||||
}
|
||||
if (junctionSession) setJunctionSession(applyJunctionDraft(junctionSession));
|
||||
} else if (choice === '2') {
|
||||
discardJunctionDraft();
|
||||
} else return;
|
||||
}
|
||||
@@ -1021,7 +1046,7 @@ function App() {
|
||||
}}
|
||||
onSelectRoad={setSelected}
|
||||
onFeature={handleFeature}
|
||||
signalSelectionUid={typeof marking?.signal_uid === 'string' ? marking.signal_uid : null}
|
||||
signalSelectionUid={marking?.signal_uid == null ? null : String(marking.signal_uid)}
|
||||
onBackground={() => {
|
||||
setElement(null);
|
||||
setMarking(null);
|
||||
@@ -1132,22 +1157,18 @@ function App() {
|
||||
<JunctionWorkspace
|
||||
descriptor={junctionDescriptor}
|
||||
session={junctionSession}
|
||||
dirty={Boolean(junctionSession.dirty || signalDirty)}
|
||||
state={state}
|
||||
diagnostics={junctionDiagnostics}
|
||||
facilitySummary={junctionFacilitySummary}
|
||||
onClose={closeJunction}
|
||||
onApply={() => setJunctionSession((current) => (current ? applyJunctionDraft(current) : current))}
|
||||
onDiscard={discardJunctionDraft}
|
||||
onSave={() => {
|
||||
try {
|
||||
void saveDirectEdits().then((saved) => {
|
||||
if (!saved) return;
|
||||
setJunctionSession((current) => (current ? saveJunctionSession(current, editRevision) : current));
|
||||
setStatus('路口草稿已保存并重新生成');
|
||||
});
|
||||
} catch (error) {
|
||||
setStatus((error as Error).message);
|
||||
}
|
||||
}}
|
||||
onSave={() =>
|
||||
void compile().then((ok) => {
|
||||
if (ok) setJunctionSession((current) => (current ? saveJunctionSession(current, editRevision) : current));
|
||||
})
|
||||
}
|
||||
editMode={editMode}
|
||||
onEnableEdit={() => setEditMode(true)}
|
||||
handles={junctionHandles}
|
||||
@@ -1172,6 +1193,32 @@ function App() {
|
||||
}}
|
||||
roads={junctionRoads}
|
||||
junctionCoordinate={junctionDescriptor.coordinate}
|
||||
selectedFacility={element}
|
||||
selectedSignalUid={marking?.signal_uid == null ? null : String(marking.signal_uid)}
|
||||
signalUids={state.trafficSignals.assemblies.features
|
||||
.filter((item) =>
|
||||
[item.properties?.node_id, item.properties?.control_id].some(
|
||||
(value) => value !== undefined && value !== null && junctionDescriptor.nodeIds.includes(String(value)),
|
||||
),
|
||||
)
|
||||
.map((item) => String(item.properties?.signal_uid ?? ''))
|
||||
.filter(Boolean)}
|
||||
onSignalStatus={setStatus}
|
||||
onUpdateSignal={updateSignal}
|
||||
onSelectFacility={(facility) => {
|
||||
const source =
|
||||
facility.kind === 'crosswalk'
|
||||
? state.layers.crosswalks
|
||||
: facility.kind === 'stop-line'
|
||||
? state.layers.vehicleStopLines
|
||||
: state.trafficSignals.assemblies;
|
||||
const feature = source?.features.find((item) => {
|
||||
if (facility.kind === 'signal')
|
||||
return String(item.properties?.signal_uid) === facility.id.slice('signal:'.length);
|
||||
return String(item.properties?.crossing_node_id) === facility.id.split(':').slice(1).join(':');
|
||||
});
|
||||
if (feature) handleFeature(feature.properties ?? {});
|
||||
}}
|
||||
/>
|
||||
) : null}
|
||||
</div>
|
||||
|
||||
Reference in new issue
Block a user