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
@@ -4,15 +4,21 @@ import { canEditJunction, type JunctionSession } from './workspace';
|
||||
import { Button } from '../ui/button';
|
||||
import { ParameterPanel } from '../components/ParameterPanel';
|
||||
import type { EditHandle } from '../edit/types';
|
||||
import type { ElementSelection } from '../edit/element';
|
||||
import type { Road } from '../types/state';
|
||||
import type { WorkbenchState } from '../types/state';
|
||||
import type { Coordinate } from '../edit/meters';
|
||||
import { junctionLabelForHandle, junctionRoadName } from './labels';
|
||||
import { junctionFacilities } from './facilities';
|
||||
import { SignalEditor } from '../components/ElementEditors';
|
||||
|
||||
interface Props {
|
||||
descriptor: JunctionDescriptor;
|
||||
session: JunctionSession;
|
||||
dirty?: boolean;
|
||||
diagnostics?: Array<{ id: string; message: string; rule: string; severity?: string }>;
|
||||
facilitySummary?: { crosswalks: number; stopLines: number; signals: number };
|
||||
state?: WorkbenchState;
|
||||
onClose: () => void;
|
||||
onApply: () => void;
|
||||
onDiscard: () => void;
|
||||
@@ -28,11 +34,18 @@ interface Props {
|
||||
onReset?: (handle: EditHandle) => void;
|
||||
roads?: Road[];
|
||||
junctionCoordinate?: Coordinate;
|
||||
selectedFacility?: ElementSelection | null;
|
||||
onSelectFacility?: (facility: { id: string; kind: 'crosswalk' | 'stop-line' | 'signal' }) => void;
|
||||
signalUids?: readonly string[];
|
||||
selectedSignalUid?: string | null;
|
||||
onSignalStatus?: (message: string) => void;
|
||||
onUpdateSignal?: (features: import('../types/state').GeoFeature[]) => Promise<void>;
|
||||
}
|
||||
|
||||
export function JunctionWorkspace({
|
||||
descriptor,
|
||||
session,
|
||||
dirty = session.dirty,
|
||||
onClose,
|
||||
onApply,
|
||||
onDiscard,
|
||||
@@ -41,6 +54,7 @@ export function JunctionWorkspace({
|
||||
onEnableEdit,
|
||||
diagnostics = [],
|
||||
facilitySummary = { crosswalks: 0, stopLines: 0, signals: 0 },
|
||||
state,
|
||||
handles = [],
|
||||
onDraft,
|
||||
onDraftGroup,
|
||||
@@ -50,8 +64,18 @@ export function JunctionWorkspace({
|
||||
onReset,
|
||||
roads = [],
|
||||
junctionCoordinate = descriptor.coordinate,
|
||||
selectedFacility,
|
||||
onSelectFacility,
|
||||
signalUids = [],
|
||||
selectedSignalUid,
|
||||
onSignalStatus,
|
||||
onUpdateSignal,
|
||||
}: Props) {
|
||||
const editable = useMemo(() => canEditJunction(descriptor), [descriptor]);
|
||||
const facilities = useMemo(
|
||||
() => (state ? junctionFacilities(state, descriptor.nodeIds, roads) : []),
|
||||
[descriptor.nodeIds, roads, state],
|
||||
);
|
||||
return (
|
||||
<section className="junction-workspace" aria-label="路口编辑工作区">
|
||||
<header className="junction-workspace__header">
|
||||
@@ -83,7 +107,7 @@ export function JunctionWorkspace({
|
||||
<dt>状态</dt>
|
||||
<dd>
|
||||
{session.status}
|
||||
{session.dirty ? '(有未应用草稿)' : ''}
|
||||
{dirty ? '(有未应用草稿)' : ''}
|
||||
</dd>
|
||||
</dl>
|
||||
<section className="junction-workspace__validation" aria-label="路口验证">
|
||||
@@ -91,6 +115,44 @@ export function JunctionWorkspace({
|
||||
<p>
|
||||
斑马线 {facilitySummary.crosswalks} · 停止线 {facilitySummary.stopLines} · 信号灯 {facilitySummary.signals}
|
||||
</p>
|
||||
{facilities.length ? (
|
||||
<ul className="junction-workspace__facilities" aria-label="已有设施">
|
||||
{facilities.map((facility) => (
|
||||
<li key={facility.id}>
|
||||
<button
|
||||
type="button"
|
||||
className={
|
||||
(facility.kind === 'signal' && selectedSignalUid === facility.id.slice('signal:'.length)) ||
|
||||
(selectedFacility &&
|
||||
selectedFacility.kind === facility.kind &&
|
||||
String(selectedFacility.crossingNodeId) === facility.id.split(':').slice(1).join(':'))
|
||||
? 'is-selected'
|
||||
: undefined
|
||||
}
|
||||
aria-current={
|
||||
(facility.kind === 'signal' && selectedSignalUid === facility.id.slice('signal:'.length)) ||
|
||||
(selectedFacility &&
|
||||
selectedFacility.kind === facility.kind &&
|
||||
String(selectedFacility.crossingNodeId) === facility.id.split(':').slice(1).join(':'))
|
||||
? 'true'
|
||||
: undefined
|
||||
}
|
||||
onClick={() => onSelectFacility?.(facility)}
|
||||
>
|
||||
{facility.label}
|
||||
</button>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
) : null}
|
||||
{selectedFacility && selectedFacility.kind !== 'lane-maneuver' ? (
|
||||
<p className="junction-workspace__facility-selection">
|
||||
当前选中:{selectedFacility.kind === 'crosswalk' ? '斑马线' : '停止线'}。可在下方参数中调整位置。
|
||||
</p>
|
||||
) : null}
|
||||
{selectedSignalUid ? (
|
||||
<p className="junction-workspace__facility-selection">当前选中:信号灯。可在下方参数中调整。</p>
|
||||
) : null}
|
||||
{diagnostics.length ? (
|
||||
<ul>
|
||||
{diagnostics.map((item) => (
|
||||
@@ -116,22 +178,51 @@ export function JunctionWorkspace({
|
||||
onAbandon={onAbandon ?? (() => undefined)}
|
||||
onReset={onReset ?? (() => undefined)}
|
||||
labelForHandle={(handle) => junctionLabelForHandle(handle, roads, junctionCoordinate)}
|
||||
highlightedHandleId={
|
||||
selectedFacility && selectedFacility.kind !== 'lane-maneuver'
|
||||
? handles.find(
|
||||
(handle) =>
|
||||
handle.anchor.type === 'junction-crossing' &&
|
||||
String(handle.anchor.crossingId) === String(selectedFacility.crossingNodeId) &&
|
||||
handle.kind ===
|
||||
(selectedFacility.kind === 'crosswalk'
|
||||
? 'junction-crosswalk-inset'
|
||||
: 'junction-stop-line-offset'),
|
||||
)?.handleId
|
||||
: undefined
|
||||
}
|
||||
/>
|
||||
{onUpdateSignal ? (
|
||||
<SignalEditor
|
||||
state={state!}
|
||||
signal={
|
||||
selectedSignalUid
|
||||
? state?.trafficSignals.assemblies.features.find(
|
||||
(item) => String(item.properties?.signal_uid) === selectedSignalUid,
|
||||
)
|
||||
: undefined
|
||||
}
|
||||
signalUids={signalUids}
|
||||
allowDelete={false}
|
||||
status={onSignalStatus ?? (() => undefined)}
|
||||
update={onUpdateSignal}
|
||||
/>
|
||||
) : null}
|
||||
<div className="junction-workspace__actions">
|
||||
<Button onClick={onApply} disabled={!session.dirty}>
|
||||
<Button onClick={onApply} disabled={!dirty}>
|
||||
应用到工作区
|
||||
</Button>
|
||||
<Button onClick={onSave} disabled={session.dirty}>
|
||||
<Button onClick={onSave} disabled={!dirty}>
|
||||
保存
|
||||
</Button>
|
||||
<Button onClick={onDiscard} disabled={!session.dirty}>
|
||||
<Button onClick={onDiscard} disabled={!dirty}>
|
||||
放弃草稿
|
||||
</Button>
|
||||
</div>
|
||||
</>
|
||||
) : editable ? (
|
||||
<p className="junction-workspace__browse-hint">
|
||||
开启编辑模式后,这里会显示进口宽度、cutback 和角部圆角控件。
|
||||
开启编辑模式后,这里会显示进口宽度、进口收口距离和角部圆角控件。
|
||||
</p>
|
||||
) : null}
|
||||
</div>
|
||||
|
||||
Reference in new issue
Block a user