feat(junction): show facility evidence
This commit is contained in:
1 parent
0e162d1f43
commit
8929edcee4
2 files changed
+52
-2
No files matched your search
@@ -77,3 +77,35 @@ it('filters every facility to the active junction nodes', () => {
|
|||||||
{ id: 'signal:7', kind: 'signal', label: '信号灯 · 创新大道' },
|
{ id: 'signal:7', kind: 'signal', label: '信号灯 · 创新大道' },
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('preserves source versus inferred evidence for generated complex facilities', () => {
|
||||||
|
const state = {
|
||||||
|
layers: {
|
||||||
|
crosswalks: {
|
||||||
|
type: 'FeatureCollection',
|
||||||
|
features: [
|
||||||
|
feature({ crossing_key: 'crossing:arm-a', road_id: 'road-a', facility_evidence: 'source-crossing-node' }),
|
||||||
|
feature({ crossing_key: 'crossing:arm-b', road_id: 'road-a', facility_evidence: 'inferred-road-envelope' }),
|
||||||
|
],
|
||||||
|
},
|
||||||
|
vehicleStopLines: { type: 'FeatureCollection', features: [] },
|
||||||
|
},
|
||||||
|
trafficSignals: { assemblies: { type: 'FeatureCollection', features: [] } },
|
||||||
|
} as unknown as WorkbenchState;
|
||||||
|
expect(junctionFacilities(state, [], [road])).toEqual([
|
||||||
|
{
|
||||||
|
id: 'crosswalk:crossing:arm-a',
|
||||||
|
kind: 'crosswalk',
|
||||||
|
label: '斑马线 · 来源 · 创新大道',
|
||||||
|
crossingKey: 'crossing:arm-a',
|
||||||
|
evidence: 'source-crossing-node',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'crosswalk:crossing:arm-b',
|
||||||
|
kind: 'crosswalk',
|
||||||
|
label: '斑马线 · 推断 · 创新大道',
|
||||||
|
crossingKey: 'crossing:arm-b',
|
||||||
|
evidence: 'inferred-road-envelope',
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
});
|
||||||
@@ -6,6 +6,7 @@ export interface JunctionFacility {
|
|||||||
kind: 'crosswalk' | 'stop-line' | 'signal';
|
kind: 'crosswalk' | 'stop-line' | 'signal';
|
||||||
label: string;
|
label: string;
|
||||||
crossingKey?: string;
|
crossingKey?: string;
|
||||||
|
evidence?: 'source-crossing-node' | 'inferred-road-envelope' | 'source-osm-region';
|
||||||
}
|
}
|
||||||
|
|
||||||
function text(value: unknown): string | null {
|
function text(value: unknown): string | null {
|
||||||
@@ -25,6 +26,19 @@ function roadLabel(feature: GeoFeature, roads: Road[]): string {
|
|||||||
return junctionRoadName(road, roads);
|
return junctionRoadName(road, roads);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function evidenceOf(feature: GeoFeature): JunctionFacility['evidence'] {
|
||||||
|
const value = text(feature.properties?.facility_evidence);
|
||||||
|
return value === 'source-crossing-node' || value === 'inferred-road-envelope' || value === 'source-osm-region'
|
||||||
|
? value
|
||||||
|
: undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
function evidenceSuffix(evidence: JunctionFacility['evidence']): string {
|
||||||
|
if (evidence === 'source-crossing-node' || evidence === 'source-osm-region') return ' · 来源';
|
||||||
|
if (evidence === 'inferred-road-envelope') return ' · 推断';
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
/** One user-facing item per existing facility, never one item per zebra stripe. */
|
/** One user-facing item per existing facility, never one item per zebra stripe. */
|
||||||
export function junctionFacilities(
|
export function junctionFacilities(
|
||||||
state: WorkbenchState,
|
state: WorkbenchState,
|
||||||
@@ -38,11 +52,13 @@ export function junctionFacilities(
|
|||||||
const crossing = text(feature.properties?.crossing_node_id);
|
const crossing = text(feature.properties?.crossing_node_id);
|
||||||
if ((!crossing || !nodes.has(crossing)) && !crossingKey) continue;
|
if ((!crossing || !nodes.has(crossing)) && !crossingKey) continue;
|
||||||
const id = `crosswalk:${crossingKey ?? crossing}`;
|
const id = `crosswalk:${crossingKey ?? crossing}`;
|
||||||
|
const evidence = evidenceOf(feature);
|
||||||
result.set(id, {
|
result.set(id, {
|
||||||
id,
|
id,
|
||||||
kind: 'crosswalk',
|
kind: 'crosswalk',
|
||||||
label: `斑马线 · ${roadLabel(feature, roads)}`,
|
label: `斑马线${evidenceSuffix(evidence)} · ${roadLabel(feature, roads)}`,
|
||||||
crossingKey: crossingKey ?? undefined,
|
crossingKey: crossingKey ?? undefined,
|
||||||
|
...(evidence ? { evidence } : {}),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
for (const feature of state.layers.vehicleStopLines?.features ?? []) {
|
for (const feature of state.layers.vehicleStopLines?.features ?? []) {
|
||||||
@@ -50,11 +66,13 @@ export function junctionFacilities(
|
|||||||
const crossing = text(feature.properties?.crossing_node_id);
|
const crossing = text(feature.properties?.crossing_node_id);
|
||||||
if ((!crossing || !nodes.has(crossing)) && !crossingKey) continue;
|
if ((!crossing || !nodes.has(crossing)) && !crossingKey) continue;
|
||||||
const id = `stop-line:${crossingKey ?? crossing}`;
|
const id = `stop-line:${crossingKey ?? crossing}`;
|
||||||
|
const evidence = evidenceOf(feature);
|
||||||
result.set(id, {
|
result.set(id, {
|
||||||
id,
|
id,
|
||||||
kind: 'stop-line',
|
kind: 'stop-line',
|
||||||
label: `停止线 · ${roadLabel(feature, roads)}`,
|
label: `停止线${evidenceSuffix(evidence)} · ${roadLabel(feature, roads)}`,
|
||||||
crossingKey: crossingKey ?? undefined,
|
crossingKey: crossingKey ?? undefined,
|
||||||
|
...(evidence ? { evidence } : {}),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
for (const feature of state.trafficSignals.assemblies.features) {
|
for (const feature of state.trafficSignals.assemblies.features) {
|
||||||
|
|||||||
Reference in new issue
Block a user