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
@@ -131,17 +131,31 @@ export function MarkingEditor({
|
||||
export function SignalEditor({
|
||||
state,
|
||||
signal,
|
||||
signalUids,
|
||||
allowDelete = true,
|
||||
status,
|
||||
update,
|
||||
}: {
|
||||
state: WorkbenchState;
|
||||
signal?: GeoFeature;
|
||||
signalUids?: readonly string[];
|
||||
allowDelete?: boolean;
|
||||
status: (text: string) => void;
|
||||
update: (features: GeoFeature[]) => Promise<void>;
|
||||
}) {
|
||||
const allowed = signalUids ? new Set(signalUids) : null;
|
||||
const signals = state.trafficSignals.assemblies.features.filter((item) => {
|
||||
const uid = String(item.properties?.signal_uid ?? '');
|
||||
return !allowed || allowed.has(uid);
|
||||
});
|
||||
const [selected, setSelected] = useState('');
|
||||
useEffect(() => setSelected(String(signal?.properties?.signal_uid || '')), [signal]);
|
||||
const feature = state.trafficSignals.assemblies.features.find((item) => item.properties?.signal_uid === selected);
|
||||
useEffect(() => {
|
||||
if (selected && !signals.some((item) => String(item.properties?.signal_uid) === selected)) setSelected('');
|
||||
}, [selected, signals]);
|
||||
const feature = state.trafficSignals.assemblies.features.find(
|
||||
(item) => String(item.properties?.signal_uid ?? '') === selected,
|
||||
);
|
||||
const coordinates =
|
||||
feature?.geometry?.type === 'Point' && Array.isArray(feature.geometry.coordinates)
|
||||
? (feature.geometry.coordinates as [number, number])
|
||||
@@ -183,7 +197,7 @@ export function SignalEditor({
|
||||
检查信号灯
|
||||
<select value={selected} onChange={(event) => setSelected(event.target.value)}>
|
||||
<option value="">选择设施</option>
|
||||
{state.trafficSignals.assemblies.features.map((item) => (
|
||||
{signals.map((item) => (
|
||||
<option key={String(item.properties?.signal_uid)} value={String(item.properties?.signal_uid)}>
|
||||
{String(item.properties?.display_id || item.properties?.signal_uid)}
|
||||
</option>
|
||||
@@ -264,16 +278,18 @@ export function SignalEditor({
|
||||
/>{' '}
|
||||
启用
|
||||
</label>
|
||||
<Button
|
||||
onClick={() =>
|
||||
void update(state.trafficSignals.assemblies.features.filter((item) => item !== feature)).then(() => {
|
||||
setSelected('');
|
||||
status('红绿灯已删除');
|
||||
})
|
||||
}
|
||||
>
|
||||
删除信号灯
|
||||
</Button>
|
||||
{allowDelete ? (
|
||||
<Button
|
||||
onClick={() =>
|
||||
void update(state.trafficSignals.assemblies.features.filter((item) => item !== feature)).then(() => {
|
||||
setSelected('');
|
||||
status('红绿灯已删除');
|
||||
})
|
||||
}
|
||||
>
|
||||
删除信号灯
|
||||
</Button>
|
||||
) : null}
|
||||
</>
|
||||
) : null}
|
||||
</section>
|
||||
|
||||
@@ -487,7 +487,7 @@ export function MapCanvas({
|
||||
layer.setVisible(Boolean(editMode && signalSelectionUid));
|
||||
if (!editMode || !signalSelectionUid) return;
|
||||
const signal = state.trafficSignals.assemblies.features.find(
|
||||
(feature) => feature.properties?.signal_uid === signalSelectionUid,
|
||||
(feature) => String(feature.properties?.signal_uid ?? '') === String(signalSelectionUid),
|
||||
);
|
||||
const pivot =
|
||||
signal?.geometry?.type === 'Point' && Array.isArray(signal.geometry.coordinates)
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// an intent, and a clamped typo reads as a plausible value that can go
|
||||
// unnoticed. Same invariant, two devices, two honest ways to say "no".
|
||||
|
||||
import { useImperativeHandle, useLayoutEffect, useRef, useState, type Ref } from 'react';
|
||||
import { useEffect, useImperativeHandle, useLayoutEffect, useRef, useState, type Ref } from 'react';
|
||||
import { Minus, Plus } from 'lucide-react';
|
||||
import {
|
||||
formatBoundInward,
|
||||
@@ -67,6 +67,7 @@ interface RowCallbacks {
|
||||
labelForHandle?: (handle: EditHandle) => string;
|
||||
onDraftGroup?: (handles: EditHandle[], value: number) => void;
|
||||
onSettleGroup?: (handles: EditHandle[], value: number) => void;
|
||||
highlightedHandleId?: string;
|
||||
}
|
||||
|
||||
function ParameterRow({
|
||||
@@ -77,6 +78,7 @@ function ParameterRow({
|
||||
onAbandon,
|
||||
onReset,
|
||||
labelForHandle: resolveLabel,
|
||||
highlightedHandleId,
|
||||
}: RowCallbacks & {
|
||||
handle: EditHandle;
|
||||
register: (handleId: string, node: HTMLInputElement | null) => void;
|
||||
@@ -151,7 +153,10 @@ function ParameterRow({
|
||||
};
|
||||
|
||||
return (
|
||||
<li className={reason ? 'parameter disabled' : 'parameter'}>
|
||||
<li
|
||||
data-handle-id={handle.handleId}
|
||||
className={`${reason ? 'parameter disabled' : 'parameter'}${highlightedHandleId === handle.handleId ? ' parameter--highlighted' : ''}`}
|
||||
>
|
||||
<span className="parameter-label">
|
||||
{displayLabel}
|
||||
{isModified(handle) ? (
|
||||
@@ -323,12 +328,28 @@ export function ParameterPanel({
|
||||
function GroupedParameterList({
|
||||
groups,
|
||||
register,
|
||||
highlightedHandleId,
|
||||
...callbacks
|
||||
}: RowCallbacks & {
|
||||
groups: Array<[string, EditHandle[]]>;
|
||||
register: (handleId: string, node: HTMLInputElement | null) => void;
|
||||
}) {
|
||||
const [expanded, setExpanded] = useState<Record<string, boolean>>({});
|
||||
const highlightedGroup = groups.find(([, items]) => items.some((item) => item.handleId === highlightedHandleId))?.[0];
|
||||
|
||||
useEffect(() => {
|
||||
if (!highlightedGroup) return;
|
||||
setExpanded((current) => (current[highlightedGroup] ? current : { ...current, [highlightedGroup]: true }));
|
||||
}, [highlightedGroup]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!highlightedGroup || !expanded[highlightedGroup]) return;
|
||||
const frame = window.requestAnimationFrame(() => {
|
||||
const node = document.querySelector<HTMLElement>(`[data-handle-id="${CSS.escape(highlightedHandleId ?? '')}"]`);
|
||||
node?.scrollIntoView({ behavior: 'smooth', block: 'center' });
|
||||
});
|
||||
return () => window.cancelAnimationFrame(frame);
|
||||
}, [expanded, highlightedGroup, highlightedHandleId]);
|
||||
return (
|
||||
<ul className="parameter-groups">
|
||||
{groups.map(([kind, items]) => {
|
||||
@@ -377,6 +398,7 @@ function GroupedParameterList({
|
||||
handle={globalHandle}
|
||||
register={register}
|
||||
{...callbacks}
|
||||
highlightedHandleId={highlightedHandleId}
|
||||
onDraft={(handle, value) => globalDraft(items, value)}
|
||||
onSettle={(handle, value) => globalSettle(items, value)}
|
||||
labelForHandle={() => '统一值'}
|
||||
@@ -384,7 +406,13 @@ function GroupedParameterList({
|
||||
{expandedGroup ? (
|
||||
<ul className="parameter-group__details">
|
||||
{items.map((handle) => (
|
||||
<ParameterRow handle={handle} register={register} key={handle.handleId} {...callbacks} />
|
||||
<ParameterRow
|
||||
handle={handle}
|
||||
register={register}
|
||||
key={handle.handleId}
|
||||
{...callbacks}
|
||||
highlightedHandleId={highlightedHandleId}
|
||||
/>
|
||||
))}
|
||||
</ul>
|
||||
) : null}
|
||||
@@ -397,7 +425,7 @@ function GroupedParameterList({
|
||||
|
||||
function groupLabel(kind: string, handle: EditHandle): string {
|
||||
if (kind === 'junction-approach-width') return '进口宽度';
|
||||
if (kind === 'junction-cutback') return '进口 cutback';
|
||||
if (kind === 'junction-cutback') return '进口收口距离';
|
||||
if (kind === 'junction-corner-radius') return '角部圆角';
|
||||
if (kind === 'junction-crosswalk-inset') return '斑马线退让';
|
||||
if (kind === 'junction-stop-line-offset') return '停止线退距';
|
||||
|
||||
@@ -52,8 +52,10 @@ export function WorkbenchInspector({
|
||||
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 signalUid = typeof marking?.signal_uid === 'string' ? marking.signal_uid : '';
|
||||
const signal = state.trafficSignals.assemblies.features.find((item) => item.properties?.signal_uid === signalUid);
|
||||
const signalUid = marking?.signal_uid == null ? '' : String(marking.signal_uid);
|
||||
const signal = state.trafficSignals.assemblies.features.find(
|
||||
(item) => String(item.properties?.signal_uid ?? '') === signalUid,
|
||||
);
|
||||
const [open, setOpen] = useState<'road' | 'element' | 'connections' | 'advanced' | null>('road');
|
||||
useEffect(() => {
|
||||
if (element || marking) setOpen('element');
|
||||
|
||||
Reference in new issue
Block a user