feat(workbench): organize map editing panels
This commit is contained in:
1 parent
6d80597642
commit
bb108267e3
8 files changed
+556
-242
No files matched your search
+301
-234
@@ -1,8 +1,9 @@
|
||||
import { useEffect, useMemo, useRef, useState } from 'react';
|
||||
import { useEffect, useMemo, useRef, useState, type ReactNode } from 'react';
|
||||
import { Download, RefreshCw, Save, Upload } from 'lucide-react';
|
||||
import { api, isVersionConflict } from './lib/api';
|
||||
import { MapCanvas } from './components/MapCanvas';
|
||||
import { ParameterPanel, type ParameterPanelHandle } from './components/ParameterPanel';
|
||||
import { InspectorSection } from './components/InspectorSection';
|
||||
import {
|
||||
elementSelectionFor,
|
||||
groupMembers,
|
||||
@@ -45,21 +46,21 @@ import type { GeoFeature, GeoJson, Override, Road, WorkbenchState } from './type
|
||||
import type { LayerName } from './map/layers';
|
||||
|
||||
const layerLabels: Array<[LayerName, string]> = [
|
||||
['osm', 'OSM 道路中心线'],
|
||||
['osm', '方向道路参考线'],
|
||||
['native', '自研道路与路口面'],
|
||||
['sidewalks', '路缘与步行带'],
|
||||
['lanes', '车道与转向路径'],
|
||||
['directionArrows', '道路方向箭头'],
|
||||
['markings', '车道分隔线与路口转向箭头'],
|
||||
['centerLines', '道路中心线'],
|
||||
['centerLines', '道路中央标线'],
|
||||
['edgeLines', '道路外缘线'],
|
||||
['controls', '斑马线与停止线'],
|
||||
['signals', '红绿灯设施'],
|
||||
['reference', 'osm2streets 参考面'],
|
||||
];
|
||||
const defaultLayers = Object.fromEntries(
|
||||
layerLabels.map(([key]) => [key, key !== 'edgeLines' && key !== 'reference']),
|
||||
) as Record<LayerName, boolean>;
|
||||
const defaultLayers = Object.fromEntries(layerLabels.map(([key]) => [key, key !== 'edgeLines'])) as Record<
|
||||
LayerName,
|
||||
boolean
|
||||
>;
|
||||
const direction = (road: Road) => (road.direction === 'forward' ? '沿 OSM 方向' : '逆 OSM 方向');
|
||||
const label = (road: Road) => road.tags.name || `${road.highway}(OSM ${road.osmWayIds.join(', ')})`;
|
||||
const laneIndex = (id: string) => Number(id.split(':').at(-1));
|
||||
@@ -86,14 +87,6 @@ function Overview({ comparison }: { comparison: Record<string, unknown> }) {
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
<div className="overview-status">
|
||||
<span>osm2streets 参考面</span>
|
||||
<strong>
|
||||
{comparison.osm2streetsAvailable === true
|
||||
? `${Number(comparison.osm2streetsRoadSurfaceFeatures || 0)} 个`
|
||||
: '未提供'}
|
||||
</strong>
|
||||
</div>
|
||||
{severity && (
|
||||
<div className="overview-diagnostics">
|
||||
<span>编译诊断</span>
|
||||
@@ -562,9 +555,8 @@ function App() {
|
||||
const diagnostics = state.compiled.diagnostics.filter(
|
||||
(item) =>
|
||||
item.rule !== 'ordinary-junction-surface' &&
|
||||
(filter === 'all' || filter === 'candidates'
|
||||
? Boolean(item.manualCandidates?.length)
|
||||
: !item.manualCandidates?.length),
|
||||
(filter === 'all' ||
|
||||
(filter === 'candidates' ? Boolean(item.manualCandidates?.length) : !item.manualCandidates?.length)),
|
||||
);
|
||||
const handleFeature = (properties: Record<string, unknown>) => {
|
||||
setMarking(properties);
|
||||
@@ -643,43 +635,60 @@ function App() {
|
||||
<main>
|
||||
<aside className="issues">
|
||||
<h1>图层</h1>
|
||||
{layerLabels.map(([key, text]) => (
|
||||
<label key={key}>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={layers[key]}
|
||||
onChange={(event) => setLayers({ ...layers, [key]: event.target.checked })}
|
||||
/>{' '}
|
||||
{text}
|
||||
</label>
|
||||
))}
|
||||
{layerLabels
|
||||
.filter(([key]) => key !== 'edgeLines' || Boolean(state.layers.edgeLines?.features.length))
|
||||
.map(([key, text]) => {
|
||||
const hiddenInScene = scene && ['osm', 'lanes', 'connectors'].includes(key);
|
||||
return (
|
||||
<label key={key}>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={layers[key]}
|
||||
disabled={hiddenInScene}
|
||||
onChange={(event) => setLayers({ ...layers, [key]: event.target.checked })}
|
||||
/>{' '}
|
||||
{text}
|
||||
{hiddenInScene ? '(场景模式中隐藏)' : ''}
|
||||
</label>
|
||||
);
|
||||
})}
|
||||
<hr />
|
||||
<h1>当前编译概览</h1>
|
||||
<Overview comparison={state.comparison} />
|
||||
<hr />
|
||||
<h1>待检查问题</h1>
|
||||
<div className="segmented">
|
||||
{(['all', 'candidates', 'other'] as const).map((kind) => (
|
||||
<Button className={filter === kind ? 'active' : ''} onClick={() => setFilter(kind)} key={kind}>
|
||||
{kind === 'all' ? '全部' : kind === 'candidates' ? '可连接' : '其他'}
|
||||
</Button>
|
||||
))}
|
||||
</div>
|
||||
<ul>
|
||||
{diagnostics.map((item) => (
|
||||
<li key={item.id}>
|
||||
<details className="issues-details">
|
||||
<summary>待检查问题({diagnostics.length})</summary>
|
||||
<div className="issue-tabs" role="tablist" aria-label="问题筛选">
|
||||
{(['all', 'candidates', 'other'] as const).map((kind) => (
|
||||
<Button
|
||||
onClick={() => {
|
||||
const road = state.compiled.model.roads.find((itemRoad) => itemRoad.id === item.subjectId);
|
||||
if (road) setSelected(road);
|
||||
setStatus(item.message);
|
||||
}}
|
||||
className={filter === kind ? 'active' : ''}
|
||||
role="tab"
|
||||
aria-selected={filter === kind}
|
||||
onClick={() => setFilter(kind)}
|
||||
key={kind}
|
||||
>
|
||||
{item.message}
|
||||
{kind === 'all' ? '全部' : kind === 'candidates' ? '可连接' : '其他'}
|
||||
</Button>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
))}
|
||||
</div>
|
||||
<ul>
|
||||
{diagnostics.map((item) => (
|
||||
<li key={item.id}>
|
||||
<Button
|
||||
onClick={() => {
|
||||
const road = state.compiled.model.roads.find((itemRoad) => itemRoad.id === item.subjectId);
|
||||
if (road) setSelected(road);
|
||||
setStatus(item.message);
|
||||
}}
|
||||
>
|
||||
{item.message}
|
||||
</Button>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</details>
|
||||
<hr />
|
||||
<details className="overview-details">
|
||||
<summary>当前编译概览</summary>
|
||||
<Overview comparison={state.comparison} />
|
||||
</details>
|
||||
</aside>
|
||||
<MapCanvas
|
||||
state={state}
|
||||
@@ -746,17 +755,6 @@ function App() {
|
||||
}}
|
||||
/>
|
||||
<aside className="inspector">
|
||||
{directEditEnabled ? (
|
||||
<ParameterPanel
|
||||
handles={editHandles}
|
||||
hasSelection={Boolean(selected)}
|
||||
ref={panelRef}
|
||||
onDraft={draftValue}
|
||||
onSettle={settleValue}
|
||||
onAbandon={abandonGesture}
|
||||
onReset={resetHandle}
|
||||
/>
|
||||
) : null}
|
||||
<Inspector
|
||||
road={selected}
|
||||
state={state}
|
||||
@@ -766,7 +764,19 @@ function App() {
|
||||
stage={stage}
|
||||
status={setStatus}
|
||||
setState={setState}
|
||||
/>
|
||||
>
|
||||
{directEditEnabled ? (
|
||||
<ParameterPanel
|
||||
handles={editHandles}
|
||||
hasSelection={Boolean(selected)}
|
||||
ref={panelRef}
|
||||
onDraft={draftValue}
|
||||
onSettle={settleValue}
|
||||
onAbandon={abandonGesture}
|
||||
onReset={resetHandle}
|
||||
/>
|
||||
) : null}
|
||||
</Inspector>
|
||||
</aside>
|
||||
</main>
|
||||
</>
|
||||
@@ -815,6 +825,7 @@ function Inspector({
|
||||
stage,
|
||||
status,
|
||||
setState,
|
||||
children,
|
||||
}: {
|
||||
road: Road | null;
|
||||
state: WorkbenchState;
|
||||
@@ -824,6 +835,7 @@ function Inspector({
|
||||
stage: (item: Override) => void;
|
||||
status: (value: string) => void;
|
||||
setState: (next: WorkbenchState) => void;
|
||||
children?: ReactNode;
|
||||
}) {
|
||||
const [width, setWidth] = useState(0);
|
||||
const [lanes, setLanes] = useState(1);
|
||||
@@ -856,163 +868,206 @@ function Inspector({
|
||||
};
|
||||
const signalUid = typeof marking?.signal_uid === 'string' ? marking.signal_uid : '';
|
||||
const signal = state.trafficSignals.assemblies.features.find((item) => item.properties?.signal_uid === signalUid);
|
||||
// The `.inspector` aside now belongs to the layout in `main`, so the parameter
|
||||
// panel can share the column. Same markup, one level up.
|
||||
const [open, setOpen] = useState<'road' | 'element' | 'connections' | 'advanced' | null>('road');
|
||||
useEffect(() => {
|
||||
if (element || marking) setOpen('element');
|
||||
else if (road) setOpen('road');
|
||||
}, [element, marking, road]);
|
||||
const section = (name: NonNullable<typeof open>) => () => setOpen((current) => (current === name ? null : name));
|
||||
const selectedLabel =
|
||||
element?.kind === 'lane-maneuver'
|
||||
? `第 ${laneIndex(element.laneId)} 车道`
|
||||
: marking
|
||||
? '已选标线或设施'
|
||||
: road
|
||||
? label(road)
|
||||
: '未选择对象';
|
||||
return (
|
||||
<>
|
||||
<h1>当前道路设置</h1>
|
||||
{road ? (
|
||||
<form
|
||||
onSubmit={(event) => {
|
||||
event.preventDefault();
|
||||
stage({
|
||||
id: `道路:${road.id}`,
|
||||
kind: 'road',
|
||||
roadId: road.id,
|
||||
widthMeters: width,
|
||||
laneCount: lanes,
|
||||
sidewalkLeft: left,
|
||||
sidewalkRight: right,
|
||||
});
|
||||
const opposite = state.compiled.model.roads.find(
|
||||
(item) => item.id !== road.id && item.segmentId === road.segmentId,
|
||||
);
|
||||
if (opposite)
|
||||
<section className="workbench-inspector">
|
||||
<div className="inspector-summary">
|
||||
<span>编辑工作台</span>
|
||||
<strong>{selectedLabel}</strong>
|
||||
<small>{staged.length ? `已暂存 ${staged.length} 项修改` : '没有待保存的覆盖修改'}</small>
|
||||
</div>
|
||||
<InspectorSection
|
||||
title="道路"
|
||||
summary={road ? `${road.laneCount} 车道` : '选择道路'}
|
||||
open={open === 'road'}
|
||||
onToggle={section('road')}
|
||||
>
|
||||
{road ? (
|
||||
<form
|
||||
onSubmit={(event) => {
|
||||
event.preventDefault();
|
||||
stage({
|
||||
id: `道路:${opposite.id}`,
|
||||
id: `道路:${road.id}`,
|
||||
kind: 'road',
|
||||
roadId: opposite.id,
|
||||
sidewalkLeft: right,
|
||||
sidewalkRight: left,
|
||||
roadId: road.id,
|
||||
widthMeters: width,
|
||||
laneCount: lanes,
|
||||
sidewalkLeft: left,
|
||||
sidewalkRight: right,
|
||||
});
|
||||
status('有未保存修改');
|
||||
}}
|
||||
>
|
||||
<label>道路</label>
|
||||
<output>
|
||||
{label(road)}({direction(road)})
|
||||
</output>
|
||||
<output>
|
||||
{movements.length
|
||||
? `已识别 ${movements.length} 个行驶动作,${movements.filter((item) => item.geometryPublished).length} 条已绘制路径`
|
||||
: '当前方向没有已识别的行驶动作'}
|
||||
</output>
|
||||
<label>
|
||||
本方向道路宽度(米)
|
||||
<input
|
||||
type="number"
|
||||
min="1"
|
||||
step="0.01"
|
||||
value={width}
|
||||
onChange={(event) => setWidth(Number(event.target.value))}
|
||||
/>
|
||||
</label>
|
||||
<label>
|
||||
本方向车道数
|
||||
<input
|
||||
type="number"
|
||||
min="1"
|
||||
step="1"
|
||||
value={lanes}
|
||||
onChange={(event) => setLanes(Number(event.target.value))}
|
||||
/>
|
||||
</label>
|
||||
<label>
|
||||
<input type="checkbox" checked={left} onChange={(event) => setLeft(event.target.checked)} />{' '}
|
||||
左侧有路缘与步行带
|
||||
</label>
|
||||
<label>
|
||||
<input type="checkbox" checked={right} onChange={(event) => setRight(event.target.checked)} />{' '}
|
||||
右侧有路缘与步行带
|
||||
</label>
|
||||
<Button type="submit">暂存本道路修改</Button>
|
||||
</form>
|
||||
) : (
|
||||
<p>点击道路、车道、标线、转向路径或路口面以查看详情。</p>
|
||||
)}
|
||||
<hr />
|
||||
<h2>路口连接与行驶动作</h2>
|
||||
{road &&
|
||||
state.compiled.model.connections
|
||||
.filter((connection) => connection.fromEndpointId === endpoint?.id)
|
||||
.map((connection) => (
|
||||
<label key={connection.id}>
|
||||
const opposite = state.compiled.model.roads.find(
|
||||
(item) => item.id !== road.id && item.segmentId === road.segmentId,
|
||||
);
|
||||
if (opposite)
|
||||
stage({
|
||||
id: `道路:${opposite.id}`,
|
||||
kind: 'road',
|
||||
roadId: opposite.id,
|
||||
sidewalkLeft: right,
|
||||
sidewalkRight: left,
|
||||
});
|
||||
status('有未保存修改');
|
||||
}}
|
||||
>
|
||||
<label>道路</label>
|
||||
<output>
|
||||
{label(road)}({direction(road)})
|
||||
</output>
|
||||
<output>
|
||||
{movements.length
|
||||
? `已识别 ${movements.length} 个行驶动作,${movements.filter((item) => item.geometryPublished).length} 条已绘制路径`
|
||||
: '当前方向没有已识别的行驶动作'}
|
||||
</output>
|
||||
<label>
|
||||
本方向道路宽度(米)
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={effective(`连接:${connection.id}`, connection.enabled)}
|
||||
onChange={(event) =>
|
||||
stage({
|
||||
id: `连接:${connection.id}`,
|
||||
kind: 'junction-connection',
|
||||
fromEndpointId: connection.fromEndpointId,
|
||||
toEndpointId: connection.toEndpointId,
|
||||
enabled: event.target.checked,
|
||||
})
|
||||
}
|
||||
/>{' '}
|
||||
{connection.id}
|
||||
type="number"
|
||||
min="1"
|
||||
step="0.01"
|
||||
value={width}
|
||||
onChange={(event) => setWidth(Number(event.target.value))}
|
||||
/>
|
||||
</label>
|
||||
))}
|
||||
{movements.map((movement) => (
|
||||
<label key={movement.id}>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={effective(`车道连接:${movement.fromLaneId}->${movement.toLaneId}`, true)}
|
||||
onChange={(event) =>
|
||||
stage({
|
||||
id: `车道连接:${movement.fromLaneId}->${movement.toLaneId}`,
|
||||
kind: 'lane-connection',
|
||||
fromLaneId: movement.fromLaneId,
|
||||
toLaneId: movement.toLaneId,
|
||||
enabled: event.target.checked,
|
||||
})
|
||||
}
|
||||
/>{' '}
|
||||
{movement.turn}:第 {laneIndex(movement.fromLaneId)} 车道 → 第 {laneIndex(movement.toLaneId)} 车道(
|
||||
{movement.geometryStatus || 'connector'})
|
||||
</label>
|
||||
))}
|
||||
{endpoint &&
|
||||
state.compiled.diagnostics
|
||||
.find((item) => item.endpointId === endpoint.id)
|
||||
?.manualCandidates?.map((candidate) => {
|
||||
const target = state.compiled.model.roads.find((item) => item.id === candidate.roadId);
|
||||
const targetEndpoint = state.compiled.model.endpoints.find(
|
||||
(item) => item.roadId === candidate.roadId && item.side === 'start',
|
||||
);
|
||||
return target && targetEndpoint ? (
|
||||
<Button
|
||||
key={candidate.roadId}
|
||||
onClick={() => {
|
||||
stage({
|
||||
id: `连接:connection:${endpoint.id}:${targetEndpoint.id}`,
|
||||
kind: 'junction-connection',
|
||||
fromEndpointId: endpoint.id,
|
||||
toEndpointId: targetEndpoint.id,
|
||||
enabled: true,
|
||||
});
|
||||
status('手工连接已暂存;保存并重新生成后会出现转向路径');
|
||||
}}
|
||||
>
|
||||
新增:{label(target)}({candidate.distanceMeters} 米)
|
||||
</Button>
|
||||
) : null;
|
||||
})}
|
||||
<MarkingEditor marking={marking} stage={stage} />
|
||||
<LaneManeuverEditor element={element} overrides={[...state.overrides.overrides, ...staged]} stage={stage} />
|
||||
<SignalEditor state={state} signal={signal} status={status} update={updateSignal} />
|
||||
<Candidates state={state} setState={setState} status={status} />
|
||||
<details>
|
||||
<summary>技术详情与来源</summary>
|
||||
<pre>
|
||||
{JSON.stringify(
|
||||
road ? { OSM道路: road.osmWayIds, 当前方向节点顺序: road.sourceNodeIds, 原始标签: road.tags } : marking,
|
||||
null,
|
||||
2,
|
||||
)}
|
||||
</pre>
|
||||
</details>
|
||||
</>
|
||||
<label>
|
||||
本方向车道数
|
||||
<input
|
||||
type="number"
|
||||
min="1"
|
||||
step="1"
|
||||
value={lanes}
|
||||
onChange={(event) => setLanes(Number(event.target.value))}
|
||||
/>
|
||||
</label>
|
||||
<label>
|
||||
<input type="checkbox" checked={left} onChange={(event) => setLeft(event.target.checked)} />{' '}
|
||||
左侧有路缘与步行带
|
||||
</label>
|
||||
<label>
|
||||
<input type="checkbox" checked={right} onChange={(event) => setRight(event.target.checked)} />{' '}
|
||||
右侧有路缘与步行带
|
||||
</label>
|
||||
<Button type="submit">暂存本道路修改</Button>
|
||||
</form>
|
||||
) : (
|
||||
<p>点击道路、车道、标线、转向路径或路口面以查看详情。</p>
|
||||
)}
|
||||
{children}
|
||||
</InspectorSection>
|
||||
<InspectorSection
|
||||
title="元素"
|
||||
summary={element ? selectedLabel : '箭头、标线与信号'}
|
||||
open={open === 'element'}
|
||||
onToggle={section('element')}
|
||||
>
|
||||
<LaneManeuverEditor element={element} overrides={[...state.overrides.overrides, ...staged]} stage={stage} />
|
||||
<MarkingEditor marking={marking} stage={stage} />
|
||||
<SignalEditor state={state} signal={signal} status={status} update={updateSignal} />
|
||||
</InspectorSection>
|
||||
<InspectorSection
|
||||
title="连接"
|
||||
summary={road ? `${movements.length} 个行驶动作` : '选择道路'}
|
||||
open={open === 'connections'}
|
||||
onToggle={section('connections')}
|
||||
>
|
||||
{road ? (
|
||||
<div className="connections-list">
|
||||
{state.compiled.model.connections
|
||||
.filter((connection) => connection.fromEndpointId === endpoint?.id)
|
||||
.map((connection) => (
|
||||
<label key={connection.id}>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={effective(`连接:${connection.id}`, connection.enabled)}
|
||||
onChange={(event) =>
|
||||
stage({
|
||||
id: `连接:${connection.id}`,
|
||||
kind: 'junction-connection',
|
||||
fromEndpointId: connection.fromEndpointId,
|
||||
toEndpointId: connection.toEndpointId,
|
||||
enabled: event.target.checked,
|
||||
})
|
||||
}
|
||||
/>{' '}
|
||||
{connection.id}
|
||||
</label>
|
||||
))}
|
||||
{movements.map((movement) => (
|
||||
<label key={movement.id}>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={effective(`车道连接:${movement.fromLaneId}->${movement.toLaneId}`, true)}
|
||||
onChange={(event) =>
|
||||
stage({
|
||||
id: `车道连接:${movement.fromLaneId}->${movement.toLaneId}`,
|
||||
kind: 'lane-connection',
|
||||
fromLaneId: movement.fromLaneId,
|
||||
toLaneId: movement.toLaneId,
|
||||
enabled: event.target.checked,
|
||||
})
|
||||
}
|
||||
/>{' '}
|
||||
{movement.turn}:第 {laneIndex(movement.fromLaneId)} 车道 → 第 {laneIndex(movement.toLaneId)} 车道(
|
||||
{movement.geometryStatus || 'connector'})
|
||||
</label>
|
||||
))}
|
||||
</div>
|
||||
) : (
|
||||
<p className="form-context">选择一条道路以管理其驶入路口的连接。</p>
|
||||
)}
|
||||
{endpoint &&
|
||||
state.compiled.diagnostics
|
||||
.find((item) => item.endpointId === endpoint.id)
|
||||
?.manualCandidates?.map((candidate) => {
|
||||
const target = state.compiled.model.roads.find((item) => item.id === candidate.roadId);
|
||||
const targetEndpoint = state.compiled.model.endpoints.find(
|
||||
(item) => item.roadId === candidate.roadId && item.side === 'start',
|
||||
);
|
||||
return target && targetEndpoint ? (
|
||||
<Button
|
||||
key={candidate.roadId}
|
||||
onClick={() => {
|
||||
stage({
|
||||
id: `连接:connection:${endpoint.id}:${targetEndpoint.id}`,
|
||||
kind: 'junction-connection',
|
||||
fromEndpointId: endpoint.id,
|
||||
toEndpointId: targetEndpoint.id,
|
||||
enabled: true,
|
||||
});
|
||||
status('手工连接已暂存;保存并重新生成后会出现转向路径');
|
||||
}}
|
||||
>
|
||||
新增:{label(target)}({candidate.distanceMeters} 米)
|
||||
</Button>
|
||||
) : null;
|
||||
})}
|
||||
</InspectorSection>
|
||||
<InspectorSection title="高级" summary="候选与来源" open={open === 'advanced'} onToggle={section('advanced')}>
|
||||
<Candidates state={state} setState={setState} status={status} />
|
||||
<details>
|
||||
<summary>技术详情与来源</summary>
|
||||
<pre>
|
||||
{JSON.stringify(
|
||||
road ? { OSM道路: road.osmWayIds, 当前方向节点顺序: road.sourceNodeIds, 原始标签: road.tags } : marking,
|
||||
null,
|
||||
2,
|
||||
)}
|
||||
</pre>
|
||||
</details>
|
||||
</InspectorSection>
|
||||
</section>
|
||||
);
|
||||
}
|
||||
const MANEUVER_OPTIONS: Array<[string, string]> = [
|
||||
@@ -1041,27 +1096,26 @@ function LaneManeuverEditor({
|
||||
.find((item) => item.kind === 'lane-maneuver' && item.laneId === element.laneId);
|
||||
const id = override?.id || `车道转向:${element.laneId}`;
|
||||
const maneuver = typeof override?.maneuver === 'string' ? override.maneuver : element.maneuver;
|
||||
const placementDistanceMeters =
|
||||
typeof override?.placementDistanceMeters === 'number'
|
||||
? override.placementDistanceMeters
|
||||
: (element.placementDistanceMeters ?? 6);
|
||||
const update = (next: Partial<Pick<Override, 'maneuver' | 'placementDistanceMeters'>>) =>
|
||||
stage({
|
||||
id,
|
||||
kind: 'lane-maneuver',
|
||||
laneId: element.laneId,
|
||||
maneuver: typeof next.maneuver === 'string' ? next.maneuver : maneuver,
|
||||
placementDistanceMeters:
|
||||
typeof next.placementDistanceMeters === 'number' ? next.placementDistanceMeters : placementDistanceMeters,
|
||||
});
|
||||
return (
|
||||
<form>
|
||||
<hr />
|
||||
<form className="element-form">
|
||||
<h2>车道转向箭头</h2>
|
||||
<output>第 {laneIndex(element.laneId)} 车道</output>
|
||||
<p className="form-context">第 {laneIndex(element.laneId)} 车道。拖曳地图中的虚线箭头可粗调位置。</p>
|
||||
<label>
|
||||
转向
|
||||
<select
|
||||
value={maneuver}
|
||||
onChange={(event) =>
|
||||
stage({
|
||||
id,
|
||||
kind: 'lane-maneuver',
|
||||
laneId: element.laneId,
|
||||
maneuver: event.target.value,
|
||||
...(typeof override?.placementDistanceMeters === 'number'
|
||||
? { placementDistanceMeters: override.placementDistanceMeters }
|
||||
: {}),
|
||||
})
|
||||
}
|
||||
>
|
||||
<select value={maneuver} onChange={(event) => update({ maneuver: event.target.value })}>
|
||||
{MANEUVER_OPTIONS.map(([value, label]) => (
|
||||
<option value={value} key={value}>
|
||||
{label}
|
||||
@@ -1069,6 +1123,20 @@ function LaneManeuverEditor({
|
||||
))}
|
||||
</select>
|
||||
</label>
|
||||
<label>
|
||||
距路口端(米)
|
||||
<input
|
||||
type="number"
|
||||
min="0"
|
||||
step="0.25"
|
||||
value={placementDistanceMeters}
|
||||
onChange={(event) => {
|
||||
const next = Number(event.target.value);
|
||||
if (Number.isFinite(next) && next >= 0) update({ placementDistanceMeters: next });
|
||||
}}
|
||||
/>
|
||||
</label>
|
||||
<p className="form-hint">保存并重新生成时会避开停止线、斑马线和车道端点。</p>
|
||||
</form>
|
||||
);
|
||||
}
|
||||
@@ -1119,12 +1187,12 @@ function MarkingEditor({
|
||||
};
|
||||
return (
|
||||
<form
|
||||
className="element-form"
|
||||
onSubmit={(event) => {
|
||||
event.preventDefault();
|
||||
save();
|
||||
}}
|
||||
>
|
||||
<hr />
|
||||
<h2>标线样式</h2>
|
||||
<label>
|
||||
样式
|
||||
@@ -1168,8 +1236,7 @@ function SignalEditor({
|
||||
);
|
||||
};
|
||||
return (
|
||||
<section>
|
||||
<hr />
|
||||
<section className="element-form">
|
||||
<h2>原生红绿灯</h2>
|
||||
<Button
|
||||
onClick={() =>
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
import type { PropsWithChildren, ReactNode } from 'react';
|
||||
import { ChevronDown } from 'lucide-react';
|
||||
|
||||
export function InspectorSection({
|
||||
title,
|
||||
summary,
|
||||
open,
|
||||
onToggle,
|
||||
children,
|
||||
}: PropsWithChildren<{
|
||||
title: string;
|
||||
summary?: ReactNode;
|
||||
open: boolean;
|
||||
onToggle: () => void;
|
||||
}>) {
|
||||
return (
|
||||
<section className={open ? 'inspector-section open' : 'inspector-section'}>
|
||||
<button type="button" className="inspector-section-toggle" aria-expanded={open} onClick={onToggle}>
|
||||
<span>{title}</span>
|
||||
<small>{summary}</small>
|
||||
<ChevronDown className={open ? 'inspector-section-chevron open' : 'inspector-section-chevron'} size={16} />
|
||||
</button>
|
||||
{open ? <div className="inspector-section-body">{children}</div> : null}
|
||||
</section>
|
||||
);
|
||||
}
|
||||
@@ -91,6 +91,8 @@ export function MapCanvas({
|
||||
const handleLayerRef = useRef<EditHandleLayer | null>(null);
|
||||
const ghostRef = useRef<EditGhostLayer | null>(null);
|
||||
const previewRef = useRef<EditPreviewLayer | null>(null);
|
||||
/** Auto-fit is for a newly loaded area, never for a recompile of the same one. */
|
||||
const fittedAreaIdRef = useRef<string | null>(null);
|
||||
const laneSelectionSourceRef = useRef<VectorSource | null>(null);
|
||||
const laneSelectionFeaturesRef = useRef<Feature[]>([]);
|
||||
const laneSelectionAnchorRef = useRef<Coordinate | null>(null);
|
||||
@@ -139,6 +141,9 @@ export function MapCanvas({
|
||||
laneSelectionAnchorRef.current = laneSelectionAnchor ?? null;
|
||||
useEffect(() => {
|
||||
if (!target.current) return;
|
||||
// StrictMode intentionally tears this effect down and creates a fresh map.
|
||||
// A fresh view starts at [0, 0], so it must receive its own initial fit.
|
||||
fittedAreaIdRef.current = null;
|
||||
const layers = createLayers(
|
||||
() => selectedRef.current,
|
||||
() => sceneRef.current,
|
||||
@@ -290,7 +295,10 @@ export function MapCanvas({
|
||||
if (!layers || !map) return;
|
||||
updateLayers(layers, state, selected);
|
||||
const extent = layers.osm.getSource()!.getExtent();
|
||||
if (extent && Number.isFinite(extent[0])) map.getView().fit(extent, { padding: [48, 48, 48, 48], maxZoom: 19 });
|
||||
if (fittedAreaIdRef.current !== state.areaId && extent && Number.isFinite(extent[0])) {
|
||||
map.getView().fit(extent, { padding: [48, 48, 48, 48], maxZoom: 19 });
|
||||
fittedAreaIdRef.current = state.areaId;
|
||||
}
|
||||
}, [state]);
|
||||
useEffect(() => {
|
||||
const layers = layersRef.current;
|
||||
@@ -344,9 +352,7 @@ export function MapCanvas({
|
||||
if (!layers) return;
|
||||
Object.entries(visible).forEach(([name, enabled]) =>
|
||||
layers[name as LayerName]?.setVisible(
|
||||
!scene || !['osm', 'lanes', 'reference', 'gaodeReference', 'connectors'].includes(name)
|
||||
? enabled !== false
|
||||
: false,
|
||||
!scene || !['osm', 'lanes', 'connectors'].includes(name) ? enabled !== false : false,
|
||||
),
|
||||
);
|
||||
layers.native.changed();
|
||||
|
||||
@@ -14,7 +14,6 @@ import type { Road, WorkbenchState } from '../types/state';
|
||||
const geojson = new GeoJSON();
|
||||
const source = () => new VectorSource();
|
||||
export type LayerName =
|
||||
| 'reference'
|
||||
| 'native'
|
||||
| 'sidewalks'
|
||||
| 'osm'
|
||||
@@ -36,7 +35,6 @@ export function createLayers(
|
||||
const simple = (color: string, width = 1) =>
|
||||
new Style({ fill: new Fill({ color: `${color}55` }), stroke: new Stroke({ color, width }) });
|
||||
const layers: Record<LayerName, VectorLayer<VectorSource>> = {
|
||||
reference: new VectorLayer({ source: source(), visible: false, style: simple('#8999a0') }),
|
||||
native: new VectorLayer({
|
||||
source: source(),
|
||||
style: () => (scene() ? new Style({ fill: new Fill({ color: '#3f4b50' }) }) : simple('#296956')),
|
||||
@@ -83,7 +81,9 @@ export function createLayers(
|
||||
const solid = feature.get('pattern') === 'solid';
|
||||
return new Style({
|
||||
fill: new Fill({ color }),
|
||||
stroke: new Stroke({ color: solid ? color : white ? '#aeb0aa' : '#d29d16', width: solid ? 0.25 : 0.8 }),
|
||||
// OpenLayers widths are screen pixels, not meters. The compiler's
|
||||
// physical marking width therefore cannot be used here directly.
|
||||
stroke: new Stroke({ color: solid ? color : white ? '#aeb0aa' : '#d29d16', width: solid ? 1.5 : 1.25 }),
|
||||
});
|
||||
},
|
||||
}),
|
||||
@@ -138,7 +138,6 @@ export function updateLayers(layers: ReturnType<typeof createLayers>, state: Wor
|
||||
target.clear();
|
||||
target.addFeatures(features(value));
|
||||
};
|
||||
put('reference', state.layers.osm2streetsRoadSurface);
|
||||
put('native', state.layers.nativeRoadSurface);
|
||||
get('native').addFeatures(features(state.layers.nativeIntersectionSurface));
|
||||
put('sidewalks', state.layers.nativeSidewalkSurface);
|
||||
|
||||
@@ -47,6 +47,7 @@ aside {
|
||||
}
|
||||
.inspector {
|
||||
border-left: 1px solid #d5dfda;
|
||||
padding: 12px;
|
||||
}
|
||||
.map {
|
||||
min-height: 400px;
|
||||
@@ -120,6 +121,52 @@ ul {
|
||||
background: #fff7e5;
|
||||
border-color: #e7c67b;
|
||||
}
|
||||
.issues input:disabled {
|
||||
cursor: not-allowed;
|
||||
}
|
||||
.issues label:has(input:disabled) {
|
||||
color: #7b8a83;
|
||||
}
|
||||
.overview-details summary {
|
||||
cursor: pointer;
|
||||
color: #1d392f;
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.issues-details summary {
|
||||
cursor: pointer;
|
||||
color: #1d392f;
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.issues-details[open] summary {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
.issue-tabs {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, minmax(0, 1fr));
|
||||
gap: 3px;
|
||||
margin-bottom: 8px;
|
||||
padding: 3px;
|
||||
background: #edf3f0;
|
||||
}
|
||||
.issue-tabs .button {
|
||||
justify-content: center;
|
||||
min-height: 30px;
|
||||
border-color: transparent;
|
||||
padding: 4px;
|
||||
color: #52615b;
|
||||
font-size: 12px;
|
||||
}
|
||||
.issue-tabs .button.active {
|
||||
border-color: #b7cfc4;
|
||||
background: #fff;
|
||||
color: #1d392f;
|
||||
font-weight: 600;
|
||||
}
|
||||
.overview-details[open] summary {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
.segmented {
|
||||
display: flex;
|
||||
}
|
||||
@@ -331,3 +378,116 @@ pre {
|
||||
.parameter-reset:hover {
|
||||
color: #c2452f;
|
||||
}
|
||||
.workbench-inspector {
|
||||
display: grid;
|
||||
gap: 8px;
|
||||
}
|
||||
.inspector-summary {
|
||||
border: 1px solid #cddbd5;
|
||||
border-left: 3px solid #286956;
|
||||
background: #f6faf8;
|
||||
padding: 9px 10px;
|
||||
}
|
||||
.inspector-summary span,
|
||||
.inspector-summary small {
|
||||
display: block;
|
||||
color: #63736c;
|
||||
font-size: 12px;
|
||||
}
|
||||
.inspector-summary strong {
|
||||
display: block;
|
||||
margin: 3px 0;
|
||||
color: #1d392f;
|
||||
font-size: 14px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.inspector-section {
|
||||
border: 1px solid #d5dfda;
|
||||
background: #fff;
|
||||
}
|
||||
.inspector-section.open {
|
||||
border-color: #a9c3b8;
|
||||
}
|
||||
.inspector-section-toggle {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(0, 1fr) auto 20px;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
min-height: 40px;
|
||||
border: 0;
|
||||
padding: 8px 9px;
|
||||
background: #f4f8f6;
|
||||
color: #1d392f;
|
||||
cursor: pointer;
|
||||
font: inherit;
|
||||
text-align: left;
|
||||
}
|
||||
.inspector-section.open .inspector-section-toggle {
|
||||
background: #eaf3ee;
|
||||
}
|
||||
.inspector-section-toggle small {
|
||||
max-width: 120px;
|
||||
overflow: hidden;
|
||||
color: #63736c;
|
||||
font-size: 11px;
|
||||
text-align: right;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.inspector-section-chevron {
|
||||
text-align: right;
|
||||
transition: transform 120ms ease;
|
||||
}
|
||||
.inspector-section-chevron.open {
|
||||
transform: rotate(180deg);
|
||||
}
|
||||
.inspector-section-body {
|
||||
display: grid;
|
||||
gap: 12px;
|
||||
padding: 10px;
|
||||
}
|
||||
.inspector-section-body h2 {
|
||||
margin: 0 0 8px;
|
||||
}
|
||||
.inspector-section-body form {
|
||||
display: grid;
|
||||
gap: 8px;
|
||||
}
|
||||
.inspector-section-body label,
|
||||
.inspector-section-body output {
|
||||
margin: 0;
|
||||
}
|
||||
.inspector-section-body select,
|
||||
.inspector-section-body input[type='number'] {
|
||||
margin-top: 4px;
|
||||
}
|
||||
.inspector-section-body input[type='checkbox'] {
|
||||
accent-color: #286956;
|
||||
}
|
||||
.inspector-section-body .button {
|
||||
justify-content: center;
|
||||
}
|
||||
.connections-list {
|
||||
display: grid;
|
||||
gap: 7px;
|
||||
}
|
||||
.connections-list label {
|
||||
border-bottom: 1px solid #edf1ef;
|
||||
padding-bottom: 7px;
|
||||
}
|
||||
.connections-list label:last-child {
|
||||
border-bottom: 0;
|
||||
padding-bottom: 0;
|
||||
}
|
||||
.form-context,
|
||||
.form-hint {
|
||||
margin: 0;
|
||||
color: #63736c;
|
||||
font-size: 12px;
|
||||
line-height: 1.45;
|
||||
}
|
||||
.form-hint {
|
||||
color: #7b6542;
|
||||
}
|
||||
Reference in new issue
Block a user