feat(junction): edit complex crossing facilities

This commit is contained in:
que01 committed 2026-09-08 15:05:00 +08:00
1 parent bb5dc01c07
commit 49a44fdf73
16 files changed
+307 -39

No files matched your search

@@ -41,7 +41,11 @@ interface Props {
roads?: Road[];
junctionCoordinate?: Coordinate;
selectedFacility?: ElementSelection | null;
onSelectFacility?: (facility: { id: string; kind: 'crosswalk' | 'stop-line' | 'signal' }) => void;
onSelectFacility?: (facility: {
id: string;
kind: 'crosswalk' | 'stop-line' | 'signal';
crossingKey?: string;
}) => void;
signalUids?: readonly string[];
selectedSignalUid?: string | null;
onSignalStatus?: (message: string) => void;
@@ -420,7 +424,8 @@ export function JunctionWorkspace({
(facility.kind === 'signal' && selectedSignalUid === facility.id.slice('signal:'.length)) ||
(selectedFacility &&
selectedFacility.kind === facility.kind &&
String(selectedFacility.crossingNodeId) === facility.id.split(':').slice(1).join(':'))
String(selectedFacility.crossingNodeId) ===
(facility.crossingKey ?? facility.id.split(':').slice(1).join(':')))
? 'is-selected'
: undefined
}
@@ -428,7 +433,8 @@ export function JunctionWorkspace({
(facility.kind === 'signal' && selectedSignalUid === facility.id.slice('signal:'.length)) ||
(selectedFacility &&
selectedFacility.kind === facility.kind &&
String(selectedFacility.crossingNodeId) === facility.id.split(':').slice(1).join(':'))
String(selectedFacility.crossingNodeId) ===
(facility.crossingKey ?? facility.id.split(':').slice(1).join(':')))
? 'true'
: undefined
}
@@ -477,12 +483,18 @@ export function JunctionWorkspace({
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'),
(handle.anchor.type === 'junction-crossing' &&
String(handle.anchor.crossingId) === String(selectedFacility.crossingNodeId) &&
handle.kind ===
(selectedFacility.kind === 'crosswalk'
? 'junction-crosswalk-inset'
: 'junction-stop-line-offset')) ||
(handle.anchor.type === 'cluster-crossing' &&
String(handle.anchor.crossingKey) === String(selectedFacility.crossingNodeId) &&
handle.kind ===
(selectedFacility.kind === 'crosswalk'
? 'cluster-crossing-inset'
: 'cluster-stop-line-offset')),
)?.handleId
: undefined
}
+13 -6
View File
@@ -5,6 +5,7 @@ export interface JunctionFacility {
id: string;
kind: 'crosswalk' | 'stop-line' | 'signal';
label: string;
crossingKey?: string;
}
function text(value: unknown): string | null {
@@ -33,21 +34,27 @@ export function junctionFacilities(
const nodes = new Set(nodeIds.map(String));
const result = new Map<string, JunctionFacility>();
for (const feature of state.layers.crosswalks?.features ?? []) {
const crossingKey = text(feature.properties?.crossing_key) ?? text(feature.properties?.object_key);
const crossing = text(feature.properties?.crossing_node_id);
if (!crossing || !nodes.has(crossing)) continue;
result.set(`crosswalk:${crossing}`, {
id: `crosswalk:${crossing}`,
if ((!crossing || !nodes.has(crossing)) && !crossingKey) continue;
const id = `crosswalk:${crossingKey ?? crossing}`;
result.set(id, {
id,
kind: 'crosswalk',
label: `斑马线 · ${roadLabel(feature, roads)}`,
crossingKey: crossingKey ?? undefined,
});
}
for (const feature of state.layers.vehicleStopLines?.features ?? []) {
const crossingKey = text(feature.properties?.crossing_key);
const crossing = text(feature.properties?.crossing_node_id);
if (!crossing || !nodes.has(crossing)) continue;
result.set(`stop-line:${crossing}`, {
id: `stop-line:${crossing}`,
if ((!crossing || !nodes.has(crossing)) && !crossingKey) continue;
const id = `stop-line:${crossingKey ?? crossing}`;
result.set(id, {
id,
kind: 'stop-line',
label: `停止线 · ${roadLabel(feature, roads)}`,
crossingKey: crossingKey ?? undefined,
});
}
for (const feature of state.trafficSignals.assemblies.features) {