feat(workbench): organize map editing panels

This commit is contained in:
que01 committed 2026-09-01 13:47:30 +08:00
1 parent 6d80597642
commit bb108267e3
8 files changed
+390 -76

No files matched your search

@@ -112,3 +112,27 @@
父 `design.md` 已为 `boundaryIndex` 定义同类规则——"重放时若车道数变化导致越界,该约束转 `stale`,不做近似映射"——数值范围越界应同等处理。 父 `design.md` 已为 `boundaryIndex` 定义同类规则——"重放时若车道数变化导致越界,该约束转 `stale`,不做近似映射"——数值范围越界应同等处理。
属重放正确性,不属本任务;独立成任务。本任务的客户端校验不因该缺口存在而降级:范围在哪定义就在哪拦,并避免一次注定被拒的求解。 属重放正确性,不属本任务;独立成任务。本任务的客户端校验不因该缺口存在而降级:范围在哪定义就在哪拦,并避免一次注定被拒的求解。
## 右侧工作台信息架构(2026-09-01)
右栏是操作面板而非信息流。顶部固定呈现当前选择对象、其道路方向和修改状态;下方
采用单主展开区的手风琴,避免所有表单在初始状态占满地图旁的空间。
| 分段 | 内容 | 展开规则 | 写入语义 |
| --- | --- | --- | --- |
| 道路 | 基础道路覆盖、直接编辑参数 | 选中道路时默认展开 | override 暂存;直接编辑 preview/session |
| 元素 | 车道箭头、标线、信号灯 | 选择相应地图元素时自动展开 | 箭头/标线暂存;信号灯即时 API |
| 连接 | 路口连接、行驶动作、手工候选 | 默认收起 | override 暂存 |
| 高级 | 复杂路口候选、技术 JSON | 始终默认收起 | 候选沿用现有调用 |
每个分段使用受控 React 状态,而非依赖原生 `<details>` 的不可观察状态;这让地图选中
事件可以可靠地展开相应段,且移动端与桌面端保持同一状态模型。分段标题显示摘要
(如参数修改数、所选第几车道、连接数量),但不复制任何几何或约束值。
车道箭头在元素段显示 maneuver 选择、距路口端的米数读数和有限数值输入。数值输入与
拖曳都写同一 `lane-maneuver.placementDistanceMeters`;客户端只限制为有限非负值,控制
设施与端点安全位置仍由正式编译的 `nearestSafeTurnArrowPlacement()` 权威裁决。
为避免继续膨胀 `App.tsx`,右栏容器、对象摘要、手风琴、道路/连接/元素分段应迁入
`workbench/client/src/components/`。现有 `ParameterPanel` 保持其 manifest 值所有权和
DOM 直写性能策略,只作为“道路”分段的内容,不被重写为另一条输入链路。
@@ -82,3 +82,16 @@ npm run build
- `workbench/client/src/edit/projection.ts`:`projectHandleValue` 的夹值是拖拽正确性的一部分(见其 75 行注释),不得为"统一行为"而移除。 - `workbench/client/src/edit/projection.ts`:`projectHandleValue` 的夹值是拖拽正确性的一部分(见其 75 行注释),不得为"统一行为"而移除。
- `workbench/client/src/edit/preview-request.ts`:防抖与 `previewSeq` 仲裁由两条通道共用,任何改动同时影响拖拽。 - `workbench/client/src/edit/preview-request.ts`:防抖与 `previewSeq` 仲裁由两条通道共用,任何改动同时影响拖拽。
- `src/compile/direct-edit-solver.js`:**本任务不改**。若发现必须改,先确认不是把服务端校验缺口混进了本任务范围。 - `src/compile/direct-edit-solver.js`:**本任务不改**。若发现必须改,先确认不是把服务端校验缺口混进了本任务范围。
## 右侧工作台扩展(2026-09-01)
1. 抽出受控手风琴和选择对象摘要组件,建立“道路 / 元素 / 连接 / 高级”四段及其
自动展开规则;先用静态现有内容验证不改变写入行为。
2. 将现有 `Inspector` 的道路覆盖、连接、候选和技术详情迁入对应分段;将标线、箭头、
信号迁入元素分段。保留 `ParameterPanel` 的 API 和直接编辑数据流。
3. 补充箭头位置的米数读数和精确输入,与拖曳使用同一 staged override;输入非法值不暂存。
4. 用组件/纯逻辑单测覆盖自动展开、分段摘要、箭头位置写入和不同写入语义;手测桌面及
窄屏的空间、焦点和滚动。
5. 执行 `npm run format:check`、`npm run test`、`npm run test:client`、
`npm run test:client:unit`、`npm run build`,并验证选箭头、标线、信号、道路与连接的
现有保存流程未回归。
@@ -97,3 +97,22 @@
服务端只校验 finite/非负,不校验 manifest 的 `min`/`max`;而外缘偏移范围随道路宽度浮动,意味着保存时合法的值可能在几何变化后越界。这类越界**客户端结构上无法拦截**——它发生在保存之后的求解期。 服务端只校验 finite/非负,不校验 manifest 的 `min`/`max`;而外缘偏移范围随道路宽度浮动,意味着保存时合法的值可能在几何变化后越界。这类越界**客户端结构上无法拦截**——它发生在保存之后的求解期。
`design.md` 已为 `boundaryIndex` 定义了同类规则("重放时若车道数变化导致越界,该约束转 `stale`"),数值范围越界应当同等处理。属重放正确性,独立成任务。 `design.md` 已为 `boundaryIndex` 定义了同类规则("重放时若车道数变化导致越界,该约束转 `stale`"),数值范围越界应当同等处理。属重放正确性,独立成任务。
## 右侧工作台扩展(2026-09-01)
当前右侧栏将道路基础覆盖、直接编辑参数、路口连接、车道转向箭头、标线样式、
原生信号灯、复杂路口候选和技术 JSON 直接按顺序堆叠,缺少所选对象摘要、明确的
编辑上下文和一致的表单层级。用户确认本轮应覆盖全部既有编辑器,而非只处理道路
参数或车道箭头。
拟纳入范围:
- 统一右侧栏的对象摘要、未保存/即时保存状态和表单布局。
- 重新组织道路、元素、连接、调试/技术详情中的全部既有表单与信息展示。
- 为车道转向箭头补足距路口位置的可读数与精确输入,继续复用
`placementDistanceMeters` 覆盖和既有拖曳行为。
- 保持各写入语义:普通 override 继续暂存并经保存/重新生成生效;信号灯继续走
现有即时 API;直接编辑继续走 manifest/preview/session 链路。
已决 UX:右栏使用手风琴式可折叠分段,以控制地图工作台中的垂直空间占用。
所选地图元素的关联编辑段自动展开;调试与技术详情默认收起。
+135 -68
View File
@@ -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 { Download, RefreshCw, Save, Upload } from 'lucide-react';
import { api, isVersionConflict } from './lib/api'; import { api, isVersionConflict } from './lib/api';
import { MapCanvas } from './components/MapCanvas'; import { MapCanvas } from './components/MapCanvas';
import { ParameterPanel, type ParameterPanelHandle } from './components/ParameterPanel'; import { ParameterPanel, type ParameterPanelHandle } from './components/ParameterPanel';
import { InspectorSection } from './components/InspectorSection';
import { import {
elementSelectionFor, elementSelectionFor,
groupMembers, groupMembers,
@@ -45,21 +46,21 @@ import type { GeoFeature, GeoJson, Override, Road, WorkbenchState } from './type
import type { LayerName } from './map/layers'; import type { LayerName } from './map/layers';
const layerLabels: Array<[LayerName, string]> = [ const layerLabels: Array<[LayerName, string]> = [
['osm', 'OSM 道路中心线'], ['osm', '方向道路参考线'],
['native', '自研道路与路口面'], ['native', '自研道路与路口面'],
['sidewalks', '路缘与步行带'], ['sidewalks', '路缘与步行带'],
['lanes', '车道与转向路径'], ['lanes', '车道与转向路径'],
['directionArrows', '道路方向箭头'], ['directionArrows', '道路方向箭头'],
['markings', '车道分隔线与路口转向箭头'], ['markings', '车道分隔线与路口转向箭头'],
['centerLines', '道路中心线'], ['centerLines', '道路中央标线'],
['edgeLines', '道路外缘线'], ['edgeLines', '道路外缘线'],
['controls', '斑马线与停止线'], ['controls', '斑马线与停止线'],
['signals', '红绿灯设施'], ['signals', '红绿灯设施'],
['reference', 'osm2streets 参考面'],
]; ];
const defaultLayers = Object.fromEntries( const defaultLayers = Object.fromEntries(layerLabels.map(([key]) => [key, key !== 'edgeLines'])) as Record<
layerLabels.map(([key]) => [key, key !== 'edgeLines' && key !== 'reference']), LayerName,
) as Record<LayerName, boolean>; boolean
>;
const direction = (road: Road) => (road.direction === 'forward' ? '沿 OSM 方向' : '逆 OSM 方向'); const direction = (road: Road) => (road.direction === 'forward' ? '沿 OSM 方向' : '逆 OSM 方向');
const label = (road: Road) => road.tags.name || `${road.highway}(OSM ${road.osmWayIds.join(', ')})`; const label = (road: Road) => road.tags.name || `${road.highway}(OSM ${road.osmWayIds.join(', ')})`;
const laneIndex = (id: string) => Number(id.split(':').at(-1)); const laneIndex = (id: string) => Number(id.split(':').at(-1));
@@ -86,14 +87,6 @@ function Overview({ comparison }: { comparison: Record<string, unknown> }) {
</div> </div>
))} ))}
</div> </div>
<div className="overview-status">
<span>osm2streets 参考面</span>
<strong>
{comparison.osm2streetsAvailable === true
? `${Number(comparison.osm2streetsRoadSurfaceFeatures || 0)} 个`
: '未提供'}
</strong>
</div>
{severity && ( {severity && (
<div className="overview-diagnostics"> <div className="overview-diagnostics">
<span>编译诊断</span> <span>编译诊断</span>
@@ -562,9 +555,8 @@ function App() {
const diagnostics = state.compiled.diagnostics.filter( const diagnostics = state.compiled.diagnostics.filter(
(item) => (item) =>
item.rule !== 'ordinary-junction-surface' && item.rule !== 'ordinary-junction-surface' &&
(filter === 'all' || filter === 'candidates' (filter === 'all' ||
? Boolean(item.manualCandidates?.length) (filter === 'candidates' ? Boolean(item.manualCandidates?.length) : !item.manualCandidates?.length)),
: !item.manualCandidates?.length),
); );
const handleFeature = (properties: Record<string, unknown>) => { const handleFeature = (properties: Record<string, unknown>) => {
setMarking(properties); setMarking(properties);
@@ -643,24 +635,35 @@ function App() {
<main> <main>
<aside className="issues"> <aside className="issues">
<h1>图层</h1> <h1>图层</h1>
{layerLabels.map(([key, text]) => ( {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}> <label key={key}>
<input <input
type="checkbox" type="checkbox"
checked={layers[key]} checked={layers[key]}
disabled={hiddenInScene}
onChange={(event) => setLayers({ ...layers, [key]: event.target.checked })} onChange={(event) => setLayers({ ...layers, [key]: event.target.checked })}
/>{' '} />{' '}
{text} {text}
{hiddenInScene ? '(场景模式中隐藏)' : ''}
</label> </label>
))} );
})}
<hr /> <hr />
<h1>当前编译概览</h1> <details className="issues-details">
<Overview comparison={state.comparison} /> <summary>待检查问题({diagnostics.length})</summary>
<hr /> <div className="issue-tabs" role="tablist" aria-label="问题筛选">
<h1>待检查问题</h1>
<div className="segmented">
{(['all', 'candidates', 'other'] as const).map((kind) => ( {(['all', 'candidates', 'other'] as const).map((kind) => (
<Button className={filter === kind ? 'active' : ''} onClick={() => setFilter(kind)} key={kind}> <Button
className={filter === kind ? 'active' : ''}
role="tab"
aria-selected={filter === kind}
onClick={() => setFilter(kind)}
key={kind}
>
{kind === 'all' ? '全部' : kind === 'candidates' ? '可连接' : '其他'} {kind === 'all' ? '全部' : kind === 'candidates' ? '可连接' : '其他'}
</Button> </Button>
))} ))}
@@ -680,6 +683,12 @@ function App() {
</li> </li>
))} ))}
</ul> </ul>
</details>
<hr />
<details className="overview-details">
<summary>当前编译概览</summary>
<Overview comparison={state.comparison} />
</details>
</aside> </aside>
<MapCanvas <MapCanvas
state={state} state={state}
@@ -746,6 +755,16 @@ function App() {
}} }}
/> />
<aside className="inspector"> <aside className="inspector">
<Inspector
road={selected}
state={state}
staged={staged}
marking={marking}
element={element}
stage={stage}
status={setStatus}
setState={setState}
>
{directEditEnabled ? ( {directEditEnabled ? (
<ParameterPanel <ParameterPanel
handles={editHandles} handles={editHandles}
@@ -757,16 +776,7 @@ function App() {
onReset={resetHandle} onReset={resetHandle}
/> />
) : null} ) : null}
<Inspector </Inspector>
road={selected}
state={state}
staged={staged}
marking={marking}
element={element}
stage={stage}
status={setStatus}
setState={setState}
/>
</aside> </aside>
</main> </main>
</> </>
@@ -815,6 +825,7 @@ function Inspector({
stage, stage,
status, status,
setState, setState,
children,
}: { }: {
road: Road | null; road: Road | null;
state: WorkbenchState; state: WorkbenchState;
@@ -824,6 +835,7 @@ function Inspector({
stage: (item: Override) => void; stage: (item: Override) => void;
status: (value: string) => void; status: (value: string) => void;
setState: (next: WorkbenchState) => void; setState: (next: WorkbenchState) => void;
children?: ReactNode;
}) { }) {
const [width, setWidth] = useState(0); const [width, setWidth] = useState(0);
const [lanes, setLanes] = useState(1); const [lanes, setLanes] = useState(1);
@@ -856,11 +868,33 @@ function Inspector({
}; };
const signalUid = typeof marking?.signal_uid === 'string' ? marking.signal_uid : ''; const signalUid = typeof marking?.signal_uid === 'string' ? marking.signal_uid : '';
const signal = state.trafficSignals.assemblies.features.find((item) => item.properties?.signal_uid === signalUid); 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 const [open, setOpen] = useState<'road' | 'element' | 'connections' | 'advanced' | null>('road');
// panel can share the column. Same markup, one level up. 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 ( return (
<> <section className="workbench-inspector">
<h1>当前道路设置</h1> <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 ? ( {road ? (
<form <form
onSubmit={(event) => { onSubmit={(event) => {
@@ -930,10 +964,27 @@ function Inspector({
) : ( ) : (
<p>点击道路、车道、标线、转向路径或路口面以查看详情。</p> <p>点击道路、车道、标线、转向路径或路口面以查看详情。</p>
)} )}
<hr /> {children}
<h2>路口连接与行驶动作</h2> </InspectorSection>
{road && <InspectorSection
state.compiled.model.connections 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) .filter((connection) => connection.fromEndpointId === endpoint?.id)
.map((connection) => ( .map((connection) => (
<label key={connection.id}> <label key={connection.id}>
@@ -972,6 +1023,10 @@ function Inspector({
{movement.geometryStatus || 'connector'}) {movement.geometryStatus || 'connector'})
</label> </label>
))} ))}
</div>
) : (
<p className="form-context">选择一条道路以管理其驶入路口的连接。</p>
)}
{endpoint && {endpoint &&
state.compiled.diagnostics state.compiled.diagnostics
.find((item) => item.endpointId === endpoint.id) .find((item) => item.endpointId === endpoint.id)
@@ -998,9 +1053,8 @@ function Inspector({
</Button> </Button>
) : null; ) : null;
})} })}
<MarkingEditor marking={marking} stage={stage} /> </InspectorSection>
<LaneManeuverEditor element={element} overrides={[...state.overrides.overrides, ...staged]} stage={stage} /> <InspectorSection title="高级" summary="候选与来源" open={open === 'advanced'} onToggle={section('advanced')}>
<SignalEditor state={state} signal={signal} status={status} update={updateSignal} />
<Candidates state={state} setState={setState} status={status} /> <Candidates state={state} setState={setState} status={status} />
<details> <details>
<summary>技术详情与来源</summary> <summary>技术详情与来源</summary>
@@ -1012,7 +1066,8 @@ function Inspector({
)} )}
</pre> </pre>
</details> </details>
</> </InspectorSection>
</section>
); );
} }
const MANEUVER_OPTIONS: Array<[string, string]> = [ const MANEUVER_OPTIONS: Array<[string, string]> = [
@@ -1041,27 +1096,26 @@ function LaneManeuverEditor({
.find((item) => item.kind === 'lane-maneuver' && item.laneId === element.laneId); .find((item) => item.kind === 'lane-maneuver' && item.laneId === element.laneId);
const id = override?.id || `车道转向:${element.laneId}`; const id = override?.id || `车道转向:${element.laneId}`;
const maneuver = typeof override?.maneuver === 'string' ? override.maneuver : element.maneuver; const maneuver = typeof override?.maneuver === 'string' ? override.maneuver : element.maneuver;
return ( const placementDistanceMeters =
<form> typeof override?.placementDistanceMeters === 'number'
<hr /> ? override.placementDistanceMeters
<h2>车道转向箭头</h2> : (element.placementDistanceMeters ?? 6);
<output>第 {laneIndex(element.laneId)} 车道</output> const update = (next: Partial<Pick<Override, 'maneuver' | 'placementDistanceMeters'>>) =>
<label>
转向
<select
value={maneuver}
onChange={(event) =>
stage({ stage({
id, id,
kind: 'lane-maneuver', kind: 'lane-maneuver',
laneId: element.laneId, laneId: element.laneId,
maneuver: event.target.value, maneuver: typeof next.maneuver === 'string' ? next.maneuver : maneuver,
...(typeof override?.placementDistanceMeters === 'number' placementDistanceMeters:
? { placementDistanceMeters: override.placementDistanceMeters } typeof next.placementDistanceMeters === 'number' ? next.placementDistanceMeters : placementDistanceMeters,
: {}), });
}) return (
} <form className="element-form">
> <h2>车道转向箭头</h2>
<p className="form-context">第 {laneIndex(element.laneId)} 车道。拖曳地图中的虚线箭头可粗调位置。</p>
<label>
转向
<select value={maneuver} onChange={(event) => update({ maneuver: event.target.value })}>
{MANEUVER_OPTIONS.map(([value, label]) => ( {MANEUVER_OPTIONS.map(([value, label]) => (
<option value={value} key={value}> <option value={value} key={value}>
{label} {label}
@@ -1069,6 +1123,20 @@ function LaneManeuverEditor({
))} ))}
</select> </select>
</label> </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> </form>
); );
} }
@@ -1119,12 +1187,12 @@ function MarkingEditor({
}; };
return ( return (
<form <form
className="element-form"
onSubmit={(event) => { onSubmit={(event) => {
event.preventDefault(); event.preventDefault();
save(); save();
}} }}
> >
<hr />
<h2>标线样式</h2> <h2>标线样式</h2>
<label> <label>
样式 样式
@@ -1168,8 +1236,7 @@ function SignalEditor({
); );
}; };
return ( return (
<section> <section className="element-form">
<hr />
<h2>原生红绿灯</h2> <h2>原生红绿灯</h2>
<Button <Button
onClick={() => 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>
);
}
+10 -4
View File
@@ -91,6 +91,8 @@ export function MapCanvas({
const handleLayerRef = useRef<EditHandleLayer | null>(null); const handleLayerRef = useRef<EditHandleLayer | null>(null);
const ghostRef = useRef<EditGhostLayer | null>(null); const ghostRef = useRef<EditGhostLayer | null>(null);
const previewRef = useRef<EditPreviewLayer | 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 laneSelectionSourceRef = useRef<VectorSource | null>(null);
const laneSelectionFeaturesRef = useRef<Feature[]>([]); const laneSelectionFeaturesRef = useRef<Feature[]>([]);
const laneSelectionAnchorRef = useRef<Coordinate | null>(null); const laneSelectionAnchorRef = useRef<Coordinate | null>(null);
@@ -139,6 +141,9 @@ export function MapCanvas({
laneSelectionAnchorRef.current = laneSelectionAnchor ?? null; laneSelectionAnchorRef.current = laneSelectionAnchor ?? null;
useEffect(() => { useEffect(() => {
if (!target.current) return; 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( const layers = createLayers(
() => selectedRef.current, () => selectedRef.current,
() => sceneRef.current, () => sceneRef.current,
@@ -290,7 +295,10 @@ export function MapCanvas({
if (!layers || !map) return; if (!layers || !map) return;
updateLayers(layers, state, selected); updateLayers(layers, state, selected);
const extent = layers.osm.getSource()!.getExtent(); 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]); }, [state]);
useEffect(() => { useEffect(() => {
const layers = layersRef.current; const layers = layersRef.current;
@@ -344,9 +352,7 @@ export function MapCanvas({
if (!layers) return; if (!layers) return;
Object.entries(visible).forEach(([name, enabled]) => Object.entries(visible).forEach(([name, enabled]) =>
layers[name as LayerName]?.setVisible( layers[name as LayerName]?.setVisible(
!scene || !['osm', 'lanes', 'reference', 'gaodeReference', 'connectors'].includes(name) !scene || !['osm', 'lanes', 'connectors'].includes(name) ? enabled !== false : false,
? enabled !== false
: false,
), ),
); );
layers.native.changed(); layers.native.changed();
+3 -4
View File
@@ -14,7 +14,6 @@ import type { Road, WorkbenchState } from '../types/state';
const geojson = new GeoJSON(); const geojson = new GeoJSON();
const source = () => new VectorSource(); const source = () => new VectorSource();
export type LayerName = export type LayerName =
| 'reference'
| 'native' | 'native'
| 'sidewalks' | 'sidewalks'
| 'osm' | 'osm'
@@ -36,7 +35,6 @@ export function createLayers(
const simple = (color: string, width = 1) => const simple = (color: string, width = 1) =>
new Style({ fill: new Fill({ color: `${color}55` }), stroke: new Stroke({ color, width }) }); new Style({ fill: new Fill({ color: `${color}55` }), stroke: new Stroke({ color, width }) });
const layers: Record<LayerName, VectorLayer<VectorSource>> = { const layers: Record<LayerName, VectorLayer<VectorSource>> = {
reference: new VectorLayer({ source: source(), visible: false, style: simple('#8999a0') }),
native: new VectorLayer({ native: new VectorLayer({
source: source(), source: source(),
style: () => (scene() ? new Style({ fill: new Fill({ color: '#3f4b50' }) }) : simple('#296956')), style: () => (scene() ? new Style({ fill: new Fill({ color: '#3f4b50' }) }) : simple('#296956')),
@@ -83,7 +81,9 @@ export function createLayers(
const solid = feature.get('pattern') === 'solid'; const solid = feature.get('pattern') === 'solid';
return new Style({ return new Style({
fill: new Fill({ color }), 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.clear();
target.addFeatures(features(value)); target.addFeatures(features(value));
}; };
put('reference', state.layers.osm2streetsRoadSurface);
put('native', state.layers.nativeRoadSurface); put('native', state.layers.nativeRoadSurface);
get('native').addFeatures(features(state.layers.nativeIntersectionSurface)); get('native').addFeatures(features(state.layers.nativeIntersectionSurface));
put('sidewalks', state.layers.nativeSidewalkSurface); put('sidewalks', state.layers.nativeSidewalkSurface);
+160
View File
@@ -47,6 +47,7 @@ aside {
} }
.inspector { .inspector {
border-left: 1px solid #d5dfda; border-left: 1px solid #d5dfda;
padding: 12px;
} }
.map { .map {
min-height: 400px; min-height: 400px;
@@ -120,6 +121,52 @@ ul {
background: #fff7e5; background: #fff7e5;
border-color: #e7c67b; 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 { .segmented {
display: flex; display: flex;
} }
@@ -331,3 +378,116 @@ pre {
.parameter-reset:hover { .parameter-reset:hover {
color: #c2452f; 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;
}