Compare commits
22
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a4dfbf884a | ||
|
|
82dcb83663 | ||
|
|
7e8fcd82ed | ||
|
|
eaa7c08f6a | ||
|
|
113ea54535 | ||
|
|
009fe34f79 | ||
|
|
7883a451c5 | ||
|
|
620127031e | ||
|
|
5704b51315 | ||
|
|
969b57106f | ||
|
|
7d4b3b566a | ||
|
|
5cde08090e | ||
|
|
b78cb6e990 | ||
|
|
b44c995457 | ||
|
|
2469cfdbff | ||
|
|
284d3dbedb | ||
|
|
f542a64924 | ||
|
|
d5c58b5b0c | ||
|
|
73707dabbe | ||
|
|
5220c6b2a2 | ||
|
|
d7c2e13124 | ||
|
|
e7bc7f82b1 |
No files matched your search
@@ -147,6 +147,11 @@ cp config/examples/template.json config/areas/my-area.json
|
|||||||
| `junctionTemplates.clusters[].cornerRadiusMeters` | `12`(4–25) | 仅 `complex-junction-v1`:相邻进口夹角处路缘圆角的半径。圆角切于两侧最外道路边缘,只补齐夹角处的路面,不改变 connector、信号或停止线。 |
|
| `junctionTemplates.clusters[].cornerRadiusMeters` | `12`(4–25) | 仅 `complex-junction-v1`:相邻进口夹角处路缘圆角的半径。圆角切于两侧最外道路边缘,只补齐夹角处的路面,不改变 connector、信号或停止线。 |
|
||||||
| `junctionTemplates.clusters[].outerRadiusExtraMeters` | `18`(18–35) | 仅 `complex-junction-v1`:路口中心到外部进口交接边界的额外半径。用于让圆角包住角部斑马线;未配置时保持原有 18 m。 |
|
| `junctionTemplates.clusters[].outerRadiusExtraMeters` | `18`(18–35) | 仅 `complex-junction-v1`:路口中心到外部进口交接边界的额外半径。用于让圆角包住角部斑马线;未配置时保持原有 18 m。 |
|
||||||
|
|
||||||
|
`junctionTemplates.references[*].referenceFile` 与
|
||||||
|
`junctionTemplates.clusters[*].referenceFile` 是唯一允许相对写法的路径:相对当前
|
||||||
|
`config/areas/<id>.json` 解析。`readAreaConfig()` 会先将其规范化为绝对路径,再通过
|
||||||
|
`toRoadCompilerInput()` 传入 road compiler;包内不得自行解析相对路径或读取配置文件。
|
||||||
|
|
||||||
### `v2xPreview`
|
### `v2xPreview`
|
||||||
|
|
||||||
这是 Cesium 验证预览的可选实时叠加层,不进入发布的 `package/`。默认值:
|
这是 Cesium 验证预览的可选实时叠加层,不进入发布的 `package/`。默认值:
|
||||||
|
|||||||
@@ -1464,6 +1464,72 @@ parity 校验依赖 stage 的 stdout 标记来判断阶段是否跑到(如 `SC
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## Native Road Parity
|
||||||
|
|
||||||
|
### 1. Scope / Trigger
|
||||||
|
|
||||||
|
拆分 native road compiler、移动其模块,或声称 native-road JSON / GeoJSON 未变化时,
|
||||||
|
用 `scripts/road-parity.js`。它独立于 build stage,只读现有 native-road 输出。
|
||||||
|
|
||||||
|
### 2. Signatures
|
||||||
|
|
||||||
|
```bash
|
||||||
|
node scripts/road-parity.js --config config/areas/<area>.json --snapshot <out.json>
|
||||||
|
node scripts/road-parity.js --config config/areas/<area>.json --compare <baseline.json>
|
||||||
|
```
|
||||||
|
|
||||||
|
`--config` 必填,且 `--snapshot` 与 `--compare` 必须二选一。
|
||||||
|
|
||||||
|
### 3. Contracts
|
||||||
|
|
||||||
|
- 快照覆盖 `outputs/<area>/native-road/` 下全部文件和同级
|
||||||
|
`native-traffic-signals.json`。
|
||||||
|
- 普通 JSON 递归按对象 key 排序后生成 `contentHash`。
|
||||||
|
- GeoJSON 同时生成排序 feature 的 `contentHash` 与原序 `orderHash`;任一不同都算
|
||||||
|
parity 失败。
|
||||||
|
- 绝对路径归一化为 `<repo>/...` 或 `<external>/<basename>`,随机
|
||||||
|
`native-road-*` staging 名归一化为 `<staging>`。坐标不做容差或舍入。
|
||||||
|
|
||||||
|
### 4. Validation & Error Matrix
|
||||||
|
|
||||||
|
| 条件 | 结果 |
|
||||||
|
|---|---|
|
||||||
|
| 缺 `--config` 或同时/均未传 snapshot、compare | 打印 usage,退出非零 |
|
||||||
|
| native-road 输出目录不存在 | 抛出 `Native road output not found`,退出非零 |
|
||||||
|
| baseline 缺文件、出现额外文件或任一 hash/count/bytes 不同 | 每项打印 `ROAD_PARITY_DIFF`,退出非零 |
|
||||||
|
| 完全一致 | 打印 `ROAD_PARITY_OK`,退出 0 |
|
||||||
|
|
||||||
|
### 5. Good/Base/Bad Cases
|
||||||
|
|
||||||
|
- Good: 移动编译器前后,两个 hash 均一致。
|
||||||
|
- Base: 绝对 OSM 输入路径变化但归一化后内容一致。
|
||||||
|
- Bad: 只比较排序后的 GeoJSON 内容并忽略 `orderHash`,会掩盖输出顺序漂移。
|
||||||
|
|
||||||
|
### 6. Tests Required
|
||||||
|
|
||||||
|
- `npm run test:road-parity`:相等基线、顺序 hash 变化与缺文件都应被断言。
|
||||||
|
- `node --check scripts/road-parity.js`。
|
||||||
|
- 对每个受支持区域运行 `--compare` 对已提交基线自比对。
|
||||||
|
- 迁移前先连续编译两次;只有 control 实验全绿,基线才可作为 oracle。
|
||||||
|
|
||||||
|
### 7. Wrong vs Correct
|
||||||
|
|
||||||
|
Wrong:
|
||||||
|
|
||||||
|
```js
|
||||||
|
// Sorting hides a changed feature order.
|
||||||
|
assert.equal(sortedContentHash, baseline.contentHash);
|
||||||
|
```
|
||||||
|
|
||||||
|
Correct:
|
||||||
|
|
||||||
|
```js
|
||||||
|
assert.equal(contentHash, baseline.contentHash);
|
||||||
|
assert.equal(orderHash, baseline.orderHash);
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## 反模式
|
## 反模式
|
||||||
|
|
||||||
| 反模式 | 后果 |
|
| 反模式 | 后果 |
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
| 改复合路口几何(`buildComplexJunctionGeometry`、车道控制避让、人行道转角) | [CLI 与阶段](./cli-and-stages.md#可编辑信号设施与运行时锚点的跨阶段消费) 的复合路口小节 |
|
| 改复合路口几何(`buildComplexJunctionGeometry`、车道控制避让、人行道转角) | [CLI 与阶段](./cli-and-stages.md#可编辑信号设施与运行时锚点的跨阶段消费) 的复合路口小节 |
|
||||||
| 改预览页生成 | [../preview/](../preview/index.md) |
|
| 改预览页生成 | [../preview/](../preview/index.md) |
|
||||||
| 声称"纯重构,产物不变" | [产物一致性指南](../guides/artifact-parity-guide.md) |
|
| 声称"纯重构,产物不变" | [产物一致性指南](../guides/artifact-parity-guide.md) |
|
||||||
|
| Native road compiler CLI、输入或完成标记 | [编译器契约指针](./native-road-package.md) |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -46,8 +47,8 @@ config/areas/<id>.json
|
|||||||
│ → 重建 scene.geojson + scene_style.json
|
│ → 重建 scene.geojson + scene_style.json
|
||||||
│ → _pipeline/stages/reimport.manifest.json
|
│ → _pipeline/stages/reimport.manifest.json
|
||||||
│
|
│
|
||||||
├─[blender]───────▶ compile-native-roads.js + Blender + blender/generate_scene.py
|
├─[blender]───────▶ native-road ZIP importer + Blender + blender/generate_scene.py
|
||||||
│ 默认读 .osm + native-road/
|
│ 默认读 .osm + validated ZIP cache/
|
||||||
│ → <id>.blend + <id>.png
|
│ → <id>.blend + <id>.png
|
||||||
│ → _pipeline/stages/blender.manifest.json
|
│ → _pipeline/stages/blender.manifest.json
|
||||||
│
|
│
|
||||||
|
|||||||
@@ -0,0 +1,62 @@
|
|||||||
|
# Native Road Package Contract
|
||||||
|
|
||||||
|
The native-road package is maintained in the private `road-compiler` repository:
|
||||||
|
|
||||||
|
`https://git.app.que01.top/que01/road-compiler`
|
||||||
|
|
||||||
|
The host consumes a read-only ZIP exported by the private `road-compiler` repository. The host never installs or invokes the compiler. `nativeRoadPackage` is resolved relative to the area config, hashed, validated, and extracted into `_pipeline/native-road-import/<sha256>/` before native consumers start.
|
||||||
|
|
||||||
|
The completion marker is `NATIVE_ROAD_COMPILE_DONE <json>`. `build-area.js` validates the marker's count, JSON payload, area id, output path, process status, and signal before starting Blender.
|
||||||
|
|
||||||
|
## Scope / Trigger
|
||||||
|
|
||||||
|
This contract applies to native-road consumption from `scripts/build-area.js`, diagnostics, parity, Blender, and native preview generation.
|
||||||
|
|
||||||
|
## Signatures
|
||||||
|
|
||||||
|
```text
|
||||||
|
road-compiler --input <RoadCompilerInput.json>
|
||||||
|
```
|
||||||
|
|
||||||
|
`RoadCompilerInput` contains `areaId`, absolute `osmFile`, `outDir`, `stagingDir`, `overridesFile`, `trafficSignalsFile`, optional `comparisonDir`, and `options`.
|
||||||
|
|
||||||
|
## Contracts
|
||||||
|
|
||||||
|
The compiler writes `compiled.json`, `diagnostics.json`, `comparison.json`, signal runtime files, `manifest.json`, and GeoJSON layers under `outDir`. Since `native-road-package/v1.1`, `manifest.json` is required: it declares every GeoJSON source, whether its role is renderable (`surface` / `marking`) or semantic, and the host material slot for renderable layers. The Blender adapter rejects a missing or invalid manifest, a declared/published GeoJSON mismatch, and an unknown material slot. On success stdout contains exactly one marker whose JSON includes `areaId`, `roads`, `endpoints`, `diagnostics`, and `output`.
|
||||||
|
|
||||||
|
## Validation & Error Matrix
|
||||||
|
|
||||||
|
| Condition | Required result |
|
||||||
|
|---|---|
|
||||||
|
| CLI cannot start | throw the spawn error |
|
||||||
|
| non-zero exit or signal | fail with status/signal |
|
||||||
|
| zero completion markers | fail |
|
||||||
|
| multiple completion markers | fail |
|
||||||
|
| malformed marker JSON | fail |
|
||||||
|
| marker `areaId` or `output` mismatch | fail |
|
||||||
|
|
||||||
|
## Good / Base / Bad Cases
|
||||||
|
|
||||||
|
- Good: host writes an absolute input JSON, runs the installed exact-tag CLI, validates one marker, then starts Blender.
|
||||||
|
- Base: compiler emits deterministic files and no optional comparison source exists.
|
||||||
|
- Bad: host imports compiler source, reads `config/areas` inside the package, or accepts a missing/duplicate marker.
|
||||||
|
|
||||||
|
## Tests Required
|
||||||
|
|
||||||
|
- `scripts/test-road-compiler-cli.js` asserts marker success, missing, duplicate, malformed, area mismatch, and output mismatch cases.
|
||||||
|
- `scripts/road-parity.js` compares `contentHash`, `orderHash`, feature counts, and byte counts for both supported areas.
|
||||||
|
- `npm run test:road-workbench` asserts the workbench is loaded from the installed package.
|
||||||
|
|
||||||
|
## Wrong vs Correct
|
||||||
|
|
||||||
|
Wrong:
|
||||||
|
|
||||||
|
```js
|
||||||
|
require("../packages/road-compiler/src/compile/compiler");
|
||||||
|
```
|
||||||
|
|
||||||
|
Correct:
|
||||||
|
|
||||||
|
```js
|
||||||
|
spawnSync(process.execPath, [compilerCli(), "--input", inputFile]);
|
||||||
|
```
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"_example": "Fill with {\"file\": \"<path>\", \"reason\": \"<why>\"}. Put spec/research files only — no code paths. Run `python3 .trellis/scripts/get_context.py --mode packages` to list available specs. Delete this line once real entries are added."}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"_example": "Fill with {\"file\": \"<path>\", \"reason\": \"<why>\"}. Put spec/research files only — no code paths. Run `python3 .trellis/scripts/get_context.py --mode packages` to list available specs. Delete this line once real entries are added."}
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
# 后续计划:drawtonomy 扩展 PoC
|
||||||
|
|
||||||
|
前置任务:`08-25-road-compiler-extraction` 的 Phase 0-3 完成并完成验收。
|
||||||
|
评估依据:父任务归档前的 `design.md` §4 决策记录 D1 / D2 / D3。
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
|
||||||
|
在**编译器仓库内**实现一个 drawtonomy 扩展:把编译产物注入其浏览器编辑器,
|
||||||
|
回读快照后走其开源导出器产出 OpenDRIVE / Lanelet2。
|
||||||
|
|
||||||
|
定位是 **PoC,不进关键路径**。目的是验证「编译器当 scene generator +
|
||||||
|
drawtonomy 当编辑器与工业格式后端」这条链路是否值得投入。
|
||||||
|
|
||||||
|
## 前提认知(已核实)
|
||||||
|
|
||||||
|
必须先明确,否则会做错方向:
|
||||||
|
|
||||||
|
- **drawtonomy 编辑器闭源**,克隆仓库只有 SDK / dev-server / mcp-server。
|
||||||
|
README 卖点里的 topology-aware lanes、lane tool、intersection templates、
|
||||||
|
Map→lanes 全部不在开源代码内。
|
||||||
|
- **它不做 raw OSM 推导**。`exporter/osmParser.ts` 是 Lanelet2 解析器
|
||||||
|
(车道左右边界已显式)。整个 exporter 目录 grep `highway` 命中 1 次且是
|
||||||
|
车道类型字符串。→ **不能替代本编译器**,只能做下游。
|
||||||
|
- **junctionTools 不能做成扩展**:无 canvas/overlay 能力、无工具注册、
|
||||||
|
**无任何 change 事件推送**(`ExtensionClient.handleMessage` 入站只有
|
||||||
|
`ext:init` / 5 个 `*-response` / `ext:error`,读取全靠轮询)。
|
||||||
|
→ junction 编辑留在自有 workbench。
|
||||||
|
- **`drawtonomy-dev-server` 是 drawtonomy.com 的缓存代理**(TTL 1 小时),
|
||||||
|
非自托管。宿主协议会漂(manifest 有 `minHostVersion`)。→ 不进关键路径。
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
### R4.1 扩展:编译产物 → 编辑器
|
||||||
|
|
||||||
|
- manifest capabilities:`shapes:write`、`ui:panel`、`snapshot:read`、`ui:notify`
|
||||||
|
- 面板调编译器的本地 HTTP 服务(`road-workbench` 已经是一个 HTTP 服务)取产物
|
||||||
|
- 车道边界 → `createLaneWithBoundaries(leftPoints, rightPoints, opts)` → `addShapes()`
|
||||||
|
- 坐标转换:本项目 WGS84/ENU(米)→ drawtonomy 画布像素。
|
||||||
|
沿用其 `drawtonomy_origin_lat/lon` + `latLonToCanvas` 约定
|
||||||
|
- ⚠️ **借它的结构,不借它的坐标系**:其 `BaseShape.x/y` 是画布像素
|
||||||
|
(`z` 注释明确写 "world units — NOT canvas pixels like x/y")。
|
||||||
|
编译器内部坐标系不得因此改变
|
||||||
|
|
||||||
|
### R4.2 回读 → 工业格式导出
|
||||||
|
|
||||||
|
- `requestSnapshot()` 取回快照
|
||||||
|
- 本地跑其开源 `exportToOpenDrive` / `lanelet2`(Apache-2.0)
|
||||||
|
- 产出 `.xodr` / `.osm`(Lanelet2),用其 `validateOpenDrive` 自校验
|
||||||
|
- Lanelet2 是 Autoware 的输入格式 —— 对本项目 V2X 方向有实际价值
|
||||||
|
|
||||||
|
### R4.3 许可与依赖合规
|
||||||
|
|
||||||
|
- drawtonomy SDK 是 Apache-2.0:借用代码需保留 NOTICE / 署名
|
||||||
|
- 若依赖 drawtonomy.com 托管服务,需查其服务条款(app 非 Apache-2.0)
|
||||||
|
- ESM/CJS 互操作:SDK 是 ESM+TS,编译器是 CJS。
|
||||||
|
本阶段可**局部**引入构建步骤,但仅限扩展目录,不得污染编译器核心
|
||||||
|
(父任务 C2 的边界)
|
||||||
|
|
||||||
|
### R4.4 归属
|
||||||
|
|
||||||
|
扩展代码放**编译器仓库**,不放宿主 —— 符合父任务「独立维护」目标。
|
||||||
|
|
||||||
|
## Acceptance Criteria
|
||||||
|
|
||||||
|
- [ ] AC4.1 扩展能把一个区域的编译产物注入 drawtonomy 编辑器并正确显示车道
|
||||||
|
- [ ] AC4.2 编辑器内手改后回读快照,能导出通过 `validateOpenDrive` 的 `.xodr`
|
||||||
|
- [ ] AC4.3 能导出 Lanelet2 `.osm`
|
||||||
|
- [ ] AC4.4 编译器核心未引入构建步骤(构建仅限扩展目录)
|
||||||
|
- [ ] AC4.5 编译器内部坐标系未因适配画布像素而改变
|
||||||
|
- [ ] AC4.6 Apache-2.0 署名 / NOTICE 已按要求保留
|
||||||
|
- [ ] AC4.7 结论记录:这条链路是否值得继续投入,写入任务 `research/`
|
||||||
|
|
||||||
|
## 启动条件
|
||||||
|
|
||||||
|
- 道路编译器独立化父任务(Phase 0-3)已完成验收。
|
||||||
|
- 编译器仓库、稳定 CLI 与版本化输出契约已可用。
|
||||||
|
- 此任务不阻塞道路编译器抽离或渲染分离的交付。
|
||||||
|
|
||||||
|
## 明确不做
|
||||||
|
|
||||||
|
- junctionTools 做成扩展(API 不支持,见前提认知)
|
||||||
|
- 把 drawtonomy 放进生产构建链路
|
||||||
|
- 用 drawtonomy 替代编译器(D1 已否决)
|
||||||
|
- 自建通用白板编辑器
|
||||||
|
|
||||||
|
## 后续可能(不属本阶段)
|
||||||
|
|
||||||
|
父任务 design §4 的 D3 列了三项值得从 drawtonomy 借用的东西,
|
||||||
|
它们与本阶段独立,应各自开任务:
|
||||||
|
|
||||||
|
- `odrGeometryFit.ts` 的拟合器 → 替掉手调的
|
||||||
|
`approachWidthMultiplier=1.45` / `coreRadiusMeters=28`,改为对 `referenceFile`
|
||||||
|
拟合、残差作质量指标
|
||||||
|
- validator 的 mutation-proven 方法 → 给现有 31 条诊断规则建触发证明
|
||||||
|
- validator 的分层命名空间(`xml.*` / `ref.*` / `junction.*` / `geom.*`)
|
||||||
|
→ 替代当前平铺的 31 条规则
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
{
|
||||||
|
"id": "rc-p4-drawtonomy-ext",
|
||||||
|
"name": "rc-p4-drawtonomy-ext",
|
||||||
|
"title": "后续计划:drawtonomy 扩展 PoC",
|
||||||
|
"description": "道路编译器独立化完成后,评估在编译器仓库内实现 drawtonomy 扩展:编译产物注入编辑器,快照回读后走开源 OpenDRIVE/Lanelet2 导出",
|
||||||
|
"status": "planning",
|
||||||
|
"dev_type": null,
|
||||||
|
"scope": null,
|
||||||
|
"package": null,
|
||||||
|
"priority": "P3",
|
||||||
|
"creator": "dingkang",
|
||||||
|
"assignee": "dingkang",
|
||||||
|
"createdAt": "2026-08-25",
|
||||||
|
"completedAt": null,
|
||||||
|
"branch": null,
|
||||||
|
"base_branch": "main",
|
||||||
|
"worktree_path": null,
|
||||||
|
"commit": null,
|
||||||
|
"pr_url": null,
|
||||||
|
"subtasks": [],
|
||||||
|
"children": [],
|
||||||
|
"parent": null,
|
||||||
|
"relatedFiles": [],
|
||||||
|
"notes": "不属于道路编译器独立化父任务的完成条件。父任务验收完成后,将此任务作为下一项候选任务提示。",
|
||||||
|
"meta": {
|
||||||
|
"follow_up_after": "08-25-road-compiler-extraction"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
# Native Road Parity Baselines
|
||||||
|
|
||||||
|
Generated from commit `25cf82e7c75ea8d881639c4a80648121efbd39f6` on 2026-08-25.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm run road:compile -- --config config/areas/fengshu-er-road.json
|
||||||
|
node scripts/road-parity.js --config config/areas/fengshu-er-road.json \
|
||||||
|
--snapshot .trellis/tasks/08-25-road-compiler-extraction/baseline/fengshu-er-road.json
|
||||||
|
|
||||||
|
npm run road:compile -- --config config/areas/nantaizi-lake-innovation-valley.json
|
||||||
|
node scripts/road-parity.js --config config/areas/nantaizi-lake-innovation-valley.json \
|
||||||
|
--snapshot .trellis/tasks/08-25-road-compiler-extraction/baseline/nantaizi-lake-innovation-valley.json
|
||||||
|
```
|
||||||
|
|
||||||
|
Both samples emit all twelve native-road layers. `fengshu-er-road` enables its
|
||||||
|
configured complex-junction template; `nantaizi-lake-innovation-valley` uses
|
||||||
|
the default, template-free compiler path. `hanyang-block` is an abandoned area
|
||||||
|
and deliberately excluded from this corpus.
|
||||||
|
|
||||||
|
The snapshot normalizes absolute source paths and random `native-road-*`
|
||||||
|
staging names. It does not round coordinates or ignore feature ordering.
|
||||||
@@ -0,0 +1,108 @@
|
|||||||
|
{
|
||||||
|
"contract": "native-road-package/v1",
|
||||||
|
"areaId": "fengshu-er-road",
|
||||||
|
"files": {
|
||||||
|
"../native-traffic-signals.json": {
|
||||||
|
"contentHash": "88e7f0ef4fc7bdb9ef202af018b3fb3179035ffc8ed5eeba03276c263e1f0476",
|
||||||
|
"bytes": 5886
|
||||||
|
},
|
||||||
|
"comparison.json": {
|
||||||
|
"contentHash": "651eb4000a44a7521a79c3e1429795b83d20f8899e0c67c4bb25b56cf4a6f75d",
|
||||||
|
"bytes": 1295
|
||||||
|
},
|
||||||
|
"compiled.json": {
|
||||||
|
"contentHash": "2ab82eafcdab70155078fae3559692ef1fde0645a52c6decbaea762a9ffeb24a",
|
||||||
|
"bytes": 159230
|
||||||
|
},
|
||||||
|
"diagnostics.json": {
|
||||||
|
"contentHash": "1d9fdae06ddcbc19b5262b797a4a35c494fc30a98a66dbfa111533b12c5fdfc7",
|
||||||
|
"bytes": 6862
|
||||||
|
},
|
||||||
|
"layers/center_lines.geojson": {
|
||||||
|
"contentHash": "04db66df5821b319d59297b8515502fabcad95faf083cae19edb338be2f6024b",
|
||||||
|
"orderHash": "04db66df5821b319d59297b8515502fabcad95faf083cae19edb338be2f6024b",
|
||||||
|
"features": 5,
|
||||||
|
"bytes": 6909
|
||||||
|
},
|
||||||
|
"layers/connectors.geojson": {
|
||||||
|
"contentHash": "e7979d4642c7c10f33fb23e92721f22533a851ae1a2b4d35f224d50927bf2fe9",
|
||||||
|
"orderHash": "c327b7b154d4d9ca04cd895523eb0d8ad67c37051ef1d2135b2b46c51e12df58",
|
||||||
|
"features": 90,
|
||||||
|
"bytes": 197885
|
||||||
|
},
|
||||||
|
"layers/crosswalks.geojson": {
|
||||||
|
"contentHash": "354cd4d7ed105a11b95904b44848dce567b3a3383f76755936d8c00691fe29af",
|
||||||
|
"orderHash": "d24376438ac956bde52fcbfa955dd72c2ba31a97995608aaed1c79f6fd3633ab",
|
||||||
|
"features": 152,
|
||||||
|
"bytes": 219286
|
||||||
|
},
|
||||||
|
"layers/direction_arrows.geojson": {
|
||||||
|
"contentHash": "7b8362ad4912c997a7661befde55ddfe58757c3c8d139c15867e1938ea8f6918",
|
||||||
|
"orderHash": "5274e8b433946410a7cdffdaa452c1750e04f53e73a86bf81d034cfb26d4c254",
|
||||||
|
"features": 686,
|
||||||
|
"bytes": 1053308
|
||||||
|
},
|
||||||
|
"layers/edge_lines.geojson": {
|
||||||
|
"contentHash": "ad37fe6278e0c7caf3b77c1c5068a56e18a6c87b78ed5a840ee22a0f961ea7a8",
|
||||||
|
"orderHash": "ad37fe6278e0c7caf3b77c1c5068a56e18a6c87b78ed5a840ee22a0f961ea7a8",
|
||||||
|
"features": 0,
|
||||||
|
"bytes": 52
|
||||||
|
},
|
||||||
|
"layers/intersection_surface.geojson": {
|
||||||
|
"contentHash": "b2022ca70339aa470f3be451bf3ba2f55b59c3900645c864538372173811309f",
|
||||||
|
"orderHash": "b2022ca70339aa470f3be451bf3ba2f55b59c3900645c864538372173811309f",
|
||||||
|
"features": 5,
|
||||||
|
"bytes": 13048
|
||||||
|
},
|
||||||
|
"layers/lane_centerlines.geojson": {
|
||||||
|
"contentHash": "19c550c794810c1071de55dee158295235106a56e3877a2ba10da920ee214593",
|
||||||
|
"orderHash": "67f8e7d33ec578644416e4837dd4aafef62a55aaeb4d438d07ab07eddfbb1df1",
|
||||||
|
"features": 84,
|
||||||
|
"bytes": 73294
|
||||||
|
},
|
||||||
|
"layers/lane_separators.geojson": {
|
||||||
|
"contentHash": "02fdf2c7b6e89c2850a60ea2ac72b9f62910259bdb2949681fcaa7e67d2b51f0",
|
||||||
|
"orderHash": "81782a059c4ff9f69fdf7de9107d20a8d6cf55d34bb0620ec28a9a8c5106c982",
|
||||||
|
"features": 3596,
|
||||||
|
"bytes": 4164106
|
||||||
|
},
|
||||||
|
"layers/road_surface.geojson": {
|
||||||
|
"contentHash": "5a2936a705e64338d0d79b395a13d761f1893dd72330a9b9ee4696ae75eab295",
|
||||||
|
"orderHash": "d8402ae6e772e0778b862b190abfa291de1b02a15537d455f7dcd8596245dfd8",
|
||||||
|
"features": 30,
|
||||||
|
"bytes": 49554
|
||||||
|
},
|
||||||
|
"layers/sidewalk_surface.geojson": {
|
||||||
|
"contentHash": "b6f8f876e9f18fd2ef6749125a09d654c73d986e916bd262ceb9967bca1a54c6",
|
||||||
|
"orderHash": "3fd42a67e18e3b8743fa538428e039ef66a1f44150a6881a7aaa18326607b5cb",
|
||||||
|
"features": 26,
|
||||||
|
"bytes": 54997
|
||||||
|
},
|
||||||
|
"layers/turn_arrows.geojson": {
|
||||||
|
"contentHash": "ad37fe6278e0c7caf3b77c1c5068a56e18a6c87b78ed5a840ee22a0f961ea7a8",
|
||||||
|
"orderHash": "ad37fe6278e0c7caf3b77c1c5068a56e18a6c87b78ed5a840ee22a0f961ea7a8",
|
||||||
|
"features": 0,
|
||||||
|
"bytes": 52
|
||||||
|
},
|
||||||
|
"layers/vehicle_stop_lines.geojson": {
|
||||||
|
"contentHash": "cb904550ab8eec011cf33e5edfa81044de6dfca0280dbfe488e77229055ed590",
|
||||||
|
"orderHash": "8a4b877a17a5af60adc8656465afad6756944736291664139e878d46c5a4f363",
|
||||||
|
"features": 4,
|
||||||
|
"bytes": 4191
|
||||||
|
},
|
||||||
|
"traffic-signal-assemblies.json": {
|
||||||
|
"contentHash": "1788026a0c8c531b2fc7dd49628f7fbadd809c7b2f7f8819cffb3ac7d30689ca",
|
||||||
|
"orderHash": "b409ea6b77b6c8639f63c33a156581f9b184a84fde34d265b5deb05705828251",
|
||||||
|
"features": 7,
|
||||||
|
"bytes": 5411
|
||||||
|
},
|
||||||
|
"traffic-signals.json": {
|
||||||
|
"contentHash": "625b79b6eb82b41f2099ba51960717c7f794fdfbd87310eb12e99da966540d89",
|
||||||
|
"bytes": 15491
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"volatileExcluded": [
|
||||||
|
"absolute paths -> <repo> or <external>",
|
||||||
|
"native-road-* staging directory -> <staging>"
|
||||||
|
]
|
||||||
|
}
|
||||||
+108
@@ -0,0 +1,108 @@
|
|||||||
|
{
|
||||||
|
"contract": "native-road-package/v1",
|
||||||
|
"areaId": "nantaizi-lake-innovation-valley",
|
||||||
|
"files": {
|
||||||
|
"../native-traffic-signals.json": {
|
||||||
|
"contentHash": "36cb9f069fb44a6e24f0af0d130ef8cb5b4a93250dc9fb0891191d1ba039a5b2",
|
||||||
|
"bytes": 28329
|
||||||
|
},
|
||||||
|
"comparison.json": {
|
||||||
|
"contentHash": "5aa11da443221a48288641ac6950c6e4d75d834713a93110bbf265859202a265",
|
||||||
|
"bytes": 1153
|
||||||
|
},
|
||||||
|
"compiled.json": {
|
||||||
|
"contentHash": "ea5ae4a04f1259b1ccec9fc1cca7ef8ba81426a77584a447480b6047b37f5e01",
|
||||||
|
"bytes": 184985
|
||||||
|
},
|
||||||
|
"diagnostics.json": {
|
||||||
|
"contentHash": "7e9327f0424dd612f389c560c114a4cafee1349bbfa36f49b2b4eab846e5ca91",
|
||||||
|
"bytes": 9755
|
||||||
|
},
|
||||||
|
"layers/center_lines.geojson": {
|
||||||
|
"contentHash": "2b2710fce06e75b0a3e4941c2da6119cea7b8bb7834345607bbee384de20ee6b",
|
||||||
|
"orderHash": "ea71a8841370689d6fc2b75d0b30ec7104638fb2904da6d707dc82ff3131e065",
|
||||||
|
"features": 511,
|
||||||
|
"bytes": 694102
|
||||||
|
},
|
||||||
|
"layers/connectors.geojson": {
|
||||||
|
"contentHash": "901a86bc6c536d38bb73ae4654ec1ce7d1c0790c2d6eba92543c48f584cd15ac",
|
||||||
|
"orderHash": "4df882ad59b65a97d892df64de0156b35beaf071b04eed671ef7b535e9e2a7b9",
|
||||||
|
"features": 76,
|
||||||
|
"bytes": 160866
|
||||||
|
},
|
||||||
|
"layers/crosswalks.geojson": {
|
||||||
|
"contentHash": "53fda76182c0d1db5f9e7ac284337ece62655d7fee8bb446fe170ea26abe8bbc",
|
||||||
|
"orderHash": "53fda76182c0d1db5f9e7ac284337ece62655d7fee8bb446fe170ea26abe8bbc",
|
||||||
|
"features": 48,
|
||||||
|
"bytes": 50536
|
||||||
|
},
|
||||||
|
"layers/direction_arrows.geojson": {
|
||||||
|
"contentHash": "38e80bbfe02d4f12ce40e7d0c8342e3bef6b602c64f81dd320b366b6a6b3d205",
|
||||||
|
"orderHash": "579aa6c37585bf4edf9d6b6b1e120f976b93ec2d0c303d82a154b75c114a45f5",
|
||||||
|
"features": 324,
|
||||||
|
"bytes": 493431
|
||||||
|
},
|
||||||
|
"layers/edge_lines.geojson": {
|
||||||
|
"contentHash": "ad37fe6278e0c7caf3b77c1c5068a56e18a6c87b78ed5a840ee22a0f961ea7a8",
|
||||||
|
"orderHash": "ad37fe6278e0c7caf3b77c1c5068a56e18a6c87b78ed5a840ee22a0f961ea7a8",
|
||||||
|
"features": 0,
|
||||||
|
"bytes": 52
|
||||||
|
},
|
||||||
|
"layers/intersection_surface.geojson": {
|
||||||
|
"contentHash": "7f79e57215e3fd07c5c0f703c71e516873db770cb869efdf18925a3184059ca3",
|
||||||
|
"orderHash": "d69df8d92d0fce8f7ee172959b978d941fd011e094857e9ab7304b3d1e98bf92",
|
||||||
|
"features": 12,
|
||||||
|
"bytes": 38528
|
||||||
|
},
|
||||||
|
"layers/lane_centerlines.geojson": {
|
||||||
|
"contentHash": "3fea4ebfe62e0d720c6977e2289f4e6517ed7b3c5ab361270d03378971aec780",
|
||||||
|
"orderHash": "69a8ebaa42a74da4f7d5940c5a81bd82ceb104efd3f858723dccfadbae12121e",
|
||||||
|
"features": 50,
|
||||||
|
"bytes": 43582
|
||||||
|
},
|
||||||
|
"layers/lane_separators.geojson": {
|
||||||
|
"contentHash": "dc0b50b53da191e65f3dba01162acb7561966d1796a9c0789527cebfd6ed06a4",
|
||||||
|
"orderHash": "0bfd873e5698869fb4855783fe30bb6db29456958e4d154b7264374a5fdb4a10",
|
||||||
|
"features": 731,
|
||||||
|
"bytes": 835933
|
||||||
|
},
|
||||||
|
"layers/road_surface.geojson": {
|
||||||
|
"contentHash": "81af19c71cf6fc8a3884488c00cfb590e1a7fe9ed9e4351fce65825ceadd50fa",
|
||||||
|
"orderHash": "f2ddec5258411fbdbc050b7ecefbb157b59e00b8226afcc30d2b772e1859e357",
|
||||||
|
"features": 25,
|
||||||
|
"bytes": 38275
|
||||||
|
},
|
||||||
|
"layers/sidewalk_surface.geojson": {
|
||||||
|
"contentHash": "bb8f4516e27b16238d753b112d18b8acfa5cfad2cea522a65b7972a609be9563",
|
||||||
|
"orderHash": "4fa773a6f39c5b6d23551e1338c6d99ef8a5ecd9ebfcafa16154c9765fef8c6e",
|
||||||
|
"features": 73,
|
||||||
|
"bytes": 122432
|
||||||
|
},
|
||||||
|
"layers/turn_arrows.geojson": {
|
||||||
|
"contentHash": "a65bb8fe079f27e00bf2e6208148fc6b73d2d07e76d48b1cd1bf8a610d7e2d66",
|
||||||
|
"orderHash": "66966ac2c65464f9c6715ca9cda5a3620520bf1d066cba2dee36114dc46af936",
|
||||||
|
"features": 108,
|
||||||
|
"bytes": 132536
|
||||||
|
},
|
||||||
|
"layers/vehicle_stop_lines.geojson": {
|
||||||
|
"contentHash": "4f45caf3c0bf13bbf10d9cac15fa80b1a9be3969ed84803ba48e56c4a0080992",
|
||||||
|
"orderHash": "4f45caf3c0bf13bbf10d9cac15fa80b1a9be3969ed84803ba48e56c4a0080992",
|
||||||
|
"features": 8,
|
||||||
|
"bytes": 8475
|
||||||
|
},
|
||||||
|
"traffic-signal-assemblies.json": {
|
||||||
|
"contentHash": "9f8d032c00784bb72bb1322238cd7b0a80e621d435b43c728da86f1e77ca352a",
|
||||||
|
"orderHash": "0b9cae13094dba1994faca4bf1d4d80e8bc5497daa46df5899bf5e6fc7f26d61",
|
||||||
|
"features": 35,
|
||||||
|
"bytes": 26398
|
||||||
|
},
|
||||||
|
"traffic-signals.json": {
|
||||||
|
"contentHash": "c4b68cc1cefeb0d393a18eef6c7eb79933fba28630826745165ed433c25779d0",
|
||||||
|
"bytes": 74151
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"volatileExcluded": [
|
||||||
|
"absolute paths -> <repo> or <external>",
|
||||||
|
"native-road-* staging directory -> <staging>"
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"_example": "Fill with {\"file\": \"<path>\", \"reason\": \"<why>\"}. Put spec/research files only — no code paths. Run `python3 .trellis/scripts/get_context.py --mode packages` to list available specs. Delete this line once real entries are added."}
|
||||||
@@ -0,0 +1,294 @@
|
|||||||
|
# 道路编译器独立化 — 技术设计(parent)
|
||||||
|
|
||||||
|
本文件是 **契约的权威定义**,供所有子任务引用。
|
||||||
|
Phase 0 的交付物是把本节内容落成编译器仓库内的正式文档 + 校验脚本,
|
||||||
|
而不是重新发明契约。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. 契约:`native-road-package/v1`
|
||||||
|
|
||||||
|
### 1.1 输入契约
|
||||||
|
|
||||||
|
现状:`compile-native-roads.js` 接收整个 normalized areaConfig,但**实际只用 9 个字段**。
|
||||||
|
|
||||||
|
```
|
||||||
|
area.id → areaId
|
||||||
|
area.input → osmFile (OSM XML 路径)
|
||||||
|
area.nativeRoad.edgeLines → options.edgeLines
|
||||||
|
area.nativeRoad.junctionTemplates → options.junctionTemplates
|
||||||
|
area.outputs.nativeRoadOverrides → overridesFile
|
||||||
|
area.outputs.nativeTrafficSignals → trafficSignalsFile
|
||||||
|
area.outputs.nativeRoadDir → outDir
|
||||||
|
area.outputs.pipelineDir → stagingDir
|
||||||
|
area.outputs.geojsonDir → comparisonDir (见 K2,倾向移除)
|
||||||
|
```
|
||||||
|
|
||||||
|
目标形状:
|
||||||
|
|
||||||
|
```js
|
||||||
|
// RoadCompilerInput —— 编译器唯一入口参数
|
||||||
|
{
|
||||||
|
areaId: string,
|
||||||
|
osmFile: string, // 绝对路径
|
||||||
|
outDir: string, // native-road/ 的目标位置
|
||||||
|
stagingDir: string, // 原子提升用的临时目录父级
|
||||||
|
overridesFile: string,
|
||||||
|
trafficSignalsFile: string,
|
||||||
|
options: {
|
||||||
|
edgeLines: boolean,
|
||||||
|
junctionTemplates: {
|
||||||
|
enabled: boolean,
|
||||||
|
references: [],
|
||||||
|
clusters: [{ id, template, referenceFile, nodeIds, ...几何参数 }]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**宿主侧责任**:`scripts/lib/area-config.js` 把 areaConfig 映射成 `RoadCompilerInput`。
|
||||||
|
**编译器侧责任**:不认识 areaConfig,不读 `config/areas/*.json`,不推导任何路径。
|
||||||
|
|
||||||
|
### 1.2 输出契约
|
||||||
|
|
||||||
|
`compiled.json` 顶层键(已核实):
|
||||||
|
|
||||||
|
```
|
||||||
|
schema, areaId, source, model, movements, trafficSignals, diagnostics, layers
|
||||||
|
```
|
||||||
|
|
||||||
|
`source` 含 `{ osm, overrides, trafficSignals }` 三个路径 —— 是 parity 归一化的重点对象。
|
||||||
|
|
||||||
|
```
|
||||||
|
<outDir>/ # 原子提升:先写 staging 再 rename
|
||||||
|
manifest.json # ← Phase 3 新增,图层自声明
|
||||||
|
compiled.json # 单一读模型,含 model + movements
|
||||||
|
diagnostics.json # severity / subject / sourceIds / rule / message / geometry?
|
||||||
|
comparison.json # ← 见 K2,可能移除
|
||||||
|
layers/
|
||||||
|
road_surface.geojson
|
||||||
|
intersection_surface.geojson
|
||||||
|
sidewalk_surface.geojson
|
||||||
|
edge_lines.geojson
|
||||||
|
lane_separators.geojson
|
||||||
|
center_lines.geojson
|
||||||
|
crosswalks.geojson
|
||||||
|
vehicle_stop_lines.geojson
|
||||||
|
direction_arrows.geojson
|
||||||
|
turn_arrows.geojson
|
||||||
|
lane_centerlines.geojson # 语义层,不渲染
|
||||||
|
connectors.geojson # 语义层,不渲染
|
||||||
|
|
||||||
|
<trafficSignalsFile> # 兄弟文件,不在 outDir 内
|
||||||
|
```
|
||||||
|
|
||||||
|
**stdout 完成标记**(与宿主 `SCENE_DONE` / `CESIUM_EXPORT_DONE` 同约定):
|
||||||
|
|
||||||
|
```
|
||||||
|
NATIVE_ROAD_COMPILE_DONE {"areaId":…,"roads":N,"endpoints":N,"diagnostics":N,"output":…,"comparison":…}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 1.3 消费方式:子进程为主契约
|
||||||
|
|
||||||
|
| 方式 | 定位 |
|
||||||
|
|---|---|
|
||||||
|
| CLI 子进程 + 读 `outDir` + 解析 stdout 标记 | **主契约**。宿主 pipeline 层本就是唯一能启动外部进程的层 |
|
||||||
|
| `require()` in-process | 仅作性能优化,不得成为唯一路径 |
|
||||||
|
|
||||||
|
选子进程的理由:
|
||||||
|
1. 语言无关 —— 编译器将来若换 TS/Rust,宿主零改动。
|
||||||
|
2. 强制文件契约成为真契约,无法偷传对象绕过边界。
|
||||||
|
3. 与既有 QGIS / GDAL / Blender 调用方式一致。
|
||||||
|
|
||||||
|
`build-area.js:7` 现在是 in-process `require`。Phase 2 改为子进程调用。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. 模块清单:什么搬、什么留
|
||||||
|
|
||||||
|
### 2.1 搬(约 3400 行核心 + workbench)
|
||||||
|
|
||||||
|
| 文件 | 行数 | 依赖 |
|
||||||
|
|---|---|---|
|
||||||
|
| `scripts/lib/native-road.js` | 1695 | fs, path, turn-lane-arrows, complex-junction |
|
||||||
|
| `scripts/lib/complex-junction.js` | 474 | fs, gaode-junction-reference |
|
||||||
|
| `scripts/lib/turn-lane-arrows.js` | 502 | fs, path, lane-geometry |
|
||||||
|
| `scripts/lib/gaode-junction-reference.js` | 231 | fs |
|
||||||
|
| `scripts/lib/lane-geometry.js` | 161 | 无(纯函数) |
|
||||||
|
| `scripts/lib/native-traffic-signals.js` | 49 | osm, traffic-signals ← **见 K1** |
|
||||||
|
| `scripts/lib/osm.js` | 102 | 无 |
|
||||||
|
| `scripts/compile-native-roads.js` | — | area-config ← **要换成窄契约** |
|
||||||
|
| `scripts/check-native-roads.js` | — | area-config ← 同上 |
|
||||||
|
| `scripts/road-workbench.js` + `scripts/workbench/app.js` | 173 + — | area-config ← 同上 |
|
||||||
|
| `scripts/test-native-road.js`、`scripts/test-road-workbench.js` | — | fixture ← **见 K5** |
|
||||||
|
|
||||||
|
依赖图(已核实,`native-road.js` 对宿主零耦合):
|
||||||
|
|
||||||
|
```
|
||||||
|
native-road.js ──→ turn-lane-arrows ──→ lane-geometry (纯)
|
||||||
|
└──────────→ complex-junction ──→ gaode-junction-reference
|
||||||
|
native-traffic-signals ──→ osm.js
|
||||||
|
└──→ traffic-signals.js ← 共用,需拆
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2.2 留
|
||||||
|
|
||||||
|
- `scripts/lib/area-config.js` —— 宿主拥有,新增 `toRoadCompilerInput()` 映射
|
||||||
|
- `scripts/build-area.js` —— 改为子进程调用编译器
|
||||||
|
- `scripts/lib/traffic-signals.js` 的 legacy 读取器部分(见 K1)
|
||||||
|
- `blender/` 全部 —— Phase 3 内部重组,但不搬出仓库
|
||||||
|
- `scripts/lib/scene-layers.js`、osm2streets / QGIS legacy 链路 —— 完全不动
|
||||||
|
|
||||||
|
### 2.3 K1 的拆分建议(Phase 1 需细读确认)
|
||||||
|
|
||||||
|
`lib/traffic-signals.js` 当前混了两类东西:
|
||||||
|
|
||||||
|
| 类别 | 使用方 | 归属 |
|
||||||
|
|---|---|---|
|
||||||
|
| OSM 信号节点提取 + 信号文档 schema | `native-traffic-signals.js` | **随编译器走** —— 编译器生成该文档,就该拥有其契约 |
|
||||||
|
| `readTrafficSignalFeatures` | `build-osm2streets-qgis.js` | 留宿主 |
|
||||||
|
| `readTrafficSignals` | `build-area.js` | 留宿主 |
|
||||||
|
| `buildTrafficSignals` | `test-preview-assets.js` | 待判定 |
|
||||||
|
|
||||||
|
拆完后宿主从编译器包 import 信号文档 schema,反向依赖为 0 不受影响
|
||||||
|
(宿主依赖编译器是允许的方向)。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. Phase 3:渲染分离的设计
|
||||||
|
|
||||||
|
### 3.1 现状问题
|
||||||
|
|
||||||
|
`blender/osmassets/catalog.py:53` 的 `NATIVE_ROAD_LAYERS` 是一张跨仓库重复表:
|
||||||
|
|
||||||
|
```python
|
||||||
|
# 注释自陈:"It is a provider adapter, not a second scene-layer registry."
|
||||||
|
NATIVE_ROAD_LAYERS = (
|
||||||
|
{"source": "road_surface", "material_layer": "road_surface"},
|
||||||
|
{"source": "edge_lines", "material_layer": "lane_separators"},
|
||||||
|
... 共 10 项
|
||||||
|
)
|
||||||
|
```
|
||||||
|
|
||||||
|
编译器写 12 个 geojson,这张表只列 10 项 —— `lane_centerlines` / `connectors`
|
||||||
|
是语义层不参与渲染。**但这个事实只存在于这张表的省略里,编译器侧没有任何声明。**
|
||||||
|
|
||||||
|
后果:编译器新增图层 → 必须有人记得去另一个仓库改 `catalog.py` → 忘了就静默少渲染一层。
|
||||||
|
这正是 `.trellis/spec/pipeline/index.md` 首页警告的「最容易出静默错误」。
|
||||||
|
|
||||||
|
### 3.2 目标:编译器自声明图层
|
||||||
|
|
||||||
|
`<outDir>/manifest.json`:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"contract": "native-road-package/v1",
|
||||||
|
"areaId": "fengshu-er-road",
|
||||||
|
"layers": [
|
||||||
|
{ "source": "road_surface", "role": "surface",
|
||||||
|
"materialLayer": "road_surface" },
|
||||||
|
|
||||||
|
{ "source": "lane_centerlines", "role": "semantic" },
|
||||||
|
{ "source": "connectors", "role": "semantic" },
|
||||||
|
|
||||||
|
{ "source": "center_lines", "role": "marking",
|
||||||
|
"materialLayer": "center_lines",
|
||||||
|
"splitBy": { "prop": "color",
|
||||||
|
"cases": [ { "match": "white", "material": "native_center_line_white" },
|
||||||
|
{ "default": true, "material": "center_lines" } ] } },
|
||||||
|
|
||||||
|
{ "source": "lane_separators", "role": "marking",
|
||||||
|
"materialLayer": "lane_separators",
|
||||||
|
"splitBy": { "prop": "color",
|
||||||
|
"cases": [ { "match": "yellow", "material": "native_lane_separator_yellow" },
|
||||||
|
{ "default": true, "material": "lane_separators" } ] } }
|
||||||
|
]
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
- `role: "semantic"` 的图层 Blender 直接跳过 —— 把"不渲染"从省略变成显式声明。
|
||||||
|
- `splitBy` 表达当前 `generate_scene.py:815-819` 里硬编码的
|
||||||
|
`color != "white"` / `color == "yellow"` 分流逻辑。
|
||||||
|
- 材质本体(颜色、z 高度、贴图)仍归宿主 `catalog.py::MATERIALS` —— 编译器不懂渲染。
|
||||||
|
编译器只声明"我有这些图层、它们是什么角色、该用哪个材质槽"。
|
||||||
|
|
||||||
|
### 3.3 Blender 侧改造
|
||||||
|
|
||||||
|
- `generate_scene.py` 内道路分支抽为 `blender/osmassets/native_roads.py`,读 manifest 遍历。
|
||||||
|
- 建筑(`handle_building` / `dispatch_ways`)、植被、水体保持原位不动。
|
||||||
|
- `catalog.NATIVE_ROAD_LAYERS` 删除。
|
||||||
|
|
||||||
|
### 3.4 AC5 的验证方法
|
||||||
|
|
||||||
|
向编译器加一个 throwaway 图层(例如 `debug_probe.geojson` + manifest 声明),
|
||||||
|
不改宿主任何代码,跑 blender 阶段,确认它被渲染出来。验证完回滚该图层。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. 决策记录
|
||||||
|
|
||||||
|
### D1 不用 drawtonomy 替代编译器 ❌
|
||||||
|
|
||||||
|
评估结论(2026-08-25):
|
||||||
|
|
||||||
|
- 克隆仓库内**没有编辑器本体**。`packages/` 只有 SDK / dev-server / mcp-server;
|
||||||
|
白板闭源,托管在 drawtonomy.com。README 卖点里的 topology-aware lanes、
|
||||||
|
lane tool、intersection/roundabout templates、Map→lanes **全部不在开源代码内**。
|
||||||
|
- **它完全不做 raw OSM 推导**。`exporter/osmParser.ts` 首行自陈是
|
||||||
|
"Lanelet2 OSM (.osm XML) parser" —— 读的是 Lanelet2(车道左右边界已显式)。
|
||||||
|
整个 `exporter/` 目录 grep `highway` 命中 1 次,是 `opendrive.ts:685` 的
|
||||||
|
车道类型字符串,不是 OSM 标签解析。从不读 `highway=*` / `lanes` / `turn:lanes`。
|
||||||
|
- 本编译器的核心能力恰是"从稀疏有歧义的中国 OSM 标签推导车道几何",方向垂直。
|
||||||
|
- 语义成熟度对比:本编译器有逐值 provenance
|
||||||
|
(`tag:lanes:forward` / `inferred:highway-default` / `override:<id>`)+ 31 条语义诊断规则;
|
||||||
|
drawtonomy SDK 两者皆无,其 25 条校验规则全是 OpenDRIVE 结构/XML 完整性检查。
|
||||||
|
|
||||||
|
### D2 drawtonomy 作为**下游后端 + 编辑器**(后续独立 PoC)✅
|
||||||
|
|
||||||
|
可用能力(扩展 API,`types.ts:257` 8 个 capability):
|
||||||
|
`shapes:write` + `ui:panel` 足以把编译产物注入编辑器;
|
||||||
|
`snapshot:read` 回读后由本地跑其开源 `exportToOpenDrive` / `lanelet2`。
|
||||||
|
|
||||||
|
不可用能力(决定 junctionTools 不能做成扩展):
|
||||||
|
- 无 canvas / overlay 能力,UI 只能是侧栏 iframe
|
||||||
|
- 无工具注册,画布指针事件完全归宿主
|
||||||
|
- **无任何 change 事件推送** —— `ExtensionClient.handleMessage` 入站只有
|
||||||
|
`ext:init` / 按 requestId 匹配的 5 个 `*-response` / `ext:error`,所有读取靠轮询
|
||||||
|
|
||||||
|
结论:junctionTools 留在自有 workbench(画布自己的,可任意绘制)。
|
||||||
|
drawtonomy 承担场景编排 + 工业格式导出。二者是不同的活,不强行合并 UI。
|
||||||
|
|
||||||
|
依赖风险记录:`drawtonomy-dev-server` 是 `https://www.drawtonomy.com` 的
|
||||||
|
**缓存代理**(TTL 1 小时),非自托管。manifest 有 `minHostVersion` 字段,
|
||||||
|
说明宿主协议会漂。后续 PoC 不把它放进关键路径。
|
||||||
|
|
||||||
|
### D3 值得从 drawtonomy 借用的(Apache-2.0,需保留 NOTICE/署名)
|
||||||
|
|
||||||
|
| 来源 | 行数 | 用途 | 建议阶段 |
|
||||||
|
|---|---|---|---|
|
||||||
|
| `exporter/odrGeometryFit.ts` | 610 | 折线→解析曲线拟合(中位数去噪 + 贪心生长 + 最简原语优先 + 逐拟合回验 + G1 硬不变量)。可替掉手调的 `approachWidthMultiplier=1.45` / `coreRadiusMeters=28`,改为对 `referenceFile` 拟合、残差作质量指标 | 拆分后独立任务 |
|
||||||
|
| validator 的 mutation-proven 方法 | — | 故意破坏合法输入、断言校验器必须抓到。本编译器 31 条诊断规则目前无任何触发证明 | 拆分后独立任务,成本低 |
|
||||||
|
| validator 的分层 + 命名空间(`xml.*` → `ref.*` → `junction.*` → `geom.*`) | — | 替代当前 31 条平铺规则 | 同上 |
|
||||||
|
| OpenDRIVE + Lanelet2 导出器 | 3059 + 869 | 补齐工业格式输出(Lanelet2 是 Autoware 的输入格式) | 后续独立 PoC |
|
||||||
|
|
||||||
|
### D4 为什么 Phase 1 与 Phase 2 必须分开
|
||||||
|
|
||||||
|
Phase 1 只改"包边界与入口契约",仓库不变 → 若产物变化,成因必在代码改动。
|
||||||
|
Phase 2 只改"仓库位置与消费方式",代码不变 → 若产物变化,成因必在搬迁。
|
||||||
|
合并执行则两者混淆,parity oracle 失去诊断价值。
|
||||||
|
|
||||||
|
### D5 IR 重构推迟到拆分之后
|
||||||
|
|
||||||
|
见 prd.md C1。拆分的正确性完全建立在"产物逐字节不变"上,
|
||||||
|
同期改 IR 会同时摧毁 oracle 与归因能力。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. 回滚形状
|
||||||
|
|
||||||
|
| Phase | 回滚方式 |
|
||||||
|
|---|---|
|
||||||
|
| 0 | 无代码改动,仅新增文档与基线,无需回滚 |
|
||||||
|
| 1 | `git revert`;`packages/road-compiler/` 与旧 `scripts/lib/*` 并存过渡期内可切回旧路径 |
|
||||||
|
| 2 | 宿主依赖回指本仓库内路径(`file:packages/road-compiler`),编译器仓库保留不动 |
|
||||||
|
| 3 | Blender 侧恢复 `catalog.NATIVE_ROAD_LAYERS`,manifest 保留但不消费 |
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"_example": "Fill with {\"file\": \"<path>\", \"reason\": \"<why>\"}. Put spec/research files only — no code paths. Run `python3 .trellis/scripts/get_context.py --mode packages` to list available specs. Delete this line once real entries are added."}
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
# 道路编译器独立化(parent)
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
|
||||||
|
把 native road compiler 从本仓库拆成可独立维护的项目,与本项目通过**版本化文件契约**相辅相成;
|
||||||
|
同时把道路渲染与 OSM 建筑渲染分离,使二者可各自演进。
|
||||||
|
|
||||||
|
本任务是 parent:它拥有源需求、契约定义、子任务地图、跨子任务验收标准和最终集成评审。
|
||||||
|
**它自身不承担实现工作**,所有可交付物在子任务中完成。
|
||||||
|
|
||||||
|
## 背景:为什么现在拆
|
||||||
|
|
||||||
|
- `scripts/lib/native-road.js` 已 1695 行,`compileGeometry()` 单函数编排 15+ 个 pass,
|
||||||
|
顺序依赖只由行号编码,每加一个特性就往既有函数尾部挂位置参数
|
||||||
|
(`compileLaneMarkings` 已 7 个位置参数)。
|
||||||
|
- 道路与建筑渲染纠缠在 `blender/generate_scene.py` 一个脚本内,
|
||||||
|
道路图层表 `NATIVE_ROAD_LAYERS` 硬编码在 `blender/osmassets/catalog.py:53`。
|
||||||
|
- 道路编译的迭代节奏(几何、路口、标线、V2X 语义)与建筑/植被/水体渲染完全不同,
|
||||||
|
放在一个仓库里互相牵制。
|
||||||
|
|
||||||
|
拆分的可行性前提(已核实):
|
||||||
|
- `native-road.js` 只 require `fs` / `path` / 两个同族道路模块,**对宿主项目零耦合**。
|
||||||
|
- 对宿主的唯一耦合是三个 CLI 入口里的 `readAreaConfig`。
|
||||||
|
- 输出侧 `native-road/` **已经是文件契约**,`blender/generate_scene.py:801` 按图层名读取。
|
||||||
|
- stdout 标记 `NATIVE_ROAD_COMPILE_DONE` 已存在,与 `SCENE_DONE` / `CESIUM_EXPORT_DONE`
|
||||||
|
同一约定 —— 子进程边界事实上已预留。
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
### R1 契约先行
|
||||||
|
|
||||||
|
- R1.1 输入输出契约必须在任何代码移动之前写死并版本化为 `native-road-package/v1`,
|
||||||
|
命名对齐既有 `osm-asset-package/v1` 约定。
|
||||||
|
- R1.2 契约的权威定义见本任务 `design.md`;Phase 0 负责把它落成仓库内文档 + 校验脚本。
|
||||||
|
|
||||||
|
### R2 可证明的等价性
|
||||||
|
|
||||||
|
- R2.1 拆分过程中每一步都必须对两个有效区域
|
||||||
|
(`fengshu-er-road` / `nantaizi-lake-innovation-valley`)
|
||||||
|
验证产物与基线一致。
|
||||||
|
- R2.2 任何差异必须逐条书面解释后才可接受,禁止"看起来差不多"。
|
||||||
|
- R2.3 验证方法沿用既有 `.trellis/spec/guides/artifact-parity-guide.md`。
|
||||||
|
|
||||||
|
### R3 独立可维护
|
||||||
|
|
||||||
|
- R3.1 拆出的项目必须能脱离宿主自测(自带 fixture,不读宿主 `inputs/` 或 `outputs/`)。
|
||||||
|
- R3.2 保留 git 历史(`git subtree split` 或 `git filter-repo`)——
|
||||||
|
1695 行几何逻辑的 blame 是踩坑记录,丢失后无人敢改。
|
||||||
|
- R3.3 编译器不得反向依赖宿主任何模块、配置或目录布局。
|
||||||
|
|
||||||
|
### R4 相辅相成(防漂移)
|
||||||
|
|
||||||
|
四个机制缺一不可:
|
||||||
|
|
||||||
|
| 机制 | 作用 | 落地于 |
|
||||||
|
|---|---|---|
|
||||||
|
| `native-road-package/v1` 版本号 | 破坏性变更必须升版本,宿主主动 opt-in | Phase 0 |
|
||||||
|
| 编译器自声明图层(layer manifest) | 加图层不需要改宿主代码 | Phase 3 |
|
||||||
|
| 两区域 parity 基线留在编译器仓库当测试语料 | 编译器无法静默弄坏宿主 | Phase 0 → Phase 2 |
|
||||||
|
| 宿主锁版本依赖,不用 `latest` | 升级是决定,不是意外 | Phase 2 |
|
||||||
|
|
||||||
|
### R5 渲染分离
|
||||||
|
|
||||||
|
- R5.1 道路图层表必须从宿主 `catalog.py` 的硬编码变为编译器输出的 manifest。
|
||||||
|
- R5.2 `blender/generate_scene.py` 内道路渲染分支抽离为独立模块;
|
||||||
|
建筑 / 植被 / 水体保持原位。
|
||||||
|
- R5.3 分离后,编译器新增图层不需要修改宿主任何代码即可被渲染。
|
||||||
|
|
||||||
|
## Constraints(硬约束)
|
||||||
|
|
||||||
|
### C1 不得在拆分过程中重构 IR 🔴
|
||||||
|
|
||||||
|
lane graph 提为一等 IR 是正确方向,但**必须在 Phase 2 完成之后作为独立任务**。
|
||||||
|
|
||||||
|
理由:拆分的正确性完全依赖"产物逐字节不变"这一 oracle。
|
||||||
|
一旦同时改 IR,oracle 失效,且无法判断产物变化来自搬迁还是重设计。
|
||||||
|
|
||||||
|
未来若做,形式是**新增输出**而非替换 `compiled.json`,
|
||||||
|
靠"解锁 drawtonomy / OpenDRIVE / Lanelet2 导出"赚取存在理由。
|
||||||
|
|
||||||
|
### C2 拆分期不引入构建步骤
|
||||||
|
|
||||||
|
编译器保持 CommonJS、无构建步骤,与宿主 pipeline 层运行时一致
|
||||||
|
(见 `.trellis/spec/pipeline/index.md`)。
|
||||||
|
TypeScript / ESM 是独立决策;若后续 drawtonomy PoC 需要 SDK 互操作,只能在其独立任务的扩展目录内处理。
|
||||||
|
|
||||||
|
### C3 Phase 1 必须先于 Phase 2
|
||||||
|
|
||||||
|
"包边界"与"换仓库"分两步做。合并执行时若产物变化,无法区分成因。
|
||||||
|
|
||||||
|
## 子任务地图
|
||||||
|
|
||||||
|
| Phase | 子任务 | 交付物 | 阻塞后续 |
|
||||||
|
|---|---|---|---|
|
||||||
|
| 0 | `08-25-rc-p0-contract-baseline` | 契约文档 + 两区域 checksum 基线 + 校验脚本 | 是 |
|
||||||
|
| 1 | `08-25-rc-p1-package-boundary` | 本仓库内 `packages/road-compiler/`,窄输入契约 | 是 |
|
||||||
|
| 2 | `08-25-rc-p2-repo-split` | 独立仓库 + 宿主锁版本消费 | 是 |
|
||||||
|
| 3 | `08-25-rc-p3-render-separation` | layer manifest + Blender 道路模块抽离 | 否 |
|
||||||
|
|
||||||
|
顺序约束:**0 → 1 → 2 必须串行**。3 依赖 2 完成。
|
||||||
|
|
||||||
|
## 跨子任务验收标准
|
||||||
|
|
||||||
|
- [ ] AC1 Phase 0 基线建立后,两区域每个输出文件的 checksum 已提交进版本控制
|
||||||
|
- [ ] AC2 Phase 1 结束时,`npm run build:area` 两区域产物对 AC1 基线逐字节一致
|
||||||
|
- [ ] AC3 Phase 2 结束时,宿主从打包依赖构建,两区域 parity 仍成立
|
||||||
|
- [ ] AC4 Phase 2 结束时,编译器仓库 `npm test` 在不访问宿主仓库的情况下通过
|
||||||
|
- [ ] AC5 Phase 3 结束时,向编译器新增一个图层,宿主**零代码改动**即可渲染出来(实测验证)
|
||||||
|
- [ ] AC6 Phase 3 结束时,`.blend` 结构摘要对基线一致(走 artifact-parity-guide)
|
||||||
|
- [ ] AC7 全程未修改 `compiled.json` 的结构(C1 未被违反)
|
||||||
|
- [ ] AC8 编译器仓库对宿主的反向依赖数为 0(grep 验证)
|
||||||
|
|
||||||
|
## 已识别风险(跨子任务,逐个必须有归属)
|
||||||
|
|
||||||
|
| # | 风险 | 归属 Phase | 处置 |
|
||||||
|
|---|---|---|---|
|
||||||
|
| K1 | `lib/traffic-signals.js` 是真共用模块:`reimport-gpkg.js` / `build-osm2streets-qgis.js` / `build-area.js` / `test-preview-assets.js` 都在用,而 `native-traffic-signals.js` 也依赖它 | 1 | 需细读后拆分:信号文档 schema + OSM 信号节点提取随编译器走(编译器生成它就该拥有契约),legacy QGIS/预览读取器留宿主。**全案唯一需要细读再动的地方** |
|
||||||
|
| K2 | `comparison.json` 依赖宿主产物 —— `compile-native-roads.js:87` 读 `area.outputs.geojsonDir` 里 osm2streets 输出做对比,拆出后摸不到 | 0(决策)/ 1(执行) | osm2streets 已 legacy,倾向直接砍掉,用高德参考 + 规范校验取代。决策需在 Phase 0 定档 |
|
||||||
|
| K3 | config 内绝对路径指向宿主仓库:`config/areas/fengshu-er-road.json` 的 `referenceFile: "/Users/que01/osm2streets-qgis-workflow/inputs/osm/珠山湖大道(枫树二路)口.geojson"` | 1 | 需定参考文件解析约定(相对 config 目录 / 显式 basePath) |
|
||||||
|
| K4 | workbench 的 OpenLayers 来自宿主 `node_modules`(design.md 的 import map 方案) | 2 | 新仓库自带依赖 |
|
||||||
|
| K5 | 测试 fixture 依赖宿主:`test-native-road.js:167` 读 `inputs/osm/枫树二路.osm`,其余为内联合成 OSM | 1 | 该文件(或裁剪版)作为测试数据提交进编译器仓库 |
|
||||||
|
|
||||||
|
## Out of Scope
|
||||||
|
|
||||||
|
- lane graph IR 重构(见 C1,未来独立任务)
|
||||||
|
- pass manager / 显式依赖声明重构(同上,属编译器内部演进,不属本次拆分)
|
||||||
|
- 替换编译器为 drawtonomy 或 osm2streets —— 已评估否决:
|
||||||
|
drawtonomy 开源部分只读 Lanelet2(显式车道边界),不做 OSM `highway=*` 推导,
|
||||||
|
与本编译器的核心能力方向垂直
|
||||||
|
- osm2streets / QGIS legacy 链路的任何改动
|
||||||
|
- 宿主侧建筑 / 植被 / 水体渲染逻辑的改动(Phase 3 只抽离道路部分)
|
||||||
|
|
||||||
|
## Notes
|
||||||
|
|
||||||
|
- 评估结论与选型依据见 `design.md` 的「决策记录」一节。
|
||||||
|
- 时间估计:Phase 0-2 约 3 天(搬家 + 证明没搬坏),Phase 3 约 1-2 天。
|
||||||
|
拿到"道路与建筑渲染分离、可独立维护"是在 Phase 3 结束。
|
||||||
|
- 父任务验收完成后,下一项候选任务是独立的
|
||||||
|
`08-25-rc-p4-drawtonomy-ext`(drawtonomy 扩展 PoC);它不属于本任务完成条件。
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
{
|
||||||
|
"id": "road-compiler-extraction",
|
||||||
|
"name": "road-compiler-extraction",
|
||||||
|
"title": "道路编译器独立化(parent)",
|
||||||
|
"description": "把 native road compiler 拆成可独立维护的项目,并与本项目通过版本化契约相辅相成;同时分离道路与 OSM 建筑渲染",
|
||||||
|
"status": "planning",
|
||||||
|
"dev_type": null,
|
||||||
|
"scope": null,
|
||||||
|
"package": null,
|
||||||
|
"priority": "P1",
|
||||||
|
"creator": "dingkang",
|
||||||
|
"assignee": "dingkang",
|
||||||
|
"createdAt": "2026-08-25",
|
||||||
|
"completedAt": null,
|
||||||
|
"branch": null,
|
||||||
|
"base_branch": "main",
|
||||||
|
"worktree_path": null,
|
||||||
|
"commit": null,
|
||||||
|
"pr_url": null,
|
||||||
|
"subtasks": [],
|
||||||
|
"children": [
|
||||||
|
"08-25-rc-p0-contract-baseline",
|
||||||
|
"08-25-rc-p1-package-boundary",
|
||||||
|
"08-25-rc-p2-repo-split",
|
||||||
|
"08-25-rc-p3-render-separation",
|
||||||
|
"08-26-rc-p5-artifact-consumption"
|
||||||
|
],
|
||||||
|
"parent": null,
|
||||||
|
"relatedFiles": [],
|
||||||
|
"notes": "P3 已完成。P5 artifact-only parent 已建立,P5A ZIP export 已在 road-compiler v0.3.0 完成;P5B 宿主 ZIP import 待实施。",
|
||||||
|
"meta": {
|
||||||
|
"next_task": "08-25-rc-p4-drawtonomy-ext"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
{"file":".trellis/spec/blender/testing.md","reason":"P3 scene digest parity 是消费迁移的回归门槛。"}
|
||||||
|
{"file":".trellis/spec/pipeline/native-road-package.md","reason":"验证 ZIP 解压后的 v1.1 contract、areaId 和 source 集合。"}
|
||||||
|
{"file":".trellis/spec/guides/artifact-parity-guide.md","reason":"验证导入迁移不改变 Blender 产物结构。"}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
# P5 Artifact-Only Road Package Design
|
||||||
|
|
||||||
|
P5 replaces the current runtime dependency boundary with a file-only boundary:
|
||||||
|
|
||||||
|
```text
|
||||||
|
road-compiler Web editor
|
||||||
|
-> deterministic root-flat native-road-package/v1.1 ZIP
|
||||||
|
-> osmWorkflow config nativeRoadPackage
|
||||||
|
-> private verified extraction cache
|
||||||
|
-> Blender / Cesium / preview
|
||||||
|
```
|
||||||
|
|
||||||
|
The road-compiler repository owns export and all editing/compiler internals. osmWorkflow owns ZIP safety,
|
||||||
|
contract validation, Blender materials and downstream scene construction. Neither repository reads the
|
||||||
|
other's source, configuration, overrides or runtime implementation.
|
||||||
|
|
||||||
|
The ZIP is immutable input and the host's `_pipeline/native-road-import/<sha256>` is disposable cache.
|
||||||
|
The host rejects unsafe archive topology before writing files, then validates v1.1 `manifest.json` and
|
||||||
|
area identity before starting Blender. Stage manifests record the ZIP hash and resolved package records.
|
||||||
|
|
||||||
|
P5A publishes a fixture/exporter first. P5B uses that fixture to remove compiler CLI installation and
|
||||||
|
invocation from the host. The migration is intentionally a contract-preserving transport change: rendered
|
||||||
|
geometry and material behavior must remain at the P3 baseline.
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
{"file":".trellis/spec/pipeline/native-road-package.md","reason":"宿主与编译器之间的现有文件契约。"}
|
||||||
|
{"file":".trellis/spec/pipeline/external-tools.md","reason":"ZIP 导入必须在 Blender 副作用前完成安全校验。"}
|
||||||
|
{"file":".trellis/spec/guides/cross-layer-thinking-guide.md","reason":"导出、Node 导入、Blender 和 preview 的跨层数据流。"}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
# P5 Integration Plan
|
||||||
|
|
||||||
|
1. Complete P5A in `road-compiler`: deterministic Web/CLI ZIP export plus supported-area fixtures and a
|
||||||
|
tagged compiler release.
|
||||||
|
2. Complete P5B in `osmWorkflow`: safe importer, config migration, CLI/dependency removal and downstream
|
||||||
|
descriptor migration.
|
||||||
|
3. Run the shared end-to-end gate on `fengshu-er-road` and `nantaizi-lake-innovation-valley`:
|
||||||
|
import ZIP -> Blender -> Cesium -> package -> preview -> area checks.
|
||||||
|
4. Compare Blender scene digests to P3 control; run negative ZIP tests and legacy provider tests.
|
||||||
|
5. Record contract docs in both repositories, commit each repository independently, then archive both
|
||||||
|
children and this integration parent.
|
||||||
|
|
||||||
|
Integration rollback: restore the host's previous tagged compiler dependency and compile adapter. ZIP export
|
||||||
|
is additive and its generated files remain valid standalone artifacts.
|
||||||
@@ -0,0 +1,95 @@
|
|||||||
|
# 道路包导入与纯消费管线
|
||||||
|
|
||||||
|
父任务:`.trellis/tasks/08-25-road-compiler-extraction/`
|
||||||
|
|
||||||
|
本任务是集成 parent:导出与导入分别在 road-compiler 和宿主仓库实现,只有两个子任务的
|
||||||
|
端到端 ZIP 契约都通过后才完成。
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
|
||||||
|
让 road-compiler Web 导出的 `native-road-package/v1.1` 成为 Blender 管线的唯一
|
||||||
|
native-road 输入。宿主只校验并消费完整道路包,不再安装、调用或理解道路编译器。
|
||||||
|
|
||||||
|
用户价值:人工在 road-compiler Web 编辑后,导出道路包即可稳定交给 Blender / Cesium
|
||||||
|
构建;编辑成果不再通过发布新的编译器代码版本传播。
|
||||||
|
|
||||||
|
## Confirmed Facts
|
||||||
|
|
||||||
|
- P3 已使 Blender 通过 `manifest.json` 消费 `layers/*.geojson`,并拒绝无效 manifest、
|
||||||
|
source/file 不一致和未知宿主材质槽。
|
||||||
|
- 宿主当前仍通过 `scripts/build-area.js` 调用 `scripts/lib/road-compiler-cli.js`;后者安装并
|
||||||
|
运行 `@osm-asset/road-compiler`,将 `RoadCompilerInput` 写入 `_pipeline/`。
|
||||||
|
- native Blender 构建当前强制使用 `outputs/<area>/native-road/`,并在每次构建前重新编译;
|
||||||
|
宿主还持有 `nativeRoad.edgeLines`、`junctionTemplates`、overrides 和 compiler runtime
|
||||||
|
路径等编译器内部概念。
|
||||||
|
- `osm2streets` 是显式 legacy/debug provider,应保持现有行为。
|
||||||
|
- 有效验证区域只有 `fengshu-er-road` 与 `nantaizi-lake-innovation-valley`;
|
||||||
|
`hanyang-block` 不参与。
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
### R1 纯产物边界
|
||||||
|
|
||||||
|
- native provider 只接收一个完整 `native-road-package/v1.1` 目录。
|
||||||
|
- 宿主不得依赖 `@osm-asset/road-compiler`,不得调用 compiler CLI,不得写
|
||||||
|
`RoadCompilerInput`,不得读取或解释 compiler overrides / junction templates。
|
||||||
|
- 宿主以 manifest 作为道路图层事实源,Blender 不增加 compiler 专用图层表。
|
||||||
|
|
||||||
|
### R2 ZIP 导入配置和校验
|
||||||
|
|
||||||
|
- 每个 native 区域配置一个道路包 ZIP 路径;路径相对于区域配置文件解析并可指向工作区外的
|
||||||
|
road-compiler Web 导出文件。
|
||||||
|
- ZIP 根目录必须直接包含 `manifest.json` 和契约定义的文件;不得接受多余顶层目录、绝对路径、
|
||||||
|
`..` 路径或符号链接。
|
||||||
|
- 在启动 Blender 前,宿主将 ZIP 安全解压到其私有 pipeline staging 目录,校验 manifest
|
||||||
|
契约版本、`areaId` 和当前区域一致,并记录 ZIP hash 和展开文件记录到 stage manifest。
|
||||||
|
- ZIP 永远只读:宿主不复制、覆盖或修改 road-compiler Web 的导出文件;成功或失败后仅清理
|
||||||
|
自己的临时解压目录。
|
||||||
|
- Blender 继续校验 manifest 的图层、source、semantic 角色、材质槽和 splitBy 规则。
|
||||||
|
|
||||||
|
### R3 后续阶段
|
||||||
|
|
||||||
|
- Cesium、package、preview 和区域诊断从导入道路包读取原生车道中心线、signals 和
|
||||||
|
其他既有 native-road 输入;不重新编译或复制道路包。
|
||||||
|
- build stage manifest 将道路包作为外部输入记录,而非宿主输出。
|
||||||
|
|
||||||
|
### R4 清理和迁移
|
||||||
|
|
||||||
|
- 删除宿主对 compiler npm 包、CLI 封装和编译脚本的生产依赖。
|
||||||
|
- 删除或替换只测试宿主编译行为的测试;保留 package-contract、Blender 和下游消费测试。
|
||||||
|
- 更新示例配置、README、pipeline spec 和道路包契约,明确 Web export -> host consume
|
||||||
|
的单向关系。
|
||||||
|
|
||||||
|
## Acceptance Criteria
|
||||||
|
|
||||||
|
- [ ] AC1 `package.json` / lockfile 和生产脚本不再引用 `@osm-asset/road-compiler` 或其 CLI。
|
||||||
|
- [ ] AC2 两个有效区域均可从配置指定的已导出 ZIP 道路包运行 Blender、Cesium、package 和 preview,
|
||||||
|
构建期间没有 compiler 子进程。
|
||||||
|
- [ ] AC3 宿主在 Blender 前拒绝缺失包、错误 contract、错误 areaId 和无效 manifest;错误说明
|
||||||
|
指向导入包和契约,而非 compiler 内部。
|
||||||
|
- [ ] AC4 Blender scene digest 与 P3 control 基线一致;native semantic 层仍不生成几何。
|
||||||
|
- [ ] AC5 stage manifest / diagnose / check area 将导入道路包记录为输入并能识别缺失或变更。
|
||||||
|
- [ ] AC6 `osm2streets` legacy provider 行为未变。
|
||||||
|
- [ ] AC7 文档和配置将人工编辑传播路径表述为 road-compiler Web export -> host consume。
|
||||||
|
|
||||||
|
## Out of Scope
|
||||||
|
|
||||||
|
- road-compiler Web 的编辑器功能、认证、部署或 UI 改造。
|
||||||
|
- 修改道路几何、材质、Blender 建筑/植被/水体渲染。
|
||||||
|
- 新的 manifest 破坏性版本或 lane graph IR。
|
||||||
|
- 将道路包上传到远程制品库或实现同步服务。
|
||||||
|
|
||||||
|
## Key Decision
|
||||||
|
|
||||||
|
- Web 导出的是标准 ZIP;宿主配置直接指向 ZIP 而不是目录。ZIP 是跨仓库的不可变交付物,
|
||||||
|
宿主只在私有 staging 目录中解压和消费,因而没有导出目录 ownership 或覆盖歧义。
|
||||||
|
|
||||||
|
## Subtask Map
|
||||||
|
|
||||||
|
| 子任务 | 仓库 | 交付物 | 依赖 |
|
||||||
|
|---|---|---|---|
|
||||||
|
| `rc-p5a-zip-export` | road-compiler | Web / CLI 可导出的 root-flat `native-road-package/v1.1` ZIP | 无 |
|
||||||
|
| `rc-p5b-zip-import` | osmWorkflow | 配置、受控解压、校验和纯消费管线 | p5a 的 ZIP fixture |
|
||||||
|
|
||||||
|
跨任务验收:同一个 ZIP fixture 必须被 p5b 的两个有效区域构建消费;宿主不得保留
|
||||||
|
compiler npm 或 CLI 耦合。
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
{
|
||||||
|
"id": "rc-p5-artifact-consumption",
|
||||||
|
"name": "rc-p5-artifact-consumption",
|
||||||
|
"title": "道路包导入与纯消费管线",
|
||||||
|
"description": "让宿主通过配置指向 road-compiler Web 导出的 ZIP 道路包,只校验和消费该版本化文件契约,不再安装或调用编译器。",
|
||||||
|
"status": "planning",
|
||||||
|
"dev_type": null,
|
||||||
|
"scope": null,
|
||||||
|
"package": null,
|
||||||
|
"priority": "P2",
|
||||||
|
"creator": "dingkang",
|
||||||
|
"assignee": "dingkang",
|
||||||
|
"createdAt": "2026-08-26",
|
||||||
|
"completedAt": null,
|
||||||
|
"branch": null,
|
||||||
|
"base_branch": "experiment/road-compiler-rethink",
|
||||||
|
"worktree_path": null,
|
||||||
|
"commit": null,
|
||||||
|
"pr_url": null,
|
||||||
|
"subtasks": [],
|
||||||
|
"children": [
|
||||||
|
"08-26-rc-p5b-zip-import",
|
||||||
|
"08-26-rc-p5a-zip-export"
|
||||||
|
],
|
||||||
|
"parent": "08-25-road-compiler-extraction",
|
||||||
|
"relatedFiles": [],
|
||||||
|
"notes": "",
|
||||||
|
"meta": {}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"_example": "Fill with {\"file\": \"<path>\", \"reason\": \"<why>\"}. Put spec/research files only — no code paths. Run `python3 .trellis/scripts/get_context.py --mode packages` to list available specs. Delete this line once real entries are added."}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
# P5A ZIP Export Design
|
||||||
|
|
||||||
|
The compiler owns a pure `exportNativeRoadPackage(result, destination)` function. It writes a
|
||||||
|
temporary root-flat directory from the already compiled Web/CLI state, validates it with the same
|
||||||
|
manifest/source validator used by compiler output, then writes a deterministic ZIP. The Web download
|
||||||
|
handler and CLI are thin callers of this function.
|
||||||
|
|
||||||
|
ZIP layout:
|
||||||
|
|
||||||
|
```text
|
||||||
|
manifest.json
|
||||||
|
compiled.json
|
||||||
|
diagnostics.json
|
||||||
|
comparison.json
|
||||||
|
traffic-signal-assemblies.json
|
||||||
|
traffic-signals.json
|
||||||
|
layers/<12 declared sources>.geojson
|
||||||
|
```
|
||||||
|
|
||||||
|
`manifest.generator` is informational only. The host accepts solely the `contract`, `areaId`, and
|
||||||
|
declared files. ZIP creation normalizes entry order and timestamps so the export is hash-stable.
|
||||||
|
Failure never replaces a chosen output file.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"_example": "Fill with {\"file\": \"<path>\", \"reason\": \"<why>\"}. Put spec/research files only — no code paths. Run `python3 .trellis/scripts/get_context.py --mode packages` to list available specs. Delete this line once real entries are added."}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
# P5A Execution Plan
|
||||||
|
|
||||||
|
1. Inspect workbench state ownership and compiler output writer; keep export sourced from the current
|
||||||
|
compiled state, not host paths.
|
||||||
|
2. Add deterministic root-flat ZIP writer plus validation and CLI entry point.
|
||||||
|
3. Add Web download action using the same writer.
|
||||||
|
4. Add fixtures for root layout, content determinism, manifest/source parity and edited-state export.
|
||||||
|
5. Export both supported-area fixtures for P5B, run compiler tests, then publish a compiler release.
|
||||||
|
|
||||||
|
Rollback: remove the export entry point; no host behavior changes in this subtask.
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
# Web 导出原生道路 ZIP 包
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
|
||||||
|
让 road-compiler Web/CLI 以 root-flat native-road-package/v1.1 ZIP 导出人工编辑后的道路包。
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
- 从 Web 当前编辑状态导出完整道路包,而不是源代码、npm 包或仅 overrides。
|
||||||
|
- ZIP 根直接包含 `manifest.json`,并包含全部 manifest 声明的 `layers/<source>.geojson`、
|
||||||
|
`compiled.json`、`traffic-signals.json` 和 preview 所需的 signal / diagnostics 文档。
|
||||||
|
- `manifest.json` 的 `contract` 保持 `native-road-package/v1.1`;新增可选 `generator` 元数据
|
||||||
|
记录应用版本和 revision,但不得让宿主依赖该版本。
|
||||||
|
- Web 提供用户可见的下载操作;CLI 提供等价、可测试的 ZIP 导出入口。
|
||||||
|
- ZIP 条目顺序、JSON 序列化和压缩时间戳必须确定性,重复导出未编辑内容的文件 hash 一致。
|
||||||
|
|
||||||
|
## Acceptance Criteria
|
||||||
|
|
||||||
|
- [x] 从 Web 编辑后的区域可下载一个 root-flat ZIP,且无需宿主或 npm 发布。
|
||||||
|
- [x] CLI fixture 导出 ZIP 后,解压内容通过 compiler 的 `validatePublishedLayers()`。
|
||||||
|
- [x] ZIP 具有恰好一份 manifest 声明的 layer source,无额外 compiler source / overrides 文件。
|
||||||
|
- [ ] 两个有效区域导出的 ZIP 可被 p5b 导入并完成 Blender/Cesium/preview 构建。
|
||||||
|
- [x] 不修改 `compiled.json` 与 v1.1 manifest 的既有渲染语义。
|
||||||
|
|
||||||
|
## Out of Scope
|
||||||
|
|
||||||
|
- 远程存储、上传、项目历史或多用户协作。
|
||||||
|
- 修改道路编辑器交互、几何算法或 manifest 主版本。
|
||||||
|
|
||||||
|
## Key Decisions
|
||||||
|
|
||||||
|
- ZIP 是单个标准交付物,根目录平铺 package 文件,不包裹 area-id 顶层目录。
|
||||||
|
- ZIP 面向宿主消费,只携带已编译渲染/预览数据;编辑源、OSM 与 overrides 留在 road-compiler
|
||||||
|
项目中,不泄露为宿主依赖。
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"id": "rc-p5a-zip-export",
|
||||||
|
"name": "rc-p5a-zip-export",
|
||||||
|
"title": "Web 导出原生道路 ZIP 包",
|
||||||
|
"description": "让 road-compiler Web/CLI 以 root-flat native-road-package/v1.1 ZIP 导出人工编辑后的道路包。",
|
||||||
|
"status": "in_progress",
|
||||||
|
"dev_type": null,
|
||||||
|
"scope": null,
|
||||||
|
"package": null,
|
||||||
|
"priority": "P2",
|
||||||
|
"creator": "dingkang",
|
||||||
|
"assignee": "dingkang",
|
||||||
|
"createdAt": "2026-08-26",
|
||||||
|
"completedAt": null,
|
||||||
|
"branch": null,
|
||||||
|
"base_branch": "experiment/road-compiler-rethink",
|
||||||
|
"worktree_path": null,
|
||||||
|
"commit": null,
|
||||||
|
"pr_url": null,
|
||||||
|
"subtasks": [],
|
||||||
|
"children": [],
|
||||||
|
"parent": "08-26-rc-p5-artifact-consumption",
|
||||||
|
"relatedFiles": [],
|
||||||
|
"notes": "",
|
||||||
|
"meta": {}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"_example": "Fill with {\"file\": \"<path>\", \"reason\": \"<why>\"}. Put spec/research files only — no code paths. Run `python3 .trellis/scripts/get_context.py --mode packages` to list available specs. Delete this line once real entries are added."}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
# P5B ZIP Import Design
|
||||||
|
|
||||||
|
`scripts/lib/native-road-package.js` becomes the single host adapter. It resolves the config-relative
|
||||||
|
ZIP path, hashes it, validates central-directory entry names and metadata, and extracts only accepted
|
||||||
|
regular files to `_pipeline/native-road-import/<sha256>/`. It validates the unpacked manifest and
|
||||||
|
returns an immutable package descriptor:
|
||||||
|
|
||||||
|
```text
|
||||||
|
{ zipFile, zipRecord, rootDir, manifest, records }
|
||||||
|
```
|
||||||
|
|
||||||
|
The descriptor replaces `area.outputs.nativeRoadDir` as native input for Blender, native preview traffic,
|
||||||
|
diagnostics and stage manifests. The configured ZIP and unpacked cache are inputs, never published area
|
||||||
|
outputs. Cache invalidation is by ZIP SHA-256; cleanup only deletes importer-owned hash directories.
|
||||||
|
|
||||||
|
The importer rejects any non-root-flat layout, duplicate path, symlink, unsupported compression/error,
|
||||||
|
path traversal, invalid manifest, area mismatch or declared/published mismatch before Blender starts.
|
||||||
|
The native compiler CLI dependency and host-owned `nativeRoad` compilation options are removed. Legacy
|
||||||
|
`osm2streets` remains an explicit separate provider.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"_example": "Fill with {\"file\": \"<path>\", \"reason\": \"<why>\"}. Put spec/research files only — no code paths. Run `python3 .trellis/scripts/get_context.py --mode packages` to list available specs. Delete this line once real entries are added."}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
# P5B Execution Plan
|
||||||
|
|
||||||
|
1. Add config normalization for `nativeRoadPackage`, migrate two supported configs and the template.
|
||||||
|
2. Add the tested ZIP importer with bounded extraction, root-flat/path/symlink validation, SHA cache and
|
||||||
|
manifest/area validation.
|
||||||
|
3. Route Blender, preview traffic, stage manifests and diagnostics through the imported descriptor.
|
||||||
|
4. Delete compiler CLI/compile production paths and package dependency; replace their tests with ZIP fixture
|
||||||
|
and negative importer tests.
|
||||||
|
5. Update docs/specs, run native/legacy unit suites, build two exported packages, then run Blender parity.
|
||||||
|
|
||||||
|
Rollback: restore the old compiler dependency and native compile path in one revert; ZIP exports remain
|
||||||
|
non-destructive standalone files.
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
# ZIP 道路包安全导入与纯消费
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
|
||||||
|
让 osmWorkflow 配置、校验、解压并消费 road-compiler Web 导出的 ZIP 道路包,移除 compiler runtime 耦合。
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
- 区域配置以 `nativeRoadPackage` 指向 ZIP,路径相对于该区域配置文件;native provider 不再
|
||||||
|
接受 compiler options、overrides 或输出目录作为输入。
|
||||||
|
- 宿主在任何 Blender / Cesium 副作用前,验证 ZIP 文件、条目数量/大小、root-flat 文件路径、
|
||||||
|
无重复路径、无符号链接、无绝对路径与 `..` 路径。
|
||||||
|
- 仅将已验证的文件解压至 `<area>/_pipeline/native-road-import/<zip-sha256>/`;解压目录是宿主
|
||||||
|
私有缓存,绝不写回 ZIP 或 road-compiler 导出目录。
|
||||||
|
- 共享 importer 为 Blender、preview traffic、diagnose/check 和 stage manifest 提供同一包路径与
|
||||||
|
文件记录;不能让下游自行按字符串拼接另一份 native-road 目录。
|
||||||
|
- 移除 compiler package、CLI wrapper、compile script、编译器输入配置、以及只覆盖旧调用链的测试。
|
||||||
|
|
||||||
|
## Acceptance Criteria
|
||||||
|
|
||||||
|
- [ ] 两个有效区域均从 ZIP 完成 `blender,cesium,package,preview`,构建日志没有 compiler CLI。
|
||||||
|
- [ ] 缺 ZIP、错误 ZIP、nested root、path traversal、symbolic link、错误 contract、错误 areaId 和
|
||||||
|
manifest/source 不匹配均在启动 Blender 前失败。
|
||||||
|
- [ ] stage manifest、`diagnose:area` 与 `check:area` 记录 ZIP hash 和已验证的导入目录;ZIP
|
||||||
|
修改后会被判 stale。
|
||||||
|
- [ ] `package.json`、lockfile、生产脚本与宿主测试不再引用 `@osm-asset/road-compiler`。
|
||||||
|
- [ ] Blender digest 对 P3 control 基线一致;legacy `osm2streets` 路径的单元测试不变。
|
||||||
|
|
||||||
|
## Out of Scope
|
||||||
|
|
||||||
|
- p5a 的 ZIP 生成与 Web 下载实现。
|
||||||
|
- ZIP 远程下载、解密、签名验证或制品库管理。
|
||||||
|
- 改道路内容、材质或 legacy QGIS 行为。
|
||||||
|
|
||||||
|
## Key Decisions
|
||||||
|
|
||||||
|
- ZIP 是只读输入;宿主缓存的生命周期和目录 ownership 完全属于 `_pipeline/`。
|
||||||
|
- ZIP 解码由明确声明的 Node ZIP 库完成,而不是依赖系统 `unzip`;这使路径/符号链接校验可控并
|
||||||
|
可在单元测试中覆盖。
|
||||||
|
- 只有 `native-road-package/v1.1` 可被导入;契约升级必须另开兼容任务。
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"id": "rc-p5b-zip-import",
|
||||||
|
"name": "rc-p5b-zip-import",
|
||||||
|
"title": "ZIP 道路包安全导入与纯消费",
|
||||||
|
"description": "让 osmWorkflow 配置、校验、解压并消费 road-compiler Web 导出的 ZIP 道路包,移除 compiler runtime 耦合。",
|
||||||
|
"status": "in_progress",
|
||||||
|
"dev_type": null,
|
||||||
|
"scope": null,
|
||||||
|
"package": null,
|
||||||
|
"priority": "P2",
|
||||||
|
"creator": "dingkang",
|
||||||
|
"assignee": "dingkang",
|
||||||
|
"createdAt": "2026-08-26",
|
||||||
|
"completedAt": null,
|
||||||
|
"branch": null,
|
||||||
|
"base_branch": "experiment/road-compiler-rethink",
|
||||||
|
"worktree_path": null,
|
||||||
|
"commit": null,
|
||||||
|
"pr_url": null,
|
||||||
|
"subtasks": [],
|
||||||
|
"children": [],
|
||||||
|
"parent": "08-26-rc-p5-artifact-consumption",
|
||||||
|
"relatedFiles": [],
|
||||||
|
"notes": "",
|
||||||
|
"meta": {}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"_example": "Fill with {\"file\": \"<path>\", \"reason\": \"<why>\"}. Put spec/research files only — no code paths. Run `python3 .trellis/scripts/get_context.py --mode packages` to list available specs. Delete this line once real entries are added."}
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
# Phase 0 技术设计
|
||||||
|
|
||||||
|
契约本体见父任务 `design.md` §1,本文件只补 Phase 0 自身的实现设计。
|
||||||
|
|
||||||
|
## 1. 确定性核查的具体做法
|
||||||
|
|
||||||
|
编译器的潜在非确定性来源,按可疑度排序:
|
||||||
|
|
||||||
|
| 来源 | 表现 | 处置 |
|
||||||
|
|---|---|---|
|
||||||
|
| `fs.mkdtempSync(path.join(pipelineDir, "native-road-"))` | staging 目录名随机 | 若名字出现在 `compiled.json` 的 `source` 字段里,需归一化 |
|
||||||
|
| `compiled.json` 内的绝对路径 | `source.osm` / `source.overrides` / `source.trafficSignals` 是绝对路径 | 归一化为相对 repo root |
|
||||||
|
| 时间戳 | 未确认是否存在 | 核查 `compile-native-roads.js` 写入的 metadata |
|
||||||
|
| `Map` / `Set` 迭代顺序 | JS 保证插入序,若插入源本身有序则确定 | 观测两次运行 `orderHash` 是否一致即可暴露 |
|
||||||
|
| 浮点累加顺序 | 几何坐标末位抖动 | 若出现,说明存在顺序依赖,属真 bug,需修 |
|
||||||
|
| `crypto` 随机(`traffic-signals.js` require 了 `crypto`) | 信号 ID 可能含随机成分 | 重点核查 —— `native-traffic-signals.json` 是 `loadOrGenerate`,已存在则复用,首次生成可能不确定 |
|
||||||
|
|
||||||
|
**核查顺序**:
|
||||||
|
1. 备份两个有效区域的 `native-road/` 与 `native-traffic-signals.json`
|
||||||
|
2. 删除 `native-road/`(保留 signals,因为 `loadOrGenerate` 语义是已存在则复用)
|
||||||
|
3. 跑第一次 → snapshot A
|
||||||
|
4. 再删 `native-road/`,跑第二次 → snapshot B
|
||||||
|
5. diff A/B → volatile 字段清单
|
||||||
|
6. 额外一轮:删掉 signals 文件也重生成一次,确认 signal ID 是否确定
|
||||||
|
|
||||||
|
## 2. `scripts/road-parity.js` 设计
|
||||||
|
|
||||||
|
```
|
||||||
|
用法:
|
||||||
|
node scripts/road-parity.js --config <area-config> --snapshot <out.json>
|
||||||
|
node scripts/road-parity.js --config <area-config> --compare <baseline.json>
|
||||||
|
```
|
||||||
|
|
||||||
|
### 归一化规则(写死在脚本里,并回写进契约文档)
|
||||||
|
|
||||||
|
1. **路径**:任何绝对路径 → 相对 repo root;staging 目录名 → 字面量 `<staging>`
|
||||||
|
2. **JSON**:递归按 key 排序后 `JSON.stringify`,再 hash
|
||||||
|
3. **GeoJSON**:
|
||||||
|
- `contentHash` = features 按 `properties.native_id`(缺失则按几何首坐标)排序后 hash
|
||||||
|
- `orderHash` = 原序 hash
|
||||||
|
- 两者都记录;比对时 `contentHash` 不一致 = 语义变化(严重),
|
||||||
|
仅 `orderHash` 不一致 = 顺序抖动(需解释但可能可接受)
|
||||||
|
4. **浮点**:不做舍入。坐标变化就是变化,不允许用容差掩盖
|
||||||
|
(拆分是纯搬迁,任何坐标位移都是 bug)
|
||||||
|
|
||||||
|
### 输出形状
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"contract": "native-road-package/v1",
|
||||||
|
"areaId": "fengshu-er-road",
|
||||||
|
"files": {
|
||||||
|
"compiled.json": { "contentHash": "…", "bytes": 12345 },
|
||||||
|
"diagnostics.json": { "contentHash": "…", "bytes": 678, "count": 42 },
|
||||||
|
"layers/road_surface.geojson": {
|
||||||
|
"contentHash": "…", "orderHash": "…", "features": 128 }
|
||||||
|
},
|
||||||
|
"volatileExcluded": ["source.osm", "source.overrides", "<staging>"]
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
`count` / `features` 是冗余的人类可读字段 —— hash 变了但计数没变,
|
||||||
|
说明是内容变化;计数也变了,说明是增删。加速归因。
|
||||||
|
|
||||||
|
## 3. 基线目录布局
|
||||||
|
|
||||||
|
```
|
||||||
|
.trellis/tasks/08-25-road-compiler-extraction/baseline/
|
||||||
|
fengshu-er-road.json
|
||||||
|
nantaizi-lake-innovation-valley.json
|
||||||
|
README.md ← 记录生成时的 git commit、命令、volatile 字段清单
|
||||||
|
```
|
||||||
|
|
||||||
|
`README.md` 必须记录生成基线时的 commit hash,否则将来无法判断
|
||||||
|
"基线是在哪个代码状态下产生的"。
|
||||||
|
|
||||||
|
## 4. 为什么校验脚本放宿主而不是直接放未来的编译器仓库
|
||||||
|
|
||||||
|
Phase 0 时编译器仓库还不存在。脚本先落宿主 `scripts/`,
|
||||||
|
Phase 2 随编译器一起搬走,届时宿主保留一个薄封装(或直接调编译器包的 CLI)。
|
||||||
|
这样 Phase 1 的 parity 验证不需要等仓库拆分。
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"_example": "Fill with {\"file\": \"<path>\", \"reason\": \"<why>\"}. Put spec/research files only — no code paths. Run `python3 .trellis/scripts/get_context.py --mode packages` to list available specs. Delete this line once real entries are added."}
|
||||||
@@ -0,0 +1,118 @@
|
|||||||
|
# Phase 0 执行计划
|
||||||
|
|
||||||
|
## 前置
|
||||||
|
|
||||||
|
- [ ] 分支:`experiment/road-compiler-rethink`(已在)
|
||||||
|
- [ ] 确认工作区干净(`.trellis/tmp-*.js` 五个未跟踪文件与本任务无关,可先清理或忽略)
|
||||||
|
- [ ] 阅读父任务 `design.md` §1 契约定义
|
||||||
|
|
||||||
|
## Step 1 — 摸清两区域当前状态
|
||||||
|
|
||||||
|
```bash
|
||||||
|
ls config/areas/
|
||||||
|
for d in outputs/*/native-road/layers; do echo "$d: $(ls $d | wc -l)"; done
|
||||||
|
```
|
||||||
|
|
||||||
|
判定:`hanyang-block` 为废案,不纳入本阶段;只核查两个有效区域的配置与当前产物。
|
||||||
|
|
||||||
|
- [x] 逐区域检查 config 的 `nativeRoad.edgeLines` / `junctionTemplates.enabled`
|
||||||
|
- [x] 将两个有效区域的配置差异记录在基线 README
|
||||||
|
|
||||||
|
**门槛**:两个有效区域的图层差异有书面解释。
|
||||||
|
|
||||||
|
## Step 2 — 确定性核查
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 备份
|
||||||
|
cp -r outputs/<area>/native-road /tmp/rc-baseline-a
|
||||||
|
# 重编
|
||||||
|
rm -rf outputs/<area>/native-road
|
||||||
|
npm run road:compile -- --config config/areas/<area>.json
|
||||||
|
cp -r outputs/<area>/native-road /tmp/rc-baseline-b
|
||||||
|
# 比对
|
||||||
|
diff -r /tmp/rc-baseline-a /tmp/rc-baseline-b
|
||||||
|
```
|
||||||
|
|
||||||
|
- [x] 对两个有效区域各跑一遍
|
||||||
|
- [x] 记录所有差异字段 → volatile 清单
|
||||||
|
- [x] 额外一轮:删掉 `native-traffic-signals.json` 重生成,
|
||||||
|
确认信号 ID 是否确定(`traffic-signals.js` require 了 `crypto`,重点核查)
|
||||||
|
- [ ] 若发现**几何坐标级**的非确定性 → 停止本阶段,先开 bug 任务修掉
|
||||||
|
|
||||||
|
**门槛** 🔴:确定性已证明,或非确定性已定位并修复。这是全案的地基。
|
||||||
|
|
||||||
|
## Step 3 — 写 `scripts/road-parity.js`
|
||||||
|
|
||||||
|
按 `design.md` §2 实现。
|
||||||
|
|
||||||
|
- [x] `--snapshot` 生成归一化 checksum 清单
|
||||||
|
- [x] `--compare` 比对并逐文件报差异,不一致时非零退出
|
||||||
|
- [x] GeoJSON 双 hash(`contentHash` 排序后 / `orderHash` 原序)
|
||||||
|
- [x] volatile 字段按 Step 2 结论归一化
|
||||||
|
- [x] 自验:同一区域连跑两次 snapshot,`--compare` 必须通过
|
||||||
|
|
||||||
|
```bash
|
||||||
|
node scripts/road-parity.js --config config/areas/fengshu-er-road.json --snapshot /tmp/s1.json
|
||||||
|
node scripts/road-parity.js --config config/areas/fengshu-er-road.json --compare /tmp/s1.json
|
||||||
|
echo "exit=$?" # 必须为 0
|
||||||
|
```
|
||||||
|
|
||||||
|
**门槛**:脚本对未改动的代码报告一致。
|
||||||
|
|
||||||
|
## Step 4 — 建立两区域基线
|
||||||
|
|
||||||
|
```bash
|
||||||
|
mkdir -p .trellis/tasks/08-25-road-compiler-extraction/baseline
|
||||||
|
for a in fengshu-er-road nantaizi-lake-innovation-valley; do
|
||||||
|
rm -rf outputs/$a/native-road
|
||||||
|
npm run road:compile -- --config config/areas/$a.json
|
||||||
|
node scripts/road-parity.js --config config/areas/$a.json \
|
||||||
|
--snapshot .trellis/tasks/08-25-road-compiler-extraction/baseline/$a.json
|
||||||
|
done
|
||||||
|
```
|
||||||
|
|
||||||
|
- [x] 两个基线 JSON 生成
|
||||||
|
- [x] 写 `baseline/README.md`:生成时的 git commit、命令、volatile 字段清单、
|
||||||
|
两个有效区域图层差异的解释
|
||||||
|
- [x] 反向自验:再跑一次 `--compare` 两个基线全部通过
|
||||||
|
|
||||||
|
## Step 5 — K2 决策
|
||||||
|
|
||||||
|
- [x] 检查 `comparison.json` 当前是否真被消费(grep 宿主与 workbench)
|
||||||
|
- [x] 若有 → 方案 B(可选注入),在契约里定义 `comparisonDir` 为 optional
|
||||||
|
|
||||||
|
## Step 6 — 落契约文档
|
||||||
|
|
||||||
|
- [x] 写 `docs/native-road-package-v1.md`,内容源自父任务 `design.md` §1
|
||||||
|
- [x] 补入 Step 2 的 volatile 字段清单
|
||||||
|
- [x] 补入 Step 5 的 K2 决策
|
||||||
|
- [x] 在 `docs/changelog.md` 记一行
|
||||||
|
|
||||||
|
## 验证命令汇总
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# parity 两区域全绿
|
||||||
|
for a in fengshu-er-road nantaizi-lake-innovation-valley; do
|
||||||
|
node scripts/road-parity.js --config config/areas/$a.json \
|
||||||
|
--compare .trellis/tasks/08-25-road-compiler-extraction/baseline/$a.json || echo "FAIL $a"
|
||||||
|
done
|
||||||
|
|
||||||
|
# 既有测试未破
|
||||||
|
npm run test:native-road
|
||||||
|
npm run test:road-workbench
|
||||||
|
|
||||||
|
# 确认无生产代码改动
|
||||||
|
git diff --stat -- scripts/lib blender
|
||||||
|
```
|
||||||
|
|
||||||
|
最后一条必须为空输出 —— Phase 0 不碰生产代码。
|
||||||
|
|
||||||
|
## Review Gate
|
||||||
|
|
||||||
|
全部 AC0.1–AC0.6 打勾后,再进 Phase 1。**基线不可靠时不要前进。**
|
||||||
|
|
||||||
|
## Rollback
|
||||||
|
|
||||||
|
本阶段纯新增(文档 / 脚本 / 基线数据)。回滚 = 删除新增文件。
|
||||||
|
唯一例外:Step 2 若发现并修复了非确定性 bug,那部分是真实代码改动,
|
||||||
|
应拆成独立 commit 并单独保留。
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
# Phase 0:冻结契约与 parity 基线
|
||||||
|
|
||||||
|
父任务:`.trellis/tasks/08-25-road-compiler-extraction/`
|
||||||
|
契约权威定义:父任务 `design.md` §1
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
|
||||||
|
在任何代码移动之前,把 `native-road-package/v1` 契约落成仓库内文档,
|
||||||
|
并为两个有效区域建立可复跑的逐文件 parity 基线,作为全案唯一 oracle。
|
||||||
|
|
||||||
|
**本阶段不移动、不重构任何生产代码。** 只新增文档、基线数据和一个校验脚本。
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
### R0.1 契约文档
|
||||||
|
|
||||||
|
- 把父任务 `design.md` §1(输入契约 / 输出契约 / 消费方式)落成
|
||||||
|
`docs/native-road-package-v1.md`。
|
||||||
|
- 文档必须列全 12 个图层名、`compiled.json` 顶层结构、`diagnostics.json` 记录形状、
|
||||||
|
stdout 标记格式。
|
||||||
|
- Phase 2 会把该文档搬进编译器仓库,此处先落在宿主。
|
||||||
|
|
||||||
|
### R0.2 确定性前置核查 🔴
|
||||||
|
|
||||||
|
**基线只有在编译器确定性的前提下才有意义。** 必须先证明这一点。
|
||||||
|
|
||||||
|
- 对同一输入连续跑两次 `road:compile`,比较全部输出文件。
|
||||||
|
- 识别并记录所有 volatile 字段(时间戳、绝对路径、staging 目录名、
|
||||||
|
任何来自 `mkdtemp` 的随机名、Map/Set 迭代顺序敏感的输出)。
|
||||||
|
- 校验脚本必须归一化或排除这些字段。
|
||||||
|
- 若发现真实的非确定性(相同输入产出不同几何),**必须先修掉再继续**,
|
||||||
|
否则整个拆分没有 oracle。
|
||||||
|
|
||||||
|
### R0.3 parity 校验脚本
|
||||||
|
|
||||||
|
- 新增 `scripts/road-parity.js`(宿主侧,Phase 2 随编译器搬走)。
|
||||||
|
- 能力:
|
||||||
|
- `--snapshot <out.json>` 遍历指定区域的 `native-road/` 全部文件 +
|
||||||
|
`native-traffic-signals.json`,归一化后输出排序稳定的 checksum 清单
|
||||||
|
- `--compare <baseline.json>` 与基线比对,差异逐文件报告
|
||||||
|
- 非零退出码表示不一致
|
||||||
|
- GeoJSON 需按稳定键排序后再 hash(避免 feature 顺序抖动造成假阳性),
|
||||||
|
但**顺序本身若变化必须被报告**——用两个 hash:`contentHash`(排序后)
|
||||||
|
与 `orderHash`(原序),分别报告。
|
||||||
|
|
||||||
|
### R0.4 两区域基线
|
||||||
|
|
||||||
|
- 区域:`fengshu-er-road`、`nantaizi-lake-innovation-valley`
|
||||||
|
- 从干净状态跑 `npm run road:compile`,产出基线 JSON 提交进版本控制
|
||||||
|
- 基线文件位置:`.trellis/tasks/08-25-road-compiler-extraction/baseline/<area>.json`
|
||||||
|
(Phase 2 搬进编译器仓库当测试语料,见父任务 R4)
|
||||||
|
|
||||||
|
`hanyang-block` 是废案,不纳入编译、快照或后续 parity 兼容范围。
|
||||||
|
|
||||||
|
### R0.5 K2 决策定档
|
||||||
|
|
||||||
|
`comparison.json` 依赖宿主 osm2streets 产物(`compile-native-roads.js:87` 读
|
||||||
|
`area.outputs.geojsonDir`),拆出后不可达。本阶段必须做出决策并写入契约文档:
|
||||||
|
|
||||||
|
- 方案 A:移除 `comparison.json`(osm2streets 已 legacy)
|
||||||
|
- 方案 B:保留,`comparisonDir` 作为可选输入注入
|
||||||
|
- 倾向 A。决策写入 `docs/native-road-package-v1.md` 的「已移除能力」一节。
|
||||||
|
|
||||||
|
## Acceptance Criteria
|
||||||
|
|
||||||
|
- [x] AC0.1 `docs/native-road-package-v1.md` 存在,覆盖输入契约、输出契约、
|
||||||
|
12 图层清单、stdout 标记、已移除能力
|
||||||
|
- [x] AC0.2 连续两次编译的 parity 比对通过(确定性已证明),volatile 字段清单已记录在文档内
|
||||||
|
- [x] AC0.3 `scripts/road-parity.js` 可用,`--snapshot` / `--compare` 均工作,
|
||||||
|
不一致时非零退出
|
||||||
|
- [x] AC0.4 两个区域基线 JSON 已提交,且每个都能用 `--compare` 自比对通过
|
||||||
|
- [x] AC0.5 K2 决策已定档并写入契约文档
|
||||||
|
- [x] AC0.6 未修改任何生产代码(`git diff` 只含新增文档 / 脚本 / 基线)
|
||||||
|
|
||||||
|
## 依赖与顺序
|
||||||
|
|
||||||
|
- 无前置依赖,本阶段是全案入口
|
||||||
|
- **阻塞** Phase 1、2、3、4 —— 没有基线就没有 oracle
|
||||||
|
|
||||||
|
## Out of Scope
|
||||||
|
|
||||||
|
- 任何生产代码改动(含"顺手修一下")
|
||||||
|
- 目录结构调整
|
||||||
|
- `compiled.json` 结构变更
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"id": "rc-p0-contract-baseline",
|
||||||
|
"name": "rc-p0-contract-baseline",
|
||||||
|
"title": "Phase 0:冻结契约与 parity 基线",
|
||||||
|
"description": "写死 native-road-package/v1 输入输出契约,并对两个有效区域建立逐文件 checksum 基线作为全案 oracle",
|
||||||
|
"status": "completed",
|
||||||
|
"dev_type": null,
|
||||||
|
"scope": null,
|
||||||
|
"package": null,
|
||||||
|
"priority": "P1",
|
||||||
|
"creator": "dingkang",
|
||||||
|
"assignee": "dingkang",
|
||||||
|
"createdAt": "2026-08-25",
|
||||||
|
"completedAt": "2026-08-25",
|
||||||
|
"branch": null,
|
||||||
|
"base_branch": "main",
|
||||||
|
"worktree_path": null,
|
||||||
|
"commit": null,
|
||||||
|
"pr_url": null,
|
||||||
|
"subtasks": [],
|
||||||
|
"children": [],
|
||||||
|
"parent": "08-25-road-compiler-extraction",
|
||||||
|
"relatedFiles": [],
|
||||||
|
"notes": "",
|
||||||
|
"meta": {}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"_example": "Fill with {\"file\": \"<path>\", \"reason\": \"<why>\"}. Put spec/research files only — no code paths. Run `python3 .trellis/scripts/get_context.py --mode packages` to list available specs. Delete this line once real entries are added."}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
# Phase 1 Technical Design
|
||||||
|
|
||||||
|
## Boundary
|
||||||
|
|
||||||
|
`packages/road-compiler/` becomes the single implementation owner for native
|
||||||
|
road compilation. It is a CommonJS workspace package with explicit public
|
||||||
|
entrypoints for compiler APIs, traffic-signal schema, turn-lane helpers, OSM
|
||||||
|
parsing, reference conversion, and CLIs. It never imports `area-config`, reads
|
||||||
|
`config/areas`, or derives host paths.
|
||||||
|
|
||||||
|
The host owns `scripts/lib/area-config.js` and maps normalized configuration to
|
||||||
|
the v1 `RoadCompilerInput` shape using `toRoadCompilerInput(area)`. During P1,
|
||||||
|
`build-area.js` calls the package in-process; P2 is the only phase that changes
|
||||||
|
that call to a child process.
|
||||||
|
|
||||||
|
## Source Ownership and Compatibility
|
||||||
|
|
||||||
|
The following current `scripts/lib` implementations move into package `src`:
|
||||||
|
`native-road`, `complex-junction`, `turn-lane-arrows`, `lane-geometry`,
|
||||||
|
`gaode-junction-reference`, `native-traffic-signals`, and `osm`.
|
||||||
|
|
||||||
|
Some moved modules also serve legacy host paths: QGIS uses turn-lane arrows,
|
||||||
|
vehicle preview and reimport use OSM parsing, and preview tests use lane
|
||||||
|
geometry. Those consumers import the package entrypoints after the move. This
|
||||||
|
preserves one implementation while allowing host -> package dependency.
|
||||||
|
|
||||||
|
Traffic signal ownership follows the matrix in
|
||||||
|
`research/traffic-signals-split-matrix.md`: schema, geometry, validation, and
|
||||||
|
runtime construction move to the package. The host retains only two file-I/O
|
||||||
|
adapters, `readTrafficSignalFeatures()` and `readTrafficSignals()`, both
|
||||||
|
delegating to package exports. No duplicated schema code remains.
|
||||||
|
|
||||||
|
## Input and Path Handling
|
||||||
|
|
||||||
|
The package compiler API accepts only `RoadCompilerInput` from
|
||||||
|
`docs/native-road-package-v1.md`. Package CLI commands accept an explicit JSON
|
||||||
|
input file (`--input`) and never load area configuration. The compatibility
|
||||||
|
host CLI still accepts `--config`, but immediately maps it through
|
||||||
|
`toRoadCompilerInput()` before entering the package.
|
||||||
|
|
||||||
|
`junctionTemplates.*.referenceFile` changes to a path relative to its area
|
||||||
|
configuration. `readAreaConfig()` resolves it while normalizing configuration;
|
||||||
|
the package receives an absolute path and does no path resolution.
|
||||||
|
|
||||||
|
## Tests and Rollout
|
||||||
|
|
||||||
|
The package receives the required Fengshu OSM fixture plus migrated unit tests.
|
||||||
|
Its `npm test` must run from the package directory without reading host inputs
|
||||||
|
or outputs. After each source batch, run the two Phase 0 parity baselines. The
|
||||||
|
existing host command names remain compatibility wrappers through P1.
|
||||||
|
|
||||||
|
Rollback is a normal Git revert of the latest batch commit. No module has a
|
||||||
|
parallel host copy after its batch lands, preventing divergence.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"_example": "Fill with {\"file\": \"<path>\", \"reason\": \"<why>\"}. Put spec/research files only — no code paths. Run `python3 .trellis/scripts/get_context.py --mode packages` to list available specs. Delete this line once real entries are added."}
|
||||||
@@ -0,0 +1,118 @@
|
|||||||
|
# Phase 1 执行计划
|
||||||
|
|
||||||
|
分批搬迁,每批后跑 parity。**不要一次性大搬。**
|
||||||
|
|
||||||
|
## Step 0 — 前置
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 基线必须先绿
|
||||||
|
for a in fengshu-er-road nantaizi-lake-innovation-valley; do
|
||||||
|
node scripts/road-parity.js --config config/areas/$a.json \
|
||||||
|
--compare .trellis/tasks/08-25-road-compiler-extraction/baseline/$a.json || echo "FAIL $a"
|
||||||
|
done
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] 两个有效区域基线全绿(否则回 Phase 0)
|
||||||
|
|
||||||
|
## Step 1 — K1 矩阵(动代码之前)
|
||||||
|
|
||||||
|
- [ ] 读 `scripts/lib/traffic-signals.js` 全文,列出所有 export
|
||||||
|
- [ ] 对每个 export `grep -rn` 找使用方
|
||||||
|
- [ ] 产出 `research/traffic-signals-split-matrix.md`:函数 × 使用方 × 归属判定
|
||||||
|
- [ ] `buildTrafficSignals`(`test-preview-assets.js`)归属定档
|
||||||
|
|
||||||
|
**门槛**:矩阵完成,无"待定"项。
|
||||||
|
|
||||||
|
## Step 2 — 建包骨架
|
||||||
|
|
||||||
|
```
|
||||||
|
packages/road-compiler/
|
||||||
|
package.json # CommonJS,无构建步骤(父任务 C2)
|
||||||
|
src/
|
||||||
|
bin/
|
||||||
|
test/fixtures/
|
||||||
|
docs/
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] `package.json` 名称、入口、`test` script
|
||||||
|
- [ ] 根 `package.json` 加 workspace 或 `file:` 依赖
|
||||||
|
|
||||||
|
## Step 3 — 分批搬迁(每批一个 commit + 一次 parity)
|
||||||
|
|
||||||
|
**批 1:纯函数,零风险**
|
||||||
|
- [ ] `lib/lane-geometry.js` → `src/geometry/lane-geometry.js`
|
||||||
|
- [ ] `lib/gaode-junction-reference.js` → `src/reference/gaode.js`
|
||||||
|
- [ ] 宿主侧改 require 指向包
|
||||||
|
- [ ] parity ✓
|
||||||
|
|
||||||
|
**批 2:几何模块**
|
||||||
|
- [ ] `lib/turn-lane-arrows.js`
|
||||||
|
- [ ] `lib/complex-junction.js`
|
||||||
|
- [ ] parity ✓
|
||||||
|
|
||||||
|
**批 3:信号(K1 执行)**
|
||||||
|
- [ ] 按 Step 1 矩阵拆 `lib/traffic-signals.js`
|
||||||
|
- [ ] `lib/native-traffic-signals.js` 与 schema 部分入包
|
||||||
|
- [ ] `lib/osm.js` 入包
|
||||||
|
- [ ] 宿主保留 legacy 读取器,从包 import schema
|
||||||
|
- [ ] parity ✓ + `npm run test:traffic-signals`(若存在)
|
||||||
|
|
||||||
|
**批 4:编译器核心**
|
||||||
|
- [ ] `lib/native-road.js` → `src/compile/native-road.js`
|
||||||
|
- [ ] parity ✓
|
||||||
|
|
||||||
|
**批 5:CLI + 窄契约(R1.2)**
|
||||||
|
- [ ] `compile-native-roads.js` → `bin/compile.js`,入参改 `RoadCompilerInput`
|
||||||
|
- [ ] `check-native-roads.js` → `bin/check.js`
|
||||||
|
- [ ] 宿主 `area-config.js` 加 `toRoadCompilerInput(area)`
|
||||||
|
- [ ] `build-area.js` 改为传 input 对象
|
||||||
|
- [ ] K3:`referenceFile` 改为宿主解析后传绝对路径,config 内改相对路径
|
||||||
|
- [ ] parity ✓
|
||||||
|
|
||||||
|
**批 6:workbench**
|
||||||
|
- [ ] `road-workbench.js` + `workbench/app.js` 入包
|
||||||
|
- [ ] OpenLayers 依赖暂沿用宿主 `node_modules`(同仓库内可行),记入 Phase 2 K4
|
||||||
|
- [ ] `npm run test:road-workbench` ✓
|
||||||
|
|
||||||
|
**批 7:测试 fixture(R1.5)**
|
||||||
|
- [ ] `inputs/osm/枫树二路.osm` 复制进 `test/fixtures/`
|
||||||
|
- [ ] `test-native-road.js` 改读包内 fixture
|
||||||
|
- [ ] 在包目录内独立跑 `npm test` ✓
|
||||||
|
|
||||||
|
## Step 4 — 清理与验证
|
||||||
|
|
||||||
|
- [ ] 删除 `scripts/lib/` 下所有搬迁文件的残留(AC1.6)
|
||||||
|
- [ ] `grep -rn "area-config\|config/areas" packages/road-compiler/` 必须为空(AC1.4)
|
||||||
|
- [ ] `grep -rn "\.\./\.\./scripts\|osm2streets-qgis-workflow" packages/road-compiler/` 检查反向依赖
|
||||||
|
|
||||||
|
## 验证命令汇总
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# parity
|
||||||
|
for a in fengshu-er-road nantaizi-lake-innovation-valley; do
|
||||||
|
node scripts/road-parity.js --config config/areas/$a.json \
|
||||||
|
--compare .trellis/tasks/08-25-road-compiler-extraction/baseline/$a.json || echo "FAIL $a"
|
||||||
|
done
|
||||||
|
|
||||||
|
# 测试
|
||||||
|
npm run test:native-road
|
||||||
|
npm run test:road-workbench
|
||||||
|
(cd packages/road-compiler && npm test)
|
||||||
|
|
||||||
|
# 端到端(含 blender / cesium)
|
||||||
|
npm run build:area -- --config config/areas/fengshu-er-road.json
|
||||||
|
|
||||||
|
# 反向依赖为 0
|
||||||
|
grep -rn "area-config\|config/areas" packages/road-compiler/ && echo "VIOLATION"
|
||||||
|
```
|
||||||
|
|
||||||
|
## Review Gate
|
||||||
|
|
||||||
|
AC1.1–AC1.8 全绿。**parity 有任何一项不绿都不得进 Phase 2** —— 那意味着搬迁改变了行为,
|
||||||
|
而在同一仓库内查因比拆仓库后查因便宜得多。
|
||||||
|
|
||||||
|
## Rollback
|
||||||
|
|
||||||
|
每批一个 commit,可逐批 `git revert`。
|
||||||
|
过渡期内若需紧急回退,宿主 require 改回 `scripts/lib/` 旧路径即可
|
||||||
|
(前提:该批尚未执行 Step 4 清理)。
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
# Phase 1:包边界(不换仓库)
|
||||||
|
|
||||||
|
父任务:`.trellis/tasks/08-25-road-compiler-extraction/`
|
||||||
|
技术设计:父任务 `design.md` §2(模块清单 / K1 拆分建议)
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
|
||||||
|
在**当前仓库内**建立 `packages/road-compiler/`,移入编译器全部模块,
|
||||||
|
把对 `readAreaConfig` 的耦合换成窄输入契约,产物对 Phase 0 基线逐字节一致。
|
||||||
|
|
||||||
|
**本阶段不换仓库。** 目的是把"改坏了编译器"与"拆坏了仓库"分成两个可归因的步骤
|
||||||
|
(父任务 D4)。
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
### R1.1 目录与模块搬迁
|
||||||
|
|
||||||
|
在 `packages/road-compiler/` 内建立结构,移入父任务 `design.md` §2.1 列出的全部文件
|
||||||
|
(约 3400 行核心 + workbench)。
|
||||||
|
|
||||||
|
搬迁后 `scripts/lib/` 下不应再留下这些文件的副本 —— 并存会导致
|
||||||
|
"改了一份忘了另一份"的静默不一致。
|
||||||
|
|
||||||
|
### R1.2 窄输入契约
|
||||||
|
|
||||||
|
- 编译器入口只接受父任务 `design.md` §1.1 定义的 `RoadCompilerInput`
|
||||||
|
- 编译器内不得出现 `require("area-config")`、不得读 `config/areas/*.json`、
|
||||||
|
不得从 areaId 推导任何路径
|
||||||
|
- 宿主 `scripts/lib/area-config.js` 新增 `toRoadCompilerInput(area)` 做映射
|
||||||
|
- 三个 CLI(`compile` / `check` / `workbench`)改为接受显式参数或 input JSON
|
||||||
|
|
||||||
|
### R1.3 K1:`traffic-signals.js` 拆分 🔴
|
||||||
|
|
||||||
|
**全案唯一需要细读再动的地方。** 按父任务 `design.md` §2.3:
|
||||||
|
|
||||||
|
- 随编译器走:OSM 信号节点提取 + 信号文档 schema
|
||||||
|
- 留宿主:`readTrafficSignalFeatures`(`build-osm2streets-qgis.js`)、
|
||||||
|
`readTrafficSignals`(`build-area.js`)
|
||||||
|
- 待判定:`buildTrafficSignals`(`test-preview-assets.js`)—— 需读代码确认归属
|
||||||
|
- 拆完后宿主从编译器包 import schema(宿主→编译器是允许方向)
|
||||||
|
|
||||||
|
动手前必须先产出一份「函数 × 使用方」矩阵,确认无遗漏。
|
||||||
|
|
||||||
|
### R1.4 K3:参考文件路径约定
|
||||||
|
|
||||||
|
`config/areas/fengshu-er-road.json` 的
|
||||||
|
`junctionTemplates.clusters[].referenceFile` 是指向宿主仓库的绝对路径。
|
||||||
|
|
||||||
|
- 定义解析约定:相对 config 文件所在目录,或由宿主在 `toRoadCompilerInput()`
|
||||||
|
中解析为绝对路径后传入
|
||||||
|
- 倾向后者:**编译器只接受已解析的绝对路径,不做路径推导**(符合 R1.2)
|
||||||
|
- config 内改为相对路径,宿主负责解析
|
||||||
|
|
||||||
|
### R1.5 K5:自带测试 fixture
|
||||||
|
|
||||||
|
- `test-native-road.js:167` 读 `inputs/osm/枫树二路.osm`
|
||||||
|
- 该文件(或裁剪版)复制进 `packages/road-compiler/test/fixtures/`
|
||||||
|
- 测试改为读包内 fixture,不再访问宿主 `inputs/`
|
||||||
|
- 目标:编译器包 `npm test` 不依赖宿主任何目录
|
||||||
|
|
||||||
|
### R1.6 宿主侧接线保持不变
|
||||||
|
|
||||||
|
- `build-area.js` 本阶段继续 in-process `require`(子进程改造留到 Phase 2)
|
||||||
|
- `npm run road:compile` / `road:check` / `road:workbench` 行为对用户不变
|
||||||
|
- `blender/` 完全不改
|
||||||
|
|
||||||
|
## Acceptance Criteria
|
||||||
|
|
||||||
|
- [x] AC1.1 两个有效区域 `road-parity --compare` 对 Phase 0 基线全绿
|
||||||
|
- [x] AC1.2 `npm run test:native-road`、`npm run test:road-workbench` 通过
|
||||||
|
- [x] AC1.3 `npm run build:area` 枫树二路完整跑通(含 blender / cesium 阶段)
|
||||||
|
- [x] AC1.4 `grep -rn "area-config\|config/areas" packages/road-compiler/` 无命中
|
||||||
|
- [x] AC1.5 `packages/road-compiler/` 内 `npm test` 不访问宿主 `inputs/` 或 `outputs/`
|
||||||
|
- [x] AC1.6 `scripts/lib/` 下无搬迁文件的残留副本
|
||||||
|
- [x] AC1.7 K1 的「函数 × 使用方」矩阵已产出并归档到 `research/`
|
||||||
|
- [x] AC1.8 `compiled.json` 结构未变(父任务 AC7 / C1)
|
||||||
|
|
||||||
|
## 依赖与顺序
|
||||||
|
|
||||||
|
- **前置**:Phase 0 必须完成且基线可靠
|
||||||
|
- **阻塞**:Phase 2
|
||||||
|
- 与 Phase 3、4 无直接依赖,但它们都在 Phase 2 之后
|
||||||
|
|
||||||
|
## 风险
|
||||||
|
|
||||||
|
| 风险 | 缓解 |
|
||||||
|
|---|---|
|
||||||
|
| K1 拆分遗漏某个使用方 → 运行时才炸 | 先做矩阵,再动代码;`grep -rn` 全仓验证 |
|
||||||
|
| 搬迁过程中相对 require 路径改错 | 分小步 commit,每步跑 parity |
|
||||||
|
| `workbench/app.js` 的 OpenLayers import map 指向宿主 node_modules | 本阶段仍在同仓库,可暂不处理;记入 Phase 2(K4) |
|
||||||
|
| 一次性大搬迁难以归因 | 按模块分批:先纯函数(lane-geometry / gaode-reference),再 complex-junction,最后 native-road 与 CLI |
|
||||||
|
|
||||||
|
## Out of Scope
|
||||||
|
|
||||||
|
- 换仓库(Phase 2)
|
||||||
|
- layer manifest(Phase 3)
|
||||||
|
- IR / pass manager 重构(父任务 C1)
|
||||||
|
- 引入 TypeScript 或构建步骤(父任务 C2)
|
||||||
+21
@@ -0,0 +1,21 @@
|
|||||||
|
# Traffic Signals Split Matrix
|
||||||
|
|
||||||
|
Evidence gathered from `scripts/lib/traffic-signals.js` and repository-wide
|
||||||
|
call-site search on 2026-08-25.
|
||||||
|
|
||||||
|
| Export | Current users | Owner after P1 | Migration |
|
||||||
|
|---|---|---|---|
|
||||||
|
| `SIGNAL_LAYOUT` | `buildTrafficSignalsFromFeatures` | compiler package | Export from `@osm-asset/road-compiler/traffic-signals` |
|
||||||
|
| `signalNodeKey` | `buildTrafficSignalsFromFeatures` | compiler package | No host caller today; preserve public export for runtime identity contract |
|
||||||
|
| `buildTrafficSignalFeatures` | `native-traffic-signals`, `readTrafficSignalFeatures` | compiler package | Host QGIS adapter imports it from the package |
|
||||||
|
| `validateTrafficSignalFeatures` | `native-traffic-signals`, signal tests | compiler package | Tests import package entrypoint |
|
||||||
|
| `validateTrafficSignalSourceReferences` | `native-traffic-signals`, `reimport-gpkg`, `readTrafficSignals` | compiler package | Reimport adapter imports package function |
|
||||||
|
| `buildTrafficSignalsFromFeatures` | `native-traffic-signals`, `readTrafficSignals`, `buildTrafficSignals` | compiler package | Host preview adapter imports package function |
|
||||||
|
| `buildTrafficSignals` | `test-preview-assets` | compiler package | Test imports package function; it is geometry/schema behavior, not host I/O |
|
||||||
|
| `readTrafficSignalFeatures` | `build-osm2streets-qgis` | host adapter | Keep a thin file-reading wrapper under `scripts/lib/traffic-signals.js`; it imports package functions |
|
||||||
|
| `readTrafficSignals` | `build-area` | host adapter | Keep a thin file-reading wrapper under `scripts/lib/traffic-signals.js`; it imports package functions |
|
||||||
|
|
||||||
|
`scripts/lib/traffic-signals.js` must not retain a second implementation of
|
||||||
|
the schema or geometry. Its only P1 responsibility is host file I/O for the
|
||||||
|
legacy QGIS / preview paths. This preserves the one-way dependency:
|
||||||
|
host -> compiler package; the package never imports the host.
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"id": "rc-p1-package-boundary",
|
||||||
|
"name": "rc-p1-package-boundary",
|
||||||
|
"title": "Phase 1:包边界(不换仓库)",
|
||||||
|
"description": "在本仓库内建 packages/road-compiler,移入编译器模块,用窄输入契约替换 readAreaConfig 耦合,产物对基线逐字节一致",
|
||||||
|
"status": "completed",
|
||||||
|
"dev_type": null,
|
||||||
|
"scope": null,
|
||||||
|
"package": null,
|
||||||
|
"priority": "P1",
|
||||||
|
"creator": "dingkang",
|
||||||
|
"assignee": "dingkang",
|
||||||
|
"createdAt": "2026-08-25",
|
||||||
|
"completedAt": "2026-08-25",
|
||||||
|
"branch": null,
|
||||||
|
"base_branch": "main",
|
||||||
|
"worktree_path": null,
|
||||||
|
"commit": null,
|
||||||
|
"pr_url": null,
|
||||||
|
"subtasks": [],
|
||||||
|
"children": [],
|
||||||
|
"parent": "08-25-road-compiler-extraction",
|
||||||
|
"relatedFiles": [],
|
||||||
|
"notes": "",
|
||||||
|
"meta": {}
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
{"file":".trellis/spec/pipeline/external-tools.md","reason":"检查 CLI 子进程错误、signal 与日志处理是否符合宿主管线约定。"}
|
||||||
|
{"file":".trellis/spec/pipeline/cli-and-stages.md","reason":"检查编译阶段、完成标记和 stage manifest 的跨层影响。"}
|
||||||
|
{"file":".trellis/spec/guides/cross-layer-thinking-guide.md","reason":"检查配置、Node pipeline、Blender 消费链的边界没有漂移。"}
|
||||||
|
{"file":".trellis/spec/guides/artifact-parity-guide.md","reason":"检查两个有效区域的严格基线 parity。"}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
# Phase 2:独立仓库与 CLI 边界设计
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
P1 已将实现收敛到 `packages/road-compiler/`。P2 把该目录以保留历史的方式导出为独立 package 仓库,保留两个明确方向的边界:
|
||||||
|
|
||||||
|
```
|
||||||
|
宿主 area config
|
||||||
|
-> scripts/lib/area-config.js
|
||||||
|
-> RoadCompilerInput JSON(宿主 staging)
|
||||||
|
-> @osm-asset/road-compiler CLI(子进程)
|
||||||
|
-> native-road/ + NATIVE_ROAD_COMPILE_DONE
|
||||||
|
-> build-area.js / Blender / preview
|
||||||
|
```
|
||||||
|
|
||||||
|
编译器不知道区域配置、宿主仓库、Blender 或宿主输出目录约定以外的输入路径。宿主不知道 compiler 内部源文件;它只拥有输入 JSON、CLI 的完成标记和写出的契约文件。
|
||||||
|
|
||||||
|
## CLI Contract
|
||||||
|
|
||||||
|
- CLI 接收一个 JSON 文件中的 `RoadCompilerInput`,而不是宿主的 area config。
|
||||||
|
- `comparisonDir` 继续作为可选输入,以维持现有 `comparison.json` 产物和 P0 baseline 的可比性。
|
||||||
|
- 成功只打印一次 `NATIVE_ROAD_COMPILE_DONE <JSON>`。payload 必须至少含 `areaId`、`output`、`roads`、`endpoints` 和 `diagnostics`。
|
||||||
|
- `build-area.js` 保持同步批处理模式,子进程日志对用户可见;为了验证标记,输出同时被捕获或 tee。它对启动失败、非零状态、signal、缺失/重复/非法标记和 payload 与当前输入不一致都报错。
|
||||||
|
- 产物先由 compiler 的现有 staging/atomic promotion 逻辑写入目标 `native-road/`;宿主不接管这一写入过程。
|
||||||
|
|
||||||
|
## Repository Contents
|
||||||
|
|
||||||
|
独立仓库拥有:compiler source、public API、CLI、check、workbench、fixture、两个 parity baseline、契约文档、README、package lockfile 和 workbench 的 `ol` 依赖。测试和 workbench 均必须在没有宿主 checkout 的环境运行。
|
||||||
|
|
||||||
|
宿主保留:area-config 读取/归一化、`RoadCompilerInput` 映射、pipeline 阶段编排、Blender/preview、区域配置、运行产物和一份升级回归 baseline。宿主 spec 仅保留指针,契约正文随 compiler 仓库维护。
|
||||||
|
|
||||||
|
## History Extraction
|
||||||
|
|
||||||
|
导出只允许 `git subtree split` 或 `git filter-repo`。必须在独立仓库验证 `git log --follow src/compile/native-road.js`;验证的是迁移前的逻辑历史,而非仅 P1 的边界移动提交。导出和验证先在临时分支/clone 完成,外部远端创建和 push 必须使用用户给出的地址和授权范围。
|
||||||
|
|
||||||
|
## Dependency and Rollout
|
||||||
|
|
||||||
|
初始发布源定为私有 `https://git.app.que01.top/que01/road-compiler.git`。仓库以带注释 tag `v0.1.0` 首发,宿主以该精确 tag 作为依赖并写入 lockfile。开发临时形态可以指向独立 checkout 的本地 `file:` 依赖;它不能成为验收时的唯一消费方式。两个区域 parity 通过后删除 `packages/road-compiler/`;回滚由 revert 宿主消费改造实现,不能让 production host 继续直接 import 该目录。
|
||||||
|
|
||||||
|
## Compatibility and Risks
|
||||||
|
|
||||||
|
这是位置和调用方式迁移,不改变 compiler 行为。两个区域的 strict content/order hash 是主要 oracle;信号文档的确定性生成仍应通过 parity 覆盖。P2 不处理 `check:area` 的历史 stage-manifest freshness warning,也不把 Blender/Metal 沙箱问题归因为道路产物。
|
||||||
|
|
||||||
|
若外部 CLI 无法及时使用,回滚宿主消费 commit 即可;外部仓库历史和 tag 不需要删除。对于完整 Blender 构建,macOS Metal 初始化必须在提权的宿主环境运行。
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
{"file":".trellis/spec/pipeline/external-tools.md","reason":"CLI 子进程必须沿用管线的启动、日志和失败状态语义。"}
|
||||||
|
{"file":".trellis/spec/pipeline/cli-and-stages.md","reason":"编译是 Blender 前的 pipeline 输入阶段,需保持阶段与 stdout 契约。"}
|
||||||
|
{"file":".trellis/spec/config/index.md","reason":"宿主拥有区域配置归一化及 RoadCompilerInput 映射。"}
|
||||||
|
{"file":".trellis/spec/guides/artifact-parity-guide.md","reason":"本阶段声称产物不变,必须用严格 parity 验证。"}
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
# Phase 2 执行计划
|
||||||
|
|
||||||
|
执行前提:用户已在最新 P2 规划摘要后明确批准。发布目标已定为私有 `https://git.app.que01.top/que01/road-compiler.git`,首发 tag 为 `v0.1.0`。
|
||||||
|
|
||||||
|
## 1. 导出并核验历史
|
||||||
|
|
||||||
|
- [ ] 创建临时 export 分支或临时 clone,使用 `git subtree split --prefix=packages/road-compiler` 或 `git filter-repo --path packages/road-compiler/ --path-rename packages/road-compiler/:` 导出。
|
||||||
|
- [ ] 在导出仓库验证 `git log --follow src/compile/native-road.js` 包含 2026-08-13 以来的 native compiler 历史。
|
||||||
|
- [ ] 在私有 `https://git.app.que01.top/que01/road-compiler.git` 创建并推送独立仓库;创建带注释的 `v0.1.0` tag。
|
||||||
|
|
||||||
|
## 2. 使编译器仓库自持
|
||||||
|
|
||||||
|
- [ ] 将 CLI 作为 package `bin` 入口,接受由宿主写出的 `RoadCompilerInput` JSON,并继续输出唯一的 `NATIVE_ROAD_COMPILE_DONE` JSON 标记。
|
||||||
|
- [ ] 补全 `package.json`、锁文件和 `ol` 依赖;workbench vendor 文件从自身安装目录提供。
|
||||||
|
- [ ] 迁入 `docs/native-road-package-v1.md`、两个 baseline 和它们的测试驱动,新增独立 README。
|
||||||
|
- [ ] 在不含宿主文件的临时 clone 内执行依赖安装、单元测试、两区域 parity 与 workbench 启动测试。
|
||||||
|
- [ ] grep 验证没有 `area-config`、`config/areas`、宿主项目名或宿主相对路径引用。
|
||||||
|
|
||||||
|
## 3. 宿主改为外部 CLI 消费
|
||||||
|
|
||||||
|
- [ ] 将 compiler 以精确 git tag `v0.1.0` 安装到宿主并记录 lockfile;禁止范围版本、`latest`、`*` 和裸分支。
|
||||||
|
- [ ] 将 `toRoadCompilerInput()` 序列化到每个区域的 pipeline staging 目录,传给 compiler CLI。
|
||||||
|
- [ ] 在 `build-area.js` 的 blender 前置阶段调用 CLI。沿用管线的 `spawnSync` / `runCommand` 失败语义(启动错误、exit status、signal)和直通日志;缓冲或 tee stdout 后,解析恰好一个完成标记并验证其 `areaId`、`output` 与当前区域匹配。
|
||||||
|
- [ ] 将 host workbench 的 fresh compile 回调切换到同一 CLI,不改变 fresh-process 行为。
|
||||||
|
- [ ] 把所有 host 对 `packages/road-compiler/**` 的直接 import 替换成已安装包的公开 API 或 CLI;两个区域 parity 均通过后删除 in-host 副本。
|
||||||
|
- [ ] 将宿主 pipeline spec 改为指向编译器仓库所拥有的契约文档。
|
||||||
|
|
||||||
|
## 4. 验证与发布门
|
||||||
|
|
||||||
|
新仓库(干净 clone):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm ci
|
||||||
|
npm test
|
||||||
|
npm run test:road-parity
|
||||||
|
npm run road:workbench -- --config test/fixtures/fengshu-er-road.input.json --no-compile
|
||||||
|
```
|
||||||
|
|
||||||
|
宿主两个有效区域的逐字节 parity:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
node scripts/road-parity.js --config config/areas/fengshu-er-road.json \
|
||||||
|
--compare .trellis/tasks/08-25-road-compiler-extraction/baseline/fengshu-er-road.json
|
||||||
|
node scripts/road-parity.js --config config/areas/nantaizi-lake-innovation-valley.json \
|
||||||
|
--compare .trellis/tasks/08-25-road-compiler-extraction/baseline/nantaizi-lake-innovation-valley.json
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] 为 CLI 标记成功、缺失、重复、非法 JSON、areaId 不匹配和 output 不匹配补测试。
|
||||||
|
- [ ] 跑 package 单测、宿主 native-road / workbench / traffic signals / turn-lane-arrows 测试,以及两个 parity 检查。
|
||||||
|
- [ ] 使用 `trellis-check` 做最终跨层检查;Blender 完整构建需以提权方式运行,原因是 macOS Metal 初始化不能在沙箱内启动。
|
||||||
|
|
||||||
|
## Rollback
|
||||||
|
|
||||||
|
- 外部仓库和已发布 tag 保留不动;在宿主 revert 消费改造即可回到 P1 边界。
|
||||||
|
- 若按决定临时保留 in-host 副本,可将依赖回指该副本以恢复;该退路不取代 host parity 验证。
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
# Phase 2:拆仓库
|
||||||
|
|
||||||
|
父任务:`.trellis/tasks/08-25-road-compiler-extraction/`
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
|
||||||
|
把当前 `packages/road-compiler/` 拆为保留 git 历史、可脱离宿主独立测试和运行的仓库;宿主改为消费一个锁定版本的编译器 CLI。这样道路编译器可以独立演进,宿主依然通过版本化文件契约稳定构建场景。
|
||||||
|
|
||||||
|
## Confirmed Facts
|
||||||
|
|
||||||
|
- P1 已完成:编译器实现和 workbench 的所有权在 `packages/road-compiler/`;宿主负责将区域配置映射为 `RoadCompilerInput`。
|
||||||
|
- `git log --follow packages/road-compiler/src/compile/native-road.js` 已能追溯到 2026-08-13 的 native-road compiler 历史。
|
||||||
|
- 契约为 `native-road-package/v1`,完成标记为 `NATIVE_ROAD_COMPILE_DONE <json>`;`comparisonDir` 是可选输入,继续保留 `comparison.json`。
|
||||||
|
- 当前宿主远端为内部 Git 服务 `https://git.app.que01.top/que01/osmWorkflow.git`;P2 独立编译器仓库定为私有 `https://git.app.que01.top/que01/road-compiler.git`。
|
||||||
|
- 可维护范围只有 `fengshu-er-road` 和 `nantaizi-lake-innovation-valley`。`hanyang-block` 是废案,不参与基线、测试、验收或迁移语料。
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
### R2.1 保留 Git 历史
|
||||||
|
|
||||||
|
- 用 `git subtree split` 或 `git filter-repo` 导出,不得以复制目录再 `git init` 替代。
|
||||||
|
- 新仓库中 `git log --follow src/compile/native-road.js` 必须能追溯到 P1 之前的 native-road compiler 提交。
|
||||||
|
|
||||||
|
### R2.2 新仓库可独立运行
|
||||||
|
|
||||||
|
- 新仓库拥有 compiler、CLI、check、workbench、其测试 fixture、两个 parity baseline、契约文档和 README。
|
||||||
|
- 新仓库 own `ol` 及其 workbench 所需的运行依赖;workbench 不得从宿主 `node_modules` 提供浏览器资源。
|
||||||
|
- 新仓库不得引用宿主的 `area-config`、`config/areas`、`scripts/` 或本仓库绝对路径。
|
||||||
|
|
||||||
|
### R2.3 宿主的消费边界
|
||||||
|
|
||||||
|
- `scripts/lib/area-config.js` 继续是唯一的区域配置归一化与 `RoadCompilerInput` 映射位置。
|
||||||
|
- `scripts/build-area.js` 用已安装编译器的 CLI 子进程编译,继承 stdout/stderr,检查启动错误、退出状态和 signal,并解析且校验唯一的 `NATIVE_ROAD_COMPILE_DONE` 标记。
|
||||||
|
- 宿主只依赖 CLI、写入的文件和版本化输入 JSON;不再以相对路径 import 编译器内部模块。保留的宿主 signal 文件 I/O 适配层改为只调用公开包 API。
|
||||||
|
- `road-workbench` 保持每次编译均启动新进程的语义,但改为调用已安装 CLI。
|
||||||
|
|
||||||
|
### R2.4 版本与迁移
|
||||||
|
|
||||||
|
- 宿主依赖必须锁定一个具体编译器版本,禁止 `latest` 或 `*`;包版本与 `native-road-package/v1` 的契约版本独立演进。
|
||||||
|
- 初始分发使用带注释的 git tag `v0.1.0`;宿主锁定该 tag。完整 parity 验证后移除 `packages/road-compiler/`,不保留 in-host 副本作为正常消费路径。
|
||||||
|
- 宿主保留两份 baseline,用来验证今后升级编译器版本后没有产物漂移。
|
||||||
|
|
||||||
|
## Acceptance Criteria
|
||||||
|
|
||||||
|
- [ ] AC2.1 独立仓库的 `git log --follow src/compile/native-road.js` 可见 P1 前的 compiler 历史。
|
||||||
|
- [ ] AC2.2 在未 clone 宿主的干净目录中,新仓库 `npm ci`(或等价锁文件安装)和 `npm test` 均通过。
|
||||||
|
- [ ] AC2.3 新仓库的两区域 parity(`fengshu-er-road`、`nantaizi-lake-innovation-valley`)均与迁入 baseline 完全一致。
|
||||||
|
- [ ] AC2.4 宿主用锁版本依赖运行 CLI;`build-area.js` 成功解析一个有效的 `NATIVE_ROAD_COMPILE_DONE` 标记,缺失、重复或非法标记会失败。
|
||||||
|
- [ ] AC2.5 宿主的两个区域 parity 均对保留 baseline 全绿。
|
||||||
|
- [ ] AC2.6 宿主 `package.json` 的 compiler 依赖是具体、可复现版本,不是 `latest`、`*` 或裸分支。
|
||||||
|
- [ ] AC2.7 编译器仓库对宿主反向依赖为 0,且其 workbench 可独立启动。
|
||||||
|
|
||||||
|
## Out of Scope
|
||||||
|
|
||||||
|
- 编译器几何、规则或输出内容改动。
|
||||||
|
- 图层 manifest 和道路/建筑渲染分离(Phase 3)。
|
||||||
|
- drawtonomy 扩展(Phase 4)。
|
||||||
|
- `hanyang-block` 修复、迁移或作为验收样本。
|
||||||
|
|
||||||
|
## Release Decision
|
||||||
|
|
||||||
|
独立仓库为私有 `https://git.app.que01.top/que01/road-compiler.git`。首发以带注释 tag `v0.1.0` 发布,宿主依赖精确锁定该 tag;两个区域 parity 均通过后删除 `packages/road-compiler/`。该决定授权 P2 在该内部远端创建和推送仓库,但不授权发布到 npm 或其他托管平台。
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"id": "rc-p2-repo-split",
|
||||||
|
"name": "rc-p2-repo-split",
|
||||||
|
"title": "Phase 2:拆仓库",
|
||||||
|
"description": "保留 git 历史拆出独立仓库,宿主以锁版本依赖消费,子进程为主契约",
|
||||||
|
"status": "completed",
|
||||||
|
"dev_type": null,
|
||||||
|
"scope": null,
|
||||||
|
"package": null,
|
||||||
|
"priority": "P1",
|
||||||
|
"creator": "dingkang",
|
||||||
|
"assignee": "dingkang",
|
||||||
|
"createdAt": "2026-08-25",
|
||||||
|
"completedAt": "2026-08-26",
|
||||||
|
"branch": null,
|
||||||
|
"base_branch": "main",
|
||||||
|
"worktree_path": null,
|
||||||
|
"commit": null,
|
||||||
|
"pr_url": null,
|
||||||
|
"subtasks": [],
|
||||||
|
"children": [],
|
||||||
|
"parent": "08-25-road-compiler-extraction",
|
||||||
|
"relatedFiles": [],
|
||||||
|
"notes": "",
|
||||||
|
"meta": {}
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
{"file":".trellis/spec/blender/module-structure.md","reason":"检查道路 adapter 与建筑/植被/水体模块的边界没有漂移。"}
|
||||||
|
{"file":".trellis/spec/blender/testing.md","reason":"检查 Blender 结构摘要、纯 Python schema 测试和提权运行要求。"}
|
||||||
|
{"file":".trellis/spec/pipeline/index.md","reason":"检查 compiler 输出与 Blender 消费的 manifest 数据流。"}
|
||||||
|
{"file":".trellis/spec/guides/cross-layer-thinking-guide.md","reason":"检查三层契约、材质槽和 source 文件名一致性。"}
|
||||||
|
{"file":".trellis/spec/guides/artifact-parity-guide.md","reason":"检查两个区域和 throwaway 图层验证后的产物差异。"}
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
# Phase 3:Manifest 驱动的道路渲染设计
|
||||||
|
|
||||||
|
## Boundary
|
||||||
|
|
||||||
|
道路编译器是图层事实源,输出 `<nativeRoadDir>/manifest.json`;Blender 是渲染适配器,读取 manifest 并用宿主 `catalog.MATERIALS` / `ROAD_LAYERS` 完成材质与高度映射。建筑、植被、水体、OSM legacy 图层不改变。
|
||||||
|
|
||||||
|
```
|
||||||
|
compiler CLI
|
||||||
|
-> native-road/manifest.json + 12 declared GeoJSON sources
|
||||||
|
-> generate_scene.py
|
||||||
|
-> osmassets/native_roads.py
|
||||||
|
-> catalog material/z lookup
|
||||||
|
-> roads.assemble_geojson_layer
|
||||||
|
```
|
||||||
|
|
||||||
|
## Manifest v1.1
|
||||||
|
|
||||||
|
`manifest.json` 顶层包含 `contract: "native-road-package/v1.1"`、`areaId` 和 `layers`。`layers` 必须恰好声明编译器输出的 12 个 source:
|
||||||
|
|
||||||
|
- `road_surface`, `intersection_surface`, `sidewalk_surface`, `edge_lines`, `lane_separators`, `center_lines`, `crosswalks`, `vehicle_stop_lines`, `direction_arrows`, `turn_arrows`
|
||||||
|
- `lane_centerlines`, `connectors`
|
||||||
|
|
||||||
|
每项字段:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"source": "center_lines",
|
||||||
|
"role": "marking",
|
||||||
|
"materialLayer": "center_lines",
|
||||||
|
"splitBy": {
|
||||||
|
"prop": "color",
|
||||||
|
"cases": [
|
||||||
|
{"match": "white", "material": "native_center_line_white"},
|
||||||
|
{"default": true, "material": "center_lines"}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
`role` 为 `surface` 或 `marking` 时必须有 `materialLayer`;`semantic` 不得有材质要求,Blender 必须跳过其 GeoJSON。`splitBy` 只支持精确属性匹配和一个 default 分支,避免把渲染表达式语言复制进编译器。
|
||||||
|
|
||||||
|
编译器在原子提升前校验:每个声明 source 都对应 `layers/<source>.geojson`,目录中没有未声明的 GeoJSON;manifest 自身必须是有效 JSON。新增 manifest 不改变已有文件内容。
|
||||||
|
|
||||||
|
## Blender Adapter
|
||||||
|
|
||||||
|
新建 `blender/osmassets/native_roads.py`,公开一个接收 `native_road_dir`, `projector`, `collection`, `road_mats`, `material_layers` 的装配函数。模块负责读取/校验 manifest、解析 split cases、调用既有 `roads.assemble_geojson_layer`;不拥有图层注册表、不创建材质、不维护场景总计数。
|
||||||
|
|
||||||
|
`generate_scene.py` 仅负责 native-road 目录存在性、catalog material lookup、调用 adapter 和合并 `road_counts`。删除 `catalog.NATIVE_ROAD_LAYERS`;保留 `catalog.ROAD_LAYERS` 作为宿主材质和 z 高度事实源。
|
||||||
|
|
||||||
|
未知 `materialLayer`、缺少 source 文件、重复/遗漏 source、非法 role 或非法 splitBy 必须抛出 `RuntimeError`,不能静默跳过。semantic 图层必须不读取 GeoJSON、不创建对象、不增加 road count。
|
||||||
|
|
||||||
|
## Compatibility and Rollback
|
||||||
|
|
||||||
|
编译器契约从 `native-road-package/v1` 增加到 `v1.1`;manifest 是 v1.1 的必需输出。Blender 不提供旧 manifest fallback,因为新消费边界必须尽早暴露旧 compiler;回滚时恢复 `NATIVE_ROAD_LAYERS` 内联分支即可。旧 v1 产物仍可由旧 compiler tag 生成,不被本阶段改写。
|
||||||
|
|
||||||
|
## Verification
|
||||||
|
|
||||||
|
- 两个支持区域的 native-road 文件 parity:除新增 `manifest.json` 外所有现有 hash、orderHash、bytes 不变。
|
||||||
|
- Blender 结构摘要和预览图与 Phase 0 基线一致;完整 Blender/Metal 运行需提权。
|
||||||
|
- 纯 Python schema/manifest 测试覆盖 12 source、semantic skip、splitBy white/yellow、未知材质、缺文件和额外文件。
|
||||||
|
- throwaway `debug_probe.geojson` + manifest 实测:不改宿主代码即可生成 Blender 几何;验证后删除 probe 并再次跑 parity。
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
{"file":".trellis/spec/blender/module-structure.md","reason":"native_roads.py 必须遵守 osmassets 的 bpy 依赖边界和 roads adapter 责任。"}
|
||||||
|
{"file":".trellis/spec/blender/testing.md","reason":"Blender 层以结构摘要/parity 为主要回归防线,纯 schema 逻辑需可用系统 Python 测试。"}
|
||||||
|
{"file":".trellis/spec/pipeline/index.md","reason":"native-road manifest 是跨 compiler/Blender 的 pipeline 文件契约。"}
|
||||||
|
{"file":".trellis/spec/guides/cross-layer-thinking-guide.md","reason":"改动同时触及 compiler JSON、Blender Python 和契约文档。"}
|
||||||
|
{"file":".trellis/spec/guides/artifact-parity-guide.md","reason":"本阶段必须证明除新增 manifest 外渲染产物不变。"}
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
# Phase 3 执行计划
|
||||||
|
|
||||||
|
## Step 1 — 枚举现有分流逻辑(定 schema 之前)
|
||||||
|
|
||||||
|
- [x] 读 `blender/generate_scene.py:796-834` 全部道路分支
|
||||||
|
- [x] 列出每个 `source` 的处理方式:直接渲染 / 按属性分流 / 跳过
|
||||||
|
- [x] 已知分流:
|
||||||
|
- `center_lines`:`color != "white"` → `center_lines` 材质;
|
||||||
|
`color == "white"` → `native_center_line_white`
|
||||||
|
- `lane_separators`:`color != "yellow"` → `lane_separators`;
|
||||||
|
`color == "yellow"` → `native_lane_separator_yellow`
|
||||||
|
- [x] 确认 `lane_centerlines` / `connectors` 确实未被消费(→ `role: "semantic"`)
|
||||||
|
- [x] 产出 `research/native-layer-consumption-matrix.md`
|
||||||
|
|
||||||
|
**门槛**:manifest schema 能表达矩阵里的每一行,无"特例硬编码"残留。
|
||||||
|
|
||||||
|
## Step 2 — 定 manifest schema 并落契约
|
||||||
|
|
||||||
|
- [x] 按父任务 `design.md` §3.2 定稿 schema
|
||||||
|
- [x] 写入编译器仓库契约文档,版本标为 `native-road-package/v1.1`
|
||||||
|
- [x] 记录:v1.1 起 `manifest.json` 为必需输出
|
||||||
|
|
||||||
|
## Step 3 — 编译器侧:生成 manifest
|
||||||
|
|
||||||
|
- [x] 编译器内建立图层注册表(单一事实源),`compileGeometry` 的输出键与之对应
|
||||||
|
- [x] 写 `manifest.json` 到 outDir
|
||||||
|
- [x] 编译器自校验:manifest 声明的每个 `source` 都必须有对应 geojson 文件,
|
||||||
|
反之亦然(缺一即报错,不静默)
|
||||||
|
- [x] parity:此步只**新增** manifest.json,其余文件应逐字节不变;hanyang-block 不参与
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 只应多出 manifest.json
|
||||||
|
node scripts/road-parity.js --config config/areas/fengshu-er-road.json \
|
||||||
|
--compare .../baseline/fengshu-er-road.json
|
||||||
|
```
|
||||||
|
|
||||||
|
## Step 4 — Blender 侧:抽模块 + 读 manifest
|
||||||
|
|
||||||
|
- [x] 新建 `blender/osmassets/native_roads.py`
|
||||||
|
- [x] 把 `generate_scene.py:796-834` 的道路分支迁入
|
||||||
|
- [x] 改为读 manifest 遍历;`role == "semantic"` 跳过
|
||||||
|
- [x] `splitBy` 通用化实现,替掉两处硬编码 lambda
|
||||||
|
- [x] **加断言**:manifest 里的 `materialLayer` 若不在 `catalog.MATERIALS` /
|
||||||
|
`ROAD_LAYERS` 中,直接 raise,不静默跳过(风险表第二条)
|
||||||
|
- [x] 删除 `catalog.NATIVE_ROAD_LAYERS`
|
||||||
|
- [x] `generate_scene.py` 只保留一行调用
|
||||||
|
|
||||||
|
## Step 5 — 验证
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# .blend 结构摘要对基线
|
||||||
|
npm run build:area -- --config config/areas/fengshu-er-road.json
|
||||||
|
# 走 artifact-parity-guide 的结构摘要比对
|
||||||
|
|
||||||
|
# 两个有效区域跑通(hanyang-block 为废案,不参与)
|
||||||
|
for a in fengshu-er-road nantaizi-lake-innovation-valley; do
|
||||||
|
npm run build:area -- --config config/areas/$a.json || echo "FAIL $a"
|
||||||
|
done
|
||||||
|
|
||||||
|
# 建筑/植被/水体未被改动
|
||||||
|
git diff --stat -- blender/osmassets/ | grep -vE "native_roads|catalog"
|
||||||
|
```
|
||||||
|
|
||||||
|
- [x] 渲染预览图人工对照(结构摘要粒度不足的兜底)
|
||||||
|
|
||||||
|
## Step 6 — AC3.4 实测(可扩展性证明)
|
||||||
|
|
||||||
|
这一步是整个 Phase 3 的价值证明,不可跳过。
|
||||||
|
|
||||||
|
- [x] 编译器加一个 throwaway 图层 `debug_probe.geojson`(复用 road-surface 几何仅验证 wiring)
|
||||||
|
+ manifest 声明 `role: "marking"`,复用现有材质槽
|
||||||
|
- [x] **不改宿主任何代码**,跑 blender 阶段
|
||||||
|
- [x] 确认 Blender 场景中出现该图层几何
|
||||||
|
- [x] 截图/记录证据到任务 `research/`
|
||||||
|
- [x] 回滚 throwaway 图层
|
||||||
|
|
||||||
|
## Review Gate
|
||||||
|
|
||||||
|
AC3.1–AC3.7 全绿,特别是 AC3.4 有实测证据。
|
||||||
|
|
||||||
|
## Rollback
|
||||||
|
|
||||||
|
- 恢复 `catalog.NATIVE_ROAD_LAYERS`,`generate_scene.py` 恢复内联分支
|
||||||
|
- `manifest.json` 可保留输出(无消费方时无害)
|
||||||
|
- 编译器侧图层注册表保留(它本身是改进)
|
||||||
@@ -0,0 +1,90 @@
|
|||||||
|
# Phase 3:道路与建筑渲染分离
|
||||||
|
|
||||||
|
父任务:`.trellis/tasks/08-25-road-compiler-extraction/`
|
||||||
|
技术设计:父任务 `design.md` §3(含 manifest 形状与 Blender 侧改造方案)
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
|
||||||
|
让编译器自声明图层,Blender 改为读 manifest 而非硬编码表;
|
||||||
|
道路渲染从 `generate_scene.py` 抽离为独立模块,建筑/植被/水体保持原位。
|
||||||
|
|
||||||
|
**这是全案价值最高的一步** —— 它把一张跨仓库重复的表变成生成物,
|
||||||
|
使"编译器加图层忘了改宿主"这类静默错误在结构上不可能。
|
||||||
|
|
||||||
|
## 背景:当前的静默错误风险
|
||||||
|
|
||||||
|
`blender/osmassets/catalog.py:53` 的 `NATIVE_ROAD_LAYERS` 有 10 项,
|
||||||
|
而编译器写 12 个 geojson —— `lane_centerlines` 与 `connectors` 是语义层不参与渲染。
|
||||||
|
|
||||||
|
**但这个事实只存在于这张表的省略里,编译器侧没有任何声明。**
|
||||||
|
拆仓库之后,这张表和它描述的对象分处两个仓库,漂移只是时间问题。
|
||||||
|
|
||||||
|
`.trellis/spec/pipeline/index.md` 首页已经把图层表标为「最容易出静默错误」。
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
### R3.1 编译器输出 layer manifest
|
||||||
|
|
||||||
|
`<outDir>/manifest.json`,形状见父任务 `design.md` §3.2。要点:
|
||||||
|
|
||||||
|
- 每个图层声明 `source`(geojson 文件名)、`role`、以及渲染角色所需的 `materialLayer`
|
||||||
|
- `role: "semantic"` 显式标记不渲染的图层 —— 把省略变成声明
|
||||||
|
- `splitBy` 表达按属性分流到不同材质的逻辑
|
||||||
|
(当前 `generate_scene.py:815-819` 硬编码的 `color != "white"` / `color == "yellow"`)
|
||||||
|
- 材质本体(颜色、z 高度、贴图)**仍归宿主** `catalog.py::MATERIALS`;
|
||||||
|
编译器不懂渲染,只声明"我有哪些图层、什么角色、该用哪个材质槽"
|
||||||
|
|
||||||
|
### R3.2 Blender 侧改造
|
||||||
|
|
||||||
|
- `generate_scene.py` 内道路分支抽为 `blender/osmassets/native_roads.py`
|
||||||
|
- 新模块读 manifest 遍历,不再查硬编码表
|
||||||
|
- 删除 `catalog.NATIVE_ROAD_LAYERS`
|
||||||
|
- 建筑(`handle_building` / `dispatch_ways`)、植被、水体**保持原位不动**
|
||||||
|
|
||||||
|
### R3.3 契约版本处理
|
||||||
|
|
||||||
|
新增 `manifest.json` 是**向后兼容的增量**(旧消费方忽略未知文件即可),
|
||||||
|
但 Blender 改为依赖它之后就成了必需项。
|
||||||
|
|
||||||
|
- 契约文档记录:`manifest.json` 自 v1.1 起为必需输出
|
||||||
|
- 宿主声明所需最低契约版本
|
||||||
|
|
||||||
|
### R3.4 跨层一致性检查
|
||||||
|
|
||||||
|
按 `.trellis/spec/guides/cross-layer-thinking-guide.md`:
|
||||||
|
本改动同时触碰 JS(编译器输出)、Python(Blender 消费)、契约文档三层,
|
||||||
|
必须走该指南的检查清单。
|
||||||
|
|
||||||
|
## Acceptance Criteria
|
||||||
|
|
||||||
|
- [x] AC3.1 编译器输出 `manifest.json`,两个有效区域(`fengshu-er-road`、`nantaizi-lake-innovation-valley`)均含全部 12 图层声明
|
||||||
|
- [x] AC3.2 `catalog.NATIVE_ROAD_LAYERS` 已删除,Blender 无硬编码道路图层表
|
||||||
|
- [x] AC3.3 `.blend` 结构摘要对 Phase 0 基线一致
|
||||||
|
(走 `.trellis/spec/guides/artifact-parity-guide.md`)
|
||||||
|
- [x] AC3.4 **实测**:向编译器加一个 throwaway 图层 + manifest 声明,
|
||||||
|
不改宿主任何代码,跑 blender 阶段确认它被渲染出来;验证后回滚该图层
|
||||||
|
(父任务 AC5,见 design §3.4)
|
||||||
|
- [x] AC3.5 `role: "semantic"` 的图层被 Blender 正确跳过(不产生几何)
|
||||||
|
- [x] AC3.6 `center_lines` 的 white/非 white 与 `lane_separators` 的 yellow/非 yellow
|
||||||
|
分流行为与改造前一致
|
||||||
|
- [x] AC3.7 建筑/植被/水体渲染代码未被修改(`git diff` 验证范围)
|
||||||
|
|
||||||
|
## 依赖与顺序
|
||||||
|
|
||||||
|
- **前置**:Phase 2 完成(编译器已独立,manifest 才有"跨仓库契约"的意义)
|
||||||
|
- 与 Phase 4 无依赖,可并行
|
||||||
|
- 完成本阶段后,父任务 Goal 中的「道路与建筑渲染分离」才算达成
|
||||||
|
|
||||||
|
## 风险
|
||||||
|
|
||||||
|
| 风险 | 缓解 |
|
||||||
|
|---|---|
|
||||||
|
| `splitBy` 表达力不足,覆盖不了现有分流逻辑 | 先枚举 `generate_scene.py` 里全部分流分支,再定 manifest schema |
|
||||||
|
| 材质槽名在两侧漂移 | manifest 里的 `materialLayer` 必须能被宿主校验:Blender 侧加断言,未知材质槽直接报错而非静默跳过 |
|
||||||
|
| `.blend` 结构摘要对比粒度不够,漏掉几何差异 | 除结构摘要外,加渲染预览图人工对照 |
|
||||||
|
|
||||||
|
## Out of Scope
|
||||||
|
|
||||||
|
- 材质定义搬去编译器(材质属渲染,归宿主)
|
||||||
|
- osm2streets legacy 图层表 `ROAD_LAYERS` 的改动
|
||||||
|
- 建筑/植被/水体渲染逻辑
|
||||||
+19
@@ -0,0 +1,19 @@
|
|||||||
|
# P3 Debug Probe Evidence
|
||||||
|
|
||||||
|
Date: 2026-08-26
|
||||||
|
|
||||||
|
A temporary, uncommitted compiler registry entry declared `debug_probe` as a
|
||||||
|
`marking` layer using the existing `road_surface` material slot. Its generated
|
||||||
|
GeoJSON reused the compiled road-surface collection only for this wiring test.
|
||||||
|
No host source was changed.
|
||||||
|
|
||||||
|
The compiler emitted 13 declared sources. Blender then generated
|
||||||
|
`/private/tmp/p3-debug-probe.blend`; `SCENE_DONE` reported
|
||||||
|
`"debug_probe": 30`. The Blender scene digest contains:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{"name":"Road_debug_probe","vertices":274,"polygons":30}
|
||||||
|
```
|
||||||
|
|
||||||
|
The temporary registry entry was removed immediately after the proof. The
|
||||||
|
standard v0.2.0 compiler was then rerun to restore the normal 12-source output.
|
||||||
+34
@@ -0,0 +1,34 @@
|
|||||||
|
# Native Road 图层消费矩阵
|
||||||
|
|
||||||
|
调研日期:2026-08-25
|
||||||
|
|
||||||
|
## 证据
|
||||||
|
|
||||||
|
- 编译器在 `scripts/compile-native-roads.js:57,65-76` 声明并写出 12 个图层。
|
||||||
|
- Blender 在 `blender/generate_scene.py:796-834` 遍历
|
||||||
|
`catalog.NATIVE_ROAD_LAYERS`,只消费其中 10 个图层。
|
||||||
|
- 当前映射及基础高度来自 `blender/osmassets/catalog.py:53-64` 与 `ROAD_LAYERS`。
|
||||||
|
|
||||||
|
## 当前消费与 manifest 目标
|
||||||
|
|
||||||
|
| 编译器 source | 当前 Blender 行为 | 当前材质槽 / z 来源 | manifest 目标 |
|
||||||
|
|---|---|---|---|
|
||||||
|
| `road_surface` | 直接渲染 | `road_surface` / `ROAD_LAYERS.road_surface` | `role: surface`, `materialLayer: road_surface` |
|
||||||
|
| `edge_lines` | 直接渲染 | `lane_separators` / `ROAD_LAYERS.lane_separators` | `role: marking`, `materialLayer: lane_separators` |
|
||||||
|
| `intersection_surface` | 直接渲染 | `intersection_surface` / `ROAD_LAYERS.intersection_surface` | `role: surface`, `materialLayer: intersection_surface` |
|
||||||
|
| `sidewalk_surface` | 直接渲染 | `sidewalks` / `ROAD_LAYERS.sidewalks` | `role: surface`, `materialLayer: sidewalks` |
|
||||||
|
| `lane_separators` | 按 `color` 分流 | 非 yellow: `lane_separators`; yellow: `native_lane_separator_yellow`; z 取 `lane_separators` | `role: marking`, `materialLayer: lane_separators`, `splitBy.color`(yellow 特例) |
|
||||||
|
| `center_lines` | 按 `color` 分流 | 非 white: `center_lines`; white: `native_center_line_white`; z 取 `center_lines` | `role: marking`, `materialLayer: center_lines`, `splitBy.color`(white 特例) |
|
||||||
|
| `direction_arrows` | 直接渲染 | `lane_arrows_webscale` / `ROAD_LAYERS.lane_arrows_webscale` | `role: marking`, `materialLayer: lane_arrows_webscale` |
|
||||||
|
| `turn_arrows` | 直接渲染 | `lane_arrows_webscale` / `ROAD_LAYERS.lane_arrows_webscale` | `role: marking`, `materialLayer: lane_arrows_webscale` |
|
||||||
|
| `crosswalks` | 直接渲染 | `crosswalks` / `ROAD_LAYERS.crosswalks` | `role: marking`, `materialLayer: crosswalks` |
|
||||||
|
| `vehicle_stop_lines` | 直接渲染 | `vehicle_stop_lines` / `ROAD_LAYERS.vehicle_stop_lines` | `role: marking`, `materialLayer: vehicle_stop_lines` |
|
||||||
|
| `lane_centerlines` | 不进入 Blender 遍历 | 无 | `role: semantic`,Blender 跳过 |
|
||||||
|
| `connectors` | 不进入 Blender 遍历 | 无 | `role: semantic`,Blender 跳过 |
|
||||||
|
|
||||||
|
## 结论与实施约束
|
||||||
|
|
||||||
|
- manifest 必须声明全部 12 个编译器图层,不能再用“未出现在列表中”表达不渲染。
|
||||||
|
- `role: semantic` 的两个图层不得读取 GeoJSON 或创建 Blender 几何。
|
||||||
|
- `splitBy` 至少需表达属性 `color` 的精确匹配与默认分支,且分流后沿用同一个基础材质槽的 z 值。
|
||||||
|
- Blender 消费 manifest 时,未知 `materialLayer`、缺失 source 文件、或 source 未在 manifest 声明都必须报错;不能静默跳过。
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"id": "rc-p3-render-separation",
|
||||||
|
"name": "rc-p3-render-separation",
|
||||||
|
"title": "Phase 3:道路与建筑渲染分离",
|
||||||
|
"description": "编译器输出 layer manifest 自声明图层,Blender 改为读 manifest;道路渲染从 generate_scene.py 抽离,消除跨仓库重复图层表",
|
||||||
|
"status": "completed",
|
||||||
|
"dev_type": null,
|
||||||
|
"scope": null,
|
||||||
|
"package": null,
|
||||||
|
"priority": "P2",
|
||||||
|
"creator": "dingkang",
|
||||||
|
"assignee": "dingkang",
|
||||||
|
"createdAt": "2026-08-25",
|
||||||
|
"completedAt": "2026-08-26",
|
||||||
|
"branch": null,
|
||||||
|
"base_branch": "main",
|
||||||
|
"worktree_path": null,
|
||||||
|
"commit": null,
|
||||||
|
"pr_url": null,
|
||||||
|
"subtasks": [],
|
||||||
|
"children": [],
|
||||||
|
"parent": "08-25-road-compiler-extraction",
|
||||||
|
"relatedFiles": [],
|
||||||
|
"notes": "",
|
||||||
|
"meta": {}
|
||||||
|
}
|
||||||
@@ -8,8 +8,8 @@
|
|||||||
|
|
||||||
<!-- @@@auto:current-status -->
|
<!-- @@@auto:current-status -->
|
||||||
- **Active File**: `journal-1.md`
|
- **Active File**: `journal-1.md`
|
||||||
- **Total Sessions**: 41
|
- **Total Sessions**: 45
|
||||||
- **Last Active**: 2026-08-24
|
- **Last Active**: 2026-08-26
|
||||||
<!-- @@@/auto:current-status -->
|
<!-- @@@/auto:current-status -->
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
<!-- @@@auto:active-documents -->
|
<!-- @@@auto:active-documents -->
|
||||||
| File | Lines | Status |
|
| File | Lines | Status |
|
||||||
|------|-------|--------|
|
|------|-------|--------|
|
||||||
| `journal-1.md` | ~887 | Active |
|
| `journal-1.md` | ~976 | Active |
|
||||||
<!-- @@@/auto:active-documents -->
|
<!-- @@@/auto:active-documents -->
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -29,6 +29,10 @@
|
|||||||
<!-- @@@auto:session-history -->
|
<!-- @@@auto:session-history -->
|
||||||
| # | Date | Title | Commits | Branch |
|
| # | Date | Title | Commits | Branch |
|
||||||
|---|------|-------|---------|--------|
|
|---|------|-------|---------|--------|
|
||||||
|
| 45 | 2026-08-26 | Complete manifest-driven native road rendering | `6201270` | `experiment/road-compiler-rethink` |
|
||||||
|
| 44 | 2026-08-26 | Complete external road compiler split | `5cde080`, `7d4b3b5` | `experiment/road-compiler-rethink` |
|
||||||
|
| 43 | 2026-08-25 | Extract road compiler package boundary | `73707da`, `d5c58b5`, `f542a64`, `284d3db`, `2469cfd` | `experiment/road-compiler-rethink` |
|
||||||
|
| 42 | 2026-08-25 | Freeze native road parity baseline | `e7bc7f8` | `experiment/road-compiler-rethink` |
|
||||||
| 41 | 2026-08-24 | Use live V2X vehicle streams only | `b7031f1` | `fengshu-er-road` |
|
| 41 | 2026-08-24 | Use live V2X vehicle streams only | `b7031f1` | `fengshu-er-road` |
|
||||||
| 40 | 2026-08-24 | Stabilize Fengshu native road compilation | `f1f829c` | `fengshu-er-road` |
|
| 40 | 2026-08-24 | Stabilize Fengshu native road compilation | `f1f829c` | `fengshu-er-road` |
|
||||||
| 39 | 2026-08-18 | Complete native-only pipeline replacement | `9e0e25a` | `feature/native-road-compiler` |
|
| 39 | 2026-08-18 | Complete native-only pipeline replacement | `9e0e25a` | `feature/native-road-compiler` |
|
||||||
|
|||||||
@@ -885,3 +885,92 @@ Replaced the Cesium preview's simulated vehicle route with authenticated OBU and
|
|||||||
### Status
|
### Status
|
||||||
|
|
||||||
[OK] **Completed**
|
[OK] **Completed**
|
||||||
|
|
||||||
|
|
||||||
|
## Session 42: Freeze native road parity baseline
|
||||||
|
|
||||||
|
**Date**: 2026-08-25
|
||||||
|
**Task**: Freeze native road parity baseline
|
||||||
|
**Branch**: `experiment/road-compiler-rethink`
|
||||||
|
|
||||||
|
### Summary
|
||||||
|
|
||||||
|
Completed and archived Phase 0: documented native-road-package/v1, added strict road parity snapshots and two valid-area baselines, excluded abandoned hanyang-block, and verified deterministic recompilation including signal regeneration.
|
||||||
|
|
||||||
|
### Git Commits
|
||||||
|
|
||||||
|
| Hash | Message |
|
||||||
|
|------|---------|
|
||||||
|
| `e7bc7f8` | (see git log) |
|
||||||
|
|
||||||
|
### Status
|
||||||
|
|
||||||
|
[OK] **Completed**
|
||||||
|
|
||||||
|
|
||||||
|
## Session 43: Extract road compiler package boundary
|
||||||
|
|
||||||
|
**Date**: 2026-08-25
|
||||||
|
**Task**: Extract road compiler package boundary
|
||||||
|
**Branch**: `experiment/road-compiler-rethink`
|
||||||
|
|
||||||
|
### Summary
|
||||||
|
|
||||||
|
Completed and archived Phase 1: moved native road compiler, checks, workbench, signal schema, OSM parser, and fixtures into packages/road-compiler; introduced RoadCompilerInput mapping; verified two-area parity and a privileged full Fengshu build.
|
||||||
|
|
||||||
|
### Git Commits
|
||||||
|
|
||||||
|
| Hash | Message |
|
||||||
|
|------|---------|
|
||||||
|
| `73707da` | (see git log) |
|
||||||
|
| `d5c58b5` | (see git log) |
|
||||||
|
| `f542a64` | (see git log) |
|
||||||
|
| `284d3db` | (see git log) |
|
||||||
|
| `2469cfd` | (see git log) |
|
||||||
|
|
||||||
|
### Status
|
||||||
|
|
||||||
|
[OK] **Completed**
|
||||||
|
|
||||||
|
|
||||||
|
## Session 44: Complete external road compiler split
|
||||||
|
|
||||||
|
**Date**: 2026-08-26
|
||||||
|
**Task**: Complete external road compiler split
|
||||||
|
**Branch**: `experiment/road-compiler-rethink`
|
||||||
|
|
||||||
|
### Summary
|
||||||
|
|
||||||
|
Split road compiler into private road-compiler repository with history, pushed v0.1.2, migrated host to exact-tag CLI consumption, removed in-host package, passed regression tests and two-area parity.
|
||||||
|
|
||||||
|
### Git Commits
|
||||||
|
|
||||||
|
| Hash | Message |
|
||||||
|
|------|---------|
|
||||||
|
| `5cde080` | (see git log) |
|
||||||
|
| `7d4b3b5` | (see git log) |
|
||||||
|
|
||||||
|
### Status
|
||||||
|
|
||||||
|
[OK] **Completed**
|
||||||
|
|
||||||
|
|
||||||
|
## Session 45: Complete manifest-driven native road rendering
|
||||||
|
|
||||||
|
**Date**: 2026-08-26
|
||||||
|
**Task**: Complete manifest-driven native road rendering
|
||||||
|
**Branch**: `experiment/road-compiler-rethink`
|
||||||
|
|
||||||
|
### Summary
|
||||||
|
|
||||||
|
Published compiler v0.2.2, switched Blender to validated native-road manifests, proved debug-probe extensibility, and verified Blender parity for fengshu-er-road.
|
||||||
|
|
||||||
|
### Git Commits
|
||||||
|
|
||||||
|
| Hash | Message |
|
||||||
|
|------|---------|
|
||||||
|
| `6201270` | (see git log) |
|
||||||
|
|
||||||
|
### Status
|
||||||
|
|
||||||
|
[OK] **Completed**
|
||||||
@@ -57,6 +57,7 @@ from osmassets import fountain as _fountain # noqa: E402
|
|||||||
from osmassets import water as _water # noqa: E402
|
from osmassets import water as _water # noqa: E402
|
||||||
from osmassets import grass as _grass # noqa: E402
|
from osmassets import grass as _grass # noqa: E402
|
||||||
from osmassets import roads as _roads # noqa: E402
|
from osmassets import roads as _roads # noqa: E402
|
||||||
|
from osmassets import native_roads as _native_roads # noqa: E402
|
||||||
from osmassets import scrub as _scrub # noqa: E402
|
from osmassets import scrub as _scrub # noqa: E402
|
||||||
from osmassets import tree as _tree # noqa: E402
|
from osmassets import tree as _tree # noqa: E402
|
||||||
from osmassets import traffic_signals as _traffic_signals # noqa: E402
|
from osmassets import traffic_signals as _traffic_signals # noqa: E402
|
||||||
@@ -798,30 +799,9 @@ def build(args):
|
|||||||
if native_road_dir:
|
if native_road_dir:
|
||||||
if not os.path.isdir(native_road_dir):
|
if not os.path.isdir(native_road_dir):
|
||||||
raise RuntimeError("--native-road directory does not exist: " + native_road_dir)
|
raise RuntimeError("--native-road directory does not exist: " + native_road_dir)
|
||||||
material_layers = {layer["id"]: layer for layer in catalog.ROAD_LAYERS}
|
material_layers = {layer["id"]: road_mats.get(layer["id"]) for layer in catalog.ROAD_LAYERS}
|
||||||
for source in catalog.NATIVE_ROAD_LAYERS:
|
material_layers.update({"native_center_line_white": road_mats["native_center_line_white"], "native_lane_separator_yellow": road_mats["native_lane_separator_yellow"]})
|
||||||
target = source["material_layer"]
|
road_counts.update(_native_roads.assemble(native_road_dir, projector, roads_c, material_layers))
|
||||||
layer = material_layers[target]
|
|
||||||
source_path = os.path.join(native_road_dir, "layers", source["source"] + ".geojson")
|
|
||||||
if not os.path.isfile(source_path):
|
|
||||||
raise RuntimeError("Native road layer is missing: " + source_path)
|
|
||||||
if source["source"] == "center_lines":
|
|
||||||
count = _roads.assemble_geojson_layer(
|
|
||||||
source_path, source["source"], projector, roads_c,
|
|
||||||
road_mats[target], layer["z"],
|
|
||||||
lambda props: props.get("color") != "white")
|
|
||||||
count += _roads.assemble_geojson_layer(
|
|
||||||
source_path, source["source"] + "_white", projector, roads_c,
|
|
||||||
road_mats["native_center_line_white"], layer["z"],
|
|
||||||
lambda props: props.get("color") == "white")
|
|
||||||
elif source["source"] == "lane_separators":
|
|
||||||
count = _roads.assemble_geojson_layer(source_path, source["source"], projector, roads_c, road_mats[target], layer["z"], lambda props: props.get("color") != "yellow")
|
|
||||||
count += _roads.assemble_geojson_layer(source_path, source["source"] + "_yellow", projector, roads_c, road_mats["native_lane_separator_yellow"], layer["z"], lambda props: props.get("color") == "yellow")
|
|
||||||
else:
|
|
||||||
count = _roads.assemble_geojson_layer(
|
|
||||||
source_path, source["source"], projector, roads_c,
|
|
||||||
road_mats[target], layer["z"])
|
|
||||||
road_counts[source["source"]] = count
|
|
||||||
elif geojson_dir and os.path.isdir(geojson_dir):
|
elif geojson_dir and os.path.isdir(geojson_dir):
|
||||||
for problem in catalog.check_layers(geojson_dir):
|
for problem in catalog.check_layers(geojson_dir):
|
||||||
print("Layer catalog warning:", problem)
|
print("Layer catalog warning:", problem)
|
||||||
|
|||||||
@@ -50,20 +50,6 @@ SCENE_STYLE_FILE = "osm2streets_scene_style.json"
|
|||||||
|
|
||||||
# Native-road output intentionally maps into existing scene material layers.
|
# Native-road output intentionally maps into existing scene material layers.
|
||||||
# It is a provider adapter, not a second scene-layer registry.
|
# It is a provider adapter, not a second scene-layer registry.
|
||||||
NATIVE_ROAD_LAYERS = (
|
|
||||||
{"source": "road_surface", "material_layer": "road_surface"},
|
|
||||||
{"source": "edge_lines", "material_layer": "lane_separators"},
|
|
||||||
{"source": "intersection_surface", "material_layer": "intersection_surface"},
|
|
||||||
{"source": "sidewalk_surface", "material_layer": "sidewalks"},
|
|
||||||
{"source": "lane_separators", "material_layer": "lane_separators"},
|
|
||||||
{"source": "center_lines", "material_layer": "center_lines"},
|
|
||||||
{"source": "direction_arrows", "material_layer": "lane_arrows_webscale"},
|
|
||||||
{"source": "turn_arrows", "material_layer": "lane_arrows_webscale"},
|
|
||||||
{"source": "crosswalks", "material_layer": "crosswalks"},
|
|
||||||
{"source": "vehicle_stop_lines", "material_layer": "vehicle_stop_lines"},
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# Material specs. `kind` selects the builder:
|
# Material specs. `kind` selects the builder:
|
||||||
# solid — flat base colour
|
# solid — flat base colour
|
||||||
# textured — Poly Haven diffuse + normal, optionally tinted
|
# textured — Poly Haven diffuse + normal, optionally tinted
|
||||||
|
|||||||
@@ -0,0 +1,95 @@
|
|||||||
|
"""Pure-Python validation for native-road package manifests."""
|
||||||
|
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
|
||||||
|
|
||||||
|
CONTRACT = "native-road-package/v1.1"
|
||||||
|
RENDERABLE_ROLES = ("surface", "marking")
|
||||||
|
VALID_ROLES = RENDERABLE_ROLES + ("semantic",)
|
||||||
|
|
||||||
|
|
||||||
|
def _error(message):
|
||||||
|
raise RuntimeError("Invalid native road manifest: " + message)
|
||||||
|
|
||||||
|
|
||||||
|
def _source_name(value):
|
||||||
|
return (isinstance(value, str) and value
|
||||||
|
and value == os.path.basename(value)
|
||||||
|
and value not in (".", ".."))
|
||||||
|
|
||||||
|
|
||||||
|
def _validate_split(source, split):
|
||||||
|
if not isinstance(split, dict):
|
||||||
|
_error("layer '%s' splitBy must be an object" % source)
|
||||||
|
prop = split.get("prop")
|
||||||
|
cases = split.get("cases")
|
||||||
|
if not isinstance(prop, str) or not prop or not isinstance(cases, list) or not cases:
|
||||||
|
_error("layer '%s' has an invalid splitBy" % source)
|
||||||
|
|
||||||
|
matches = set()
|
||||||
|
defaults = 0
|
||||||
|
for case in cases:
|
||||||
|
if not isinstance(case, dict) or not isinstance(case.get("material"), str):
|
||||||
|
_error("layer '%s' has an invalid splitBy case" % source)
|
||||||
|
is_default = case.get("default") is True
|
||||||
|
has_match = "match" in case
|
||||||
|
if is_default == has_match:
|
||||||
|
_error("layer '%s' splitBy cases need exactly one of match/default" % source)
|
||||||
|
if is_default:
|
||||||
|
defaults += 1
|
||||||
|
else:
|
||||||
|
match = case["match"]
|
||||||
|
if match in matches:
|
||||||
|
_error("layer '%s' has a duplicate splitBy match" % source)
|
||||||
|
matches.add(match)
|
||||||
|
if defaults != 1:
|
||||||
|
_error("layer '%s' splitBy needs exactly one default case" % source)
|
||||||
|
|
||||||
|
|
||||||
|
def load(native_road_dir):
|
||||||
|
"""Load a v1.1 manifest and ensure it declares exactly its GeoJSON files."""
|
||||||
|
manifest_path = os.path.join(native_road_dir, "manifest.json")
|
||||||
|
if not os.path.isfile(manifest_path):
|
||||||
|
raise RuntimeError("Native road manifest is missing: " + manifest_path)
|
||||||
|
try:
|
||||||
|
with open(manifest_path, "r", encoding="utf-8") as handle:
|
||||||
|
manifest = json.load(handle)
|
||||||
|
except (OSError, ValueError) as error:
|
||||||
|
raise RuntimeError("Could not read native road manifest: " + str(error)) from error
|
||||||
|
|
||||||
|
if not isinstance(manifest, dict) or manifest.get("contract") != CONTRACT:
|
||||||
|
_error("unsupported contract")
|
||||||
|
layers = manifest.get("layers")
|
||||||
|
if not isinstance(layers, list) or not layers:
|
||||||
|
_error("layers must be a non-empty array")
|
||||||
|
|
||||||
|
declared = set()
|
||||||
|
for spec in layers:
|
||||||
|
if not isinstance(spec, dict):
|
||||||
|
_error("layer entries must be objects")
|
||||||
|
source = spec.get("source")
|
||||||
|
role = spec.get("role")
|
||||||
|
if not _source_name(source) or source in declared or role not in VALID_ROLES:
|
||||||
|
_error("layer source or role is invalid")
|
||||||
|
declared.add(source)
|
||||||
|
if role in RENDERABLE_ROLES:
|
||||||
|
if not isinstance(spec.get("materialLayer"), str) or not spec["materialLayer"]:
|
||||||
|
_error("renderable layer '%s' needs materialLayer" % source)
|
||||||
|
if "splitBy" in spec:
|
||||||
|
_validate_split(source, spec["splitBy"])
|
||||||
|
elif "materialLayer" in spec or "splitBy" in spec:
|
||||||
|
_error("semantic layer '%s' must not declare rendering" % source)
|
||||||
|
|
||||||
|
layers_dir = os.path.join(native_road_dir, "layers")
|
||||||
|
if not os.path.isdir(layers_dir):
|
||||||
|
raise RuntimeError("Native road layers directory is missing: " + layers_dir)
|
||||||
|
published = {
|
||||||
|
name[:-8] for name in os.listdir(layers_dir)
|
||||||
|
if name.endswith(".geojson") and os.path.isfile(os.path.join(layers_dir, name))
|
||||||
|
}
|
||||||
|
if published != declared:
|
||||||
|
missing = sorted(declared - published)
|
||||||
|
extra = sorted(published - declared)
|
||||||
|
_error("declared GeoJSON mismatch (missing=%s, extra=%s)" % (missing, extra))
|
||||||
|
return manifest
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
"""Manifest-driven native road layer adapter."""
|
||||||
|
|
||||||
|
import os
|
||||||
|
|
||||||
|
from osmassets import catalog
|
||||||
|
from osmassets import native_road_manifest
|
||||||
|
from osmassets import roads
|
||||||
|
|
||||||
|
|
||||||
|
def _material(material_layers, name):
|
||||||
|
if name not in material_layers:
|
||||||
|
raise RuntimeError("Native road manifest references unknown materialLayer: " + name)
|
||||||
|
return material_layers[name]
|
||||||
|
|
||||||
|
|
||||||
|
def _split_filter(split, case):
|
||||||
|
if not split:
|
||||||
|
return None
|
||||||
|
prop = split["prop"]
|
||||||
|
if "match" in case:
|
||||||
|
return lambda props: props.get(prop) == case["match"]
|
||||||
|
matches = {item["match"] for item in split["cases"] if "match" in item}
|
||||||
|
return lambda props: props.get(prop) not in matches
|
||||||
|
|
||||||
|
|
||||||
|
def assemble(native_road_dir, projector, collection, material_layers):
|
||||||
|
manifest = native_road_manifest.load(native_road_dir)
|
||||||
|
z_by_material_layer = {layer["id"]: layer["z"] for layer in catalog.ROAD_LAYERS}
|
||||||
|
counts = {}
|
||||||
|
for spec in manifest["layers"]:
|
||||||
|
source = spec["source"]
|
||||||
|
role = spec["role"]
|
||||||
|
source_path = os.path.join(native_road_dir, "layers", source + ".geojson")
|
||||||
|
if role == "semantic":
|
||||||
|
continue
|
||||||
|
material_name = spec["materialLayer"]
|
||||||
|
if material_name not in z_by_material_layer:
|
||||||
|
raise RuntimeError("Native road manifest references unknown materialLayer: " + material_name)
|
||||||
|
_material(material_layers, material_name)
|
||||||
|
count = 0
|
||||||
|
split = spec.get("splitBy")
|
||||||
|
cases = split.get("cases", []) if split else [{"default": True, "material": material_name}]
|
||||||
|
for case in cases:
|
||||||
|
case_material_name = case.get("material", material_name)
|
||||||
|
case_material = _material(material_layers, case_material_name)
|
||||||
|
suffix = "_" + str(case["match"]) if "match" in case else ""
|
||||||
|
count += roads.assemble_geojson_layer(
|
||||||
|
source_path, source + suffix, projector, collection, case_material,
|
||||||
|
z_by_material_layer[material_name], _split_filter(split, case))
|
||||||
|
counts[source] = count
|
||||||
|
return counts
|
||||||
+63
-19
@@ -10,6 +10,7 @@ The expected values are derived from the geometry, not captured from the
|
|||||||
implementation — a test that just records current output would ratify a bug.
|
implementation — a test that just records current output would ratify a bug.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
import json
|
||||||
import math
|
import math
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
@@ -30,7 +31,8 @@ from osmassets.geom import (
|
|||||||
sample_tree_row,
|
sample_tree_row,
|
||||||
signed_polygon_area,
|
signed_polygon_area,
|
||||||
)
|
)
|
||||||
from osmassets.catalog import NATIVE_ROAD_LAYERS, ROAD_LAYERS
|
from osmassets.catalog import ROAD_LAYERS
|
||||||
|
from osmassets.native_road_manifest import CONTRACT, load as load_native_road_manifest
|
||||||
from osmassets.osm import Projector, parse_height, parse_osm, tags
|
from osmassets.osm import Projector, parse_height, parse_osm, tags
|
||||||
|
|
||||||
|
|
||||||
@@ -46,24 +48,6 @@ class RoadLayerCatalogTest(unittest.TestCase):
|
|||||||
self.assertNotEqual(layers["road_surface"]["z"],
|
self.assertNotEqual(layers["road_surface"]["z"],
|
||||||
layers["intersection_surface"]["z"])
|
layers["intersection_surface"]["z"])
|
||||||
|
|
||||||
def test_native_provider_maps_to_existing_material_layers(self):
|
|
||||||
layers = {layer["id"] for layer in ROAD_LAYERS}
|
|
||||||
self.assertEqual(
|
|
||||||
[(entry["source"], entry["material_layer"])
|
|
||||||
for entry in NATIVE_ROAD_LAYERS],
|
|
||||||
[("road_surface", "road_surface"),
|
|
||||||
("edge_lines", "lane_separators"),
|
|
||||||
("intersection_surface", "intersection_surface"),
|
|
||||||
("sidewalk_surface", "sidewalks"),
|
|
||||||
("lane_separators", "lane_separators"),
|
|
||||||
("center_lines", "center_lines"),
|
|
||||||
("direction_arrows", "lane_arrows_webscale"),
|
|
||||||
("turn_arrows", "lane_arrows_webscale"),
|
|
||||||
("crosswalks", "crosswalks"),
|
|
||||||
("vehicle_stop_lines", "vehicle_stop_lines")])
|
|
||||||
self.assertTrue(all(entry["material_layer"] in layers
|
|
||||||
for entry in NATIVE_ROAD_LAYERS))
|
|
||||||
|
|
||||||
def test_cesium_export_keeps_signal_assets_optional(self):
|
def test_cesium_export_keeps_signal_assets_optional(self):
|
||||||
exporter = os.path.join(os.path.dirname(os.path.abspath(__file__)),
|
exporter = os.path.join(os.path.dirname(os.path.abspath(__file__)),
|
||||||
"..", "export_cesium.py")
|
"..", "export_cesium.py")
|
||||||
@@ -72,6 +56,66 @@ class RoadLayerCatalogTest(unittest.TestCase):
|
|||||||
self.assertIn('if not args.get(key):\n continue', source)
|
self.assertIn('if not args.get(key):\n continue', source)
|
||||||
|
|
||||||
|
|
||||||
|
class NativeRoadManifestTest(unittest.TestCase):
|
||||||
|
def setUp(self):
|
||||||
|
self.root = tempfile.TemporaryDirectory()
|
||||||
|
self.layers_dir = os.path.join(self.root.name, "layers")
|
||||||
|
os.mkdir(self.layers_dir)
|
||||||
|
|
||||||
|
def tearDown(self):
|
||||||
|
self.root.cleanup()
|
||||||
|
|
||||||
|
def write_manifest(self, layers):
|
||||||
|
with open(os.path.join(self.root.name, "manifest.json"), "w", encoding="utf-8") as handle:
|
||||||
|
json.dump({"contract": CONTRACT, "areaId": "test", "layers": layers}, handle)
|
||||||
|
for layer in layers:
|
||||||
|
with open(os.path.join(self.layers_dir, layer["source"] + ".geojson"), "w",
|
||||||
|
encoding="utf-8") as handle:
|
||||||
|
json.dump({"type": "FeatureCollection", "features": []}, handle)
|
||||||
|
|
||||||
|
def test_accepts_semantic_and_split_layers(self):
|
||||||
|
layers = [
|
||||||
|
{"source": "road_surface", "role": "surface", "materialLayer": "road_surface"},
|
||||||
|
{"source": "center_lines", "role": "marking", "materialLayer": "center_lines",
|
||||||
|
"splitBy": {"prop": "color", "cases": [
|
||||||
|
{"match": "white", "material": "native_center_line_white"},
|
||||||
|
{"default": True, "material": "center_lines"},
|
||||||
|
]}},
|
||||||
|
{"source": "connectors", "role": "semantic"},
|
||||||
|
]
|
||||||
|
self.write_manifest(layers)
|
||||||
|
self.assertEqual(load_native_road_manifest(self.root.name)["layers"], layers)
|
||||||
|
|
||||||
|
def test_rejects_undeclared_or_missing_geojson(self):
|
||||||
|
layers = [{"source": "road_surface", "role": "surface",
|
||||||
|
"materialLayer": "road_surface"}]
|
||||||
|
self.write_manifest(layers)
|
||||||
|
with open(os.path.join(self.layers_dir, "extra.geojson"), "w", encoding="utf-8") as handle:
|
||||||
|
handle.write("{}")
|
||||||
|
with self.assertRaisesRegex(RuntimeError, "mismatch"):
|
||||||
|
load_native_road_manifest(self.root.name)
|
||||||
|
os.unlink(os.path.join(self.layers_dir, "extra.geojson"))
|
||||||
|
os.unlink(os.path.join(self.layers_dir, "road_surface.geojson"))
|
||||||
|
with self.assertRaisesRegex(RuntimeError, "mismatch"):
|
||||||
|
load_native_road_manifest(self.root.name)
|
||||||
|
|
||||||
|
def test_rejects_invalid_semantic_and_split_definitions(self):
|
||||||
|
self.write_manifest([{"source": "connectors", "role": "semantic",
|
||||||
|
"materialLayer": "road_surface"}])
|
||||||
|
with self.assertRaisesRegex(RuntimeError, "semantic"):
|
||||||
|
load_native_road_manifest(self.root.name)
|
||||||
|
|
||||||
|
self.write_manifest([{"source": "center_lines", "role": "marking",
|
||||||
|
"materialLayer": "center_lines", "splitBy": {
|
||||||
|
"prop": "color", "cases": [
|
||||||
|
{"match": "white", "material": "native_center_line_white"},
|
||||||
|
{"default": True, "material": "center_lines"},
|
||||||
|
{"default": True, "material": "center_lines"},
|
||||||
|
]}}])
|
||||||
|
with self.assertRaisesRegex(RuntimeError, "exactly one default"):
|
||||||
|
load_native_road_manifest(self.root.name)
|
||||||
|
|
||||||
|
|
||||||
class GeometryRingsTest(unittest.TestCase):
|
class GeometryRingsTest(unittest.TestCase):
|
||||||
def test_polygon_keeps_only_the_exterior_ring(self):
|
def test_polygon_keeps_only_the_exterior_ring(self):
|
||||||
geometry = {"type": "Polygon", "coordinates": [["outer"], ["hole"]]}
|
geometry = {"type": "Polygon", "coordinates": [["outer"], ["hole"]]}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"id": "fengshu-er-road",
|
"id": "fengshu-er-road",
|
||||||
"input": "/Users/que01/osm2streets-qgis-workflow/inputs/osm/枫树二路.osm",
|
"input": "/Users/que01/osm2streets-qgis-workflow/inputs/osm/枫树二路.osm",
|
||||||
|
"nativeRoadPackage": "../../inputs/native-road-packages/fengshu-er-road.zip",
|
||||||
"outputRoot": "/Users/que01/osm2streets-qgis-workflow/outputs",
|
"outputRoot": "/Users/que01/osm2streets-qgis-workflow/outputs",
|
||||||
"qgisApp": "/Applications/QGIS.app",
|
"qgisApp": "/Applications/QGIS.app",
|
||||||
"blenderApp": "/Applications/Blender.app",
|
"blenderApp": "/Applications/Blender.app",
|
||||||
@@ -24,31 +25,6 @@
|
|||||||
"turnLaneArrows": {
|
"turnLaneArrows": {
|
||||||
"enabled": false
|
"enabled": false
|
||||||
},
|
},
|
||||||
"nativeRoad": {
|
|
||||||
"edgeLines": false,
|
|
||||||
"junctionTemplates": {
|
|
||||||
"enabled": true,
|
|
||||||
"references": [],
|
|
||||||
"clusters": [
|
|
||||||
{
|
|
||||||
"id": "zhushanhu-fengshu-complex",
|
|
||||||
"template": "complex-junction-v1",
|
|
||||||
"referenceFile": "/Users/que01/osm2streets-qgis-workflow/inputs/osm/珠山湖大道(枫树二路)口.geojson",
|
|
||||||
"approachWidthMultiplier": 1.45,
|
|
||||||
"approachLengthMeters": 32,
|
|
||||||
"coreRadiusMeters": 28,
|
|
||||||
"cornerRadiusMeters": 25,
|
|
||||||
"outerRadiusExtraMeters": 24,
|
|
||||||
"nodeIds": [
|
|
||||||
"8005332807",
|
|
||||||
"8024512135",
|
|
||||||
"8024512145",
|
|
||||||
"8024512147"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"osm2streets": {
|
"osm2streets": {
|
||||||
"debug_each_step": false,
|
"debug_each_step": false,
|
||||||
"dual_carriageway_experiment": false,
|
"dual_carriageway_experiment": false,
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"id": "nantaizi-lake-innovation-valley",
|
"id": "nantaizi-lake-innovation-valley",
|
||||||
"input": "/Users/que01/Desktop/南台子湖创新谷OSM.osm",
|
"input": "/Users/que01/Desktop/南台子湖创新谷OSM.osm",
|
||||||
|
"nativeRoadPackage": "../../inputs/native-road-packages/nantaizi-lake-innovation-valley.zip",
|
||||||
"outputRoot": "/Users/que01/osm2streets-qgis-workflow/outputs",
|
"outputRoot": "/Users/que01/osm2streets-qgis-workflow/outputs",
|
||||||
"qgisApp": "/Applications/QGIS.app",
|
"qgisApp": "/Applications/QGIS.app",
|
||||||
"blenderApp": "/Applications/Blender.app",
|
"blenderApp": "/Applications/Blender.app",
|
||||||
@@ -24,9 +25,6 @@
|
|||||||
"turnLaneArrows": {
|
"turnLaneArrows": {
|
||||||
"enabled": true
|
"enabled": true
|
||||||
},
|
},
|
||||||
"nativeRoad": {
|
|
||||||
"edgeLines": false
|
|
||||||
},
|
|
||||||
"osm2streets": {
|
"osm2streets": {
|
||||||
"debug_each_step": false,
|
"debug_each_step": false,
|
||||||
"dual_carriageway_experiment": false,
|
"dual_carriageway_experiment": false,
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"id": "my-area",
|
"id": "my-area",
|
||||||
"input": "/absolute/path/to/input.osm",
|
"input": "/absolute/path/to/input.osm",
|
||||||
|
"nativeRoadPackage": "/absolute/path/to/exported-native-road-package.zip",
|
||||||
"outputRoot": "/absolute/path/to/outputs",
|
"outputRoot": "/absolute/path/to/outputs",
|
||||||
"qgisApp": "/Applications/QGIS.app",
|
"qgisApp": "/Applications/QGIS.app",
|
||||||
"blenderApp": "/Applications/Blender.app",
|
"blenderApp": "/Applications/Blender.app",
|
||||||
@@ -24,14 +25,6 @@
|
|||||||
"turnLaneArrows": {
|
"turnLaneArrows": {
|
||||||
"enabled": false
|
"enabled": false
|
||||||
},
|
},
|
||||||
"nativeRoad": {
|
|
||||||
"edgeLines": false,
|
|
||||||
"junctionTemplates": {
|
|
||||||
"enabled": false,
|
|
||||||
"references": [],
|
|
||||||
"clusters": []
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"osm2streets": {
|
"osm2streets": {
|
||||||
"debug_each_step": false,
|
"debug_each_step": false,
|
||||||
"dual_carriageway_experiment": false,
|
"dual_carriageway_experiment": false,
|
||||||
|
|||||||
@@ -1,5 +1,15 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2026-08-25
|
||||||
|
|
||||||
|
- Frozen the `native-road-package/v1` host/compiler contract in
|
||||||
|
`docs/native-road-package-v1.md`, added `scripts/road-parity.js`, and
|
||||||
|
committed checksum baselines for `fengshu-er-road` and
|
||||||
|
`nantaizi-lake-innovation-valley`. The control experiment covers two clean
|
||||||
|
compiles plus editable signal regeneration for each area; JSON key ordering,
|
||||||
|
absolute paths, and temporary staging names are normalized while geometry and
|
||||||
|
GeoJSON feature order remain strict.
|
||||||
|
|
||||||
## 2026-08-04
|
## 2026-08-04
|
||||||
|
|
||||||
- 重构区域构建入口的 preview 实现边界:`build-area.js` 现在只调度阶段、写 preview
|
- 重构区域构建入口的 preview 实现边界:`build-area.js` 现在只调度阶段、写 preview
|
||||||
|
|||||||
@@ -0,0 +1,106 @@
|
|||||||
|
# Native Road Package v1.1
|
||||||
|
|
||||||
|
`native-road-package/v1.1` defines the boundary between the host area pipeline
|
||||||
|
and the native road compiler. The compiler accepts only the input below; it
|
||||||
|
does not read `config/areas/*.json` or derive host paths.
|
||||||
|
|
||||||
|
## Input
|
||||||
|
|
||||||
|
```js
|
||||||
|
{
|
||||||
|
areaId: string,
|
||||||
|
osmFile: string,
|
||||||
|
outDir: string,
|
||||||
|
stagingDir: string,
|
||||||
|
overridesFile: string,
|
||||||
|
trafficSignalsFile: string,
|
||||||
|
comparisonDir?: string,
|
||||||
|
options: {
|
||||||
|
edgeLines: boolean,
|
||||||
|
junctionTemplates: {
|
||||||
|
enabled: boolean,
|
||||||
|
references: [],
|
||||||
|
clusters: []
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
All paths are absolute at the process boundary. `stagingDir` is the parent for
|
||||||
|
the compiler's temporary output and `outDir` is promoted atomically only after
|
||||||
|
all files are written. The host maps normalized area configuration to this
|
||||||
|
shape and owns all path derivation.
|
||||||
|
|
||||||
|
## Output
|
||||||
|
|
||||||
|
`outDir` contains these JSON documents:
|
||||||
|
|
||||||
|
- `compiled.json`: top-level keys are `schema`, `areaId`, `source`, `model`,
|
||||||
|
`movements`, `trafficSignals`, `diagnostics`, and `layers`. `source` has
|
||||||
|
`osm`, `overrides`, and `trafficSignals` paths.
|
||||||
|
- `diagnostics.json`: `{ schema: "native-road-diagnostics/v1", diagnostics: [] }`.
|
||||||
|
Each diagnostic has `id`, `severity`, `subjectId`, `sourceIds`, `rule`,
|
||||||
|
`message`, and `geometry` (a GeoJSON geometry or `null`).
|
||||||
|
- `comparison.json`: coverage counts for the road workbench.
|
||||||
|
- `traffic-signal-assemblies.json` and `traffic-signals.json`: compiler-owned
|
||||||
|
signal assembly and runtime views.
|
||||||
|
|
||||||
|
`layers/` always contains these twelve GeoJSON FeatureCollections:
|
||||||
|
|
||||||
|
1. `road_surface.geojson`
|
||||||
|
2. `intersection_surface.geojson`
|
||||||
|
3. `sidewalk_surface.geojson`
|
||||||
|
4. `edge_lines.geojson`
|
||||||
|
5. `lane_separators.geojson`
|
||||||
|
6. `center_lines.geojson`
|
||||||
|
7. `crosswalks.geojson`
|
||||||
|
8. `vehicle_stop_lines.geojson`
|
||||||
|
9. `direction_arrows.geojson`
|
||||||
|
10. `turn_arrows.geojson`
|
||||||
|
11. `lane_centerlines.geojson` (semantic, not rendered)
|
||||||
|
12. `connectors.geojson` (semantic, not rendered)
|
||||||
|
|
||||||
|
`manifest.json` is required. It declares the same twelve sources in published
|
||||||
|
order using `{ source, role, materialLayer?, splitBy? }`. `surface` and
|
||||||
|
`marking` layers declare a host material slot; `semantic` layers are published
|
||||||
|
but Blender must not read or render them. A `splitBy` entry has one exact-match
|
||||||
|
case or more plus exactly one default case, so the legacy white center-line and
|
||||||
|
yellow lane-separator material routing remains declarative. Consumers reject a
|
||||||
|
missing/invalid manifest, a source/file mismatch, and unknown material slots.
|
||||||
|
|
||||||
|
The editable signal source at `trafficSignalsFile` is a sibling of `outDir`.
|
||||||
|
It is included in the parity baseline because regeneration must be stable.
|
||||||
|
|
||||||
|
Successful CLI execution prints exactly one completion marker:
|
||||||
|
|
||||||
|
```text
|
||||||
|
NATIVE_ROAD_COMPILE_DONE {"areaId":...,"roads":N,"endpoints":N,"diagnostics":N,"output":...,"comparison":...}
|
||||||
|
```
|
||||||
|
|
||||||
|
Consumers use the CLI process plus files in `outDir` and parse this marker.
|
||||||
|
An in-process import may be an optimization, never the sole contract.
|
||||||
|
|
||||||
|
## Comparison Input Decision
|
||||||
|
|
||||||
|
`comparison.json` remains part of v1. The road workbench currently reads it,
|
||||||
|
so removing it would break a real consumer. `comparisonDir` is therefore an
|
||||||
|
optional compiler input for a future standalone package: when absent, the
|
||||||
|
compiler emits native-only counts and marks osm2streets coverage unavailable.
|
||||||
|
|
||||||
|
## Parity Rules
|
||||||
|
|
||||||
|
`scripts/road-parity.js` snapshots every file below `outDir` plus the sibling
|
||||||
|
editable signal document. JSON object keys are recursively sorted before
|
||||||
|
hashing. GeoJSON records both a sorted-feature `contentHash` and original-order
|
||||||
|
`orderHash`; either difference is reported.
|
||||||
|
|
||||||
|
The only normalization is intentional volatility removal:
|
||||||
|
|
||||||
|
- absolute paths below this repository become `<repo>/...`;
|
||||||
|
- other absolute paths become `<external>/<basename>`;
|
||||||
|
- `native-road-*` temporary directory names become `<staging>`.
|
||||||
|
|
||||||
|
No coordinates are rounded and no feature order changes are ignored. Control
|
||||||
|
experiments on 2026-08-25 compiled `fengshu-er-road` and
|
||||||
|
`nantaizi-lake-innovation-valley` twice, then regenerated their editable
|
||||||
|
signal documents. All 18 tracked files per area matched.
|
||||||
Binary file not shown.
Binary file not shown.
Generated
+12
@@ -9,6 +9,8 @@
|
|||||||
"version": "0.3.0",
|
"version": "0.3.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@inquirer/prompts": "^8.5.2",
|
"@inquirer/prompts": "^8.5.2",
|
||||||
|
"@osm-asset/road-compiler": "git+https://git.app.que01.top/que01/road-compiler.git#v0.2.2",
|
||||||
|
"fflate": "0.8.3",
|
||||||
"ol": "^10.10.0",
|
"ol": "^10.10.0",
|
||||||
"osm2streets-js-node": "0.1.4"
|
"osm2streets-js-node": "0.1.4"
|
||||||
}
|
}
|
||||||
@@ -341,6 +343,16 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@osm-asset/road-compiler": {
|
||||||
|
"version": "0.2.2",
|
||||||
|
"resolved": "git+https://git.app.que01.top/que01/road-compiler.git#3b4befb02550c524ae83831e77959423e3bb40bf",
|
||||||
|
"dependencies": {
|
||||||
|
"ol": "10.10.0"
|
||||||
|
},
|
||||||
|
"bin": {
|
||||||
|
"road-compiler": "bin/road-compiler.js"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@petamoriken/float16": {
|
"node_modules/@petamoriken/float16": {
|
||||||
"version": "3.9.3",
|
"version": "3.9.3",
|
||||||
"resolved": "http://172.16.1.86:4873/@petamoriken/float16/-/float16-3.9.3.tgz",
|
"resolved": "http://172.16.1.86:4873/@petamoriken/float16/-/float16-3.9.3.tgz",
|
||||||
|
|||||||
+4
-4
@@ -11,13 +11,11 @@
|
|||||||
"compress:glb": "node scripts/compress-glb.js",
|
"compress:glb": "node scripts/compress-glb.js",
|
||||||
"diagnose:area": "node scripts/diagnose-area.js",
|
"diagnose:area": "node scripts/diagnose-area.js",
|
||||||
"preflight:area": "node scripts/preflight-area.js",
|
"preflight:area": "node scripts/preflight-area.js",
|
||||||
"road:compile": "node scripts/compile-native-roads.js",
|
|
||||||
"reference:junction": "node scripts/inspect-junction-reference.js",
|
"reference:junction": "node scripts/inspect-junction-reference.js",
|
||||||
"road:check": "node scripts/check-native-roads.js",
|
|
||||||
"road:workbench": "node scripts/road-workbench.js",
|
|
||||||
"serve:v2x-preview": "node scripts/v2x-preview-server.js",
|
"serve:v2x-preview": "node scripts/v2x-preview-server.js",
|
||||||
"test:road-workbench": "node scripts/test-road-workbench.js",
|
|
||||||
"test:native-road": "node scripts/test-native-road.js",
|
"test:native-road": "node scripts/test-native-road.js",
|
||||||
|
"test:native-road-package": "node scripts/test-native-road-package.js",
|
||||||
|
"test:road-parity": "node scripts/test-road-parity.js",
|
||||||
"test:gaode-junction-reference": "node scripts/test-gaode-junction-reference.js",
|
"test:gaode-junction-reference": "node scripts/test-gaode-junction-reference.js",
|
||||||
"test:preflight": "node scripts/test-area-preflight.js",
|
"test:preflight": "node scripts/test-area-preflight.js",
|
||||||
"test:build-stages": "node scripts/test-build-stages.js",
|
"test:build-stages": "node scripts/test-build-stages.js",
|
||||||
@@ -35,6 +33,8 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@inquirer/prompts": "^8.5.2",
|
"@inquirer/prompts": "^8.5.2",
|
||||||
|
"@osm-asset/road-compiler": "git+https://git.app.que01.top/que01/road-compiler.git#v0.2.2",
|
||||||
|
"fflate": "0.8.3",
|
||||||
"ol": "^10.10.0",
|
"ol": "^10.10.0",
|
||||||
"osm2streets-js-node": "0.1.4"
|
"osm2streets-js-node": "0.1.4"
|
||||||
}
|
}
|
||||||
|
|||||||
+18
-24
@@ -4,7 +4,7 @@ const fs = require("fs");
|
|||||||
const path = require("path");
|
const path = require("path");
|
||||||
const { spawnSync } = require("child_process");
|
const { spawnSync } = require("child_process");
|
||||||
const { readAreaConfig } = require("./lib/area-config");
|
const { readAreaConfig } = require("./lib/area-config");
|
||||||
const { compileArea: compileNativeRoads } = require("./compile-native-roads");
|
const { importNativeRoadPackage } = require("./lib/native-road-package");
|
||||||
const { resolveStages } = require("./lib/build-stages");
|
const { resolveStages } = require("./lib/build-stages");
|
||||||
const { validateManifest, addIntegrity } = require("./lib/package-contract");
|
const { validateManifest, addIntegrity } = require("./lib/package-contract");
|
||||||
const { blenderExecutable: resolveBlenderExecutable } = require("./lib/tool-paths");
|
const { blenderExecutable: resolveBlenderExecutable } = require("./lib/tool-paths");
|
||||||
@@ -225,10 +225,7 @@ function buildBlenderScene(area, roadProvider) {
|
|||||||
}
|
}
|
||||||
fs.mkdirSync(path.dirname(area.outputs.blend), { recursive: true });
|
fs.mkdirSync(path.dirname(area.outputs.blend), { recursive: true });
|
||||||
fs.mkdirSync(path.dirname(area.outputs.render), { recursive: true });
|
fs.mkdirSync(path.dirname(area.outputs.render), { recursive: true });
|
||||||
if (roadProvider === "native") {
|
const nativePackage = roadProvider === "native" ? importNativeRoadPackage(area) : null;
|
||||||
compileNativeRoads(configPath);
|
|
||||||
ensureNativeRoadLayers(area);
|
|
||||||
}
|
|
||||||
|
|
||||||
const blenderArgs = [
|
const blenderArgs = [
|
||||||
"--background",
|
"--background",
|
||||||
@@ -246,8 +243,8 @@ function buildBlenderScene(area, roadProvider) {
|
|||||||
area.blender.treeStyle,
|
area.blender.treeStyle,
|
||||||
];
|
];
|
||||||
if (roadProvider === "native") {
|
if (roadProvider === "native") {
|
||||||
blenderArgs.push("--native-road", area.outputs.nativeRoadDir);
|
blenderArgs.push("--native-road", nativePackage.rootDir);
|
||||||
blenderArgs.push("--traffic-signals", path.join(area.outputs.nativeRoadDir, "traffic-signals.json"));
|
blenderArgs.push("--traffic-signals", path.join(nativePackage.rootDir, "traffic-signals.json"));
|
||||||
} else {
|
} else {
|
||||||
blenderArgs.push("--geojson", area.outputs.geojsonDir);
|
blenderArgs.push("--geojson", area.outputs.geojsonDir);
|
||||||
}
|
}
|
||||||
@@ -270,7 +267,7 @@ function buildBlenderScene(area, roadProvider) {
|
|||||||
inputs: {
|
inputs: {
|
||||||
config: fileRecord(configPath),
|
config: fileRecord(configPath),
|
||||||
osm: fileRecord(area.input),
|
osm: fileRecord(area.input),
|
||||||
...(roadProvider === "native" ? nativeRoadRecords(area) : sceneGeojsonRecords(area)),
|
...(roadProvider === "native" ? nativeRoadRecords(nativePackage) : sceneGeojsonRecords(area)),
|
||||||
...(roadProvider === "osm2streets" ? {
|
...(roadProvider === "osm2streets" ? {
|
||||||
geojsonDir: fileRecord(area.outputs.geojsonDir),
|
geojsonDir: fileRecord(area.outputs.geojsonDir),
|
||||||
trafficSignalAssemblies: fileRecord(area.outputs.trafficSignalAssemblies),
|
trafficSignalAssemblies: fileRecord(area.outputs.trafficSignalAssemblies),
|
||||||
@@ -282,7 +279,7 @@ function buildBlenderScene(area, roadProvider) {
|
|||||||
render: fileRecord(area.outputs.render),
|
render: fileRecord(area.outputs.render),
|
||||||
},
|
},
|
||||||
summary: {
|
summary: {
|
||||||
...(roadProvider === "native" ? { nativeRoad: nativeRoadFeatureCounts(area) } : { geojson: geojsonFeatureCounts(area) }),
|
...(roadProvider === "native" ? { nativeRoad: nativeRoadFeatureCounts(nativePackage) } : { geojson: geojsonFeatureCounts(area) }),
|
||||||
roadProvider,
|
roadProvider,
|
||||||
blendBytes: fileRecord(area.outputs.blend).bytes,
|
blendBytes: fileRecord(area.outputs.blend).bytes,
|
||||||
renderBytes: fileRecord(area.outputs.render).bytes,
|
renderBytes: fileRecord(area.outputs.render).bytes,
|
||||||
@@ -291,17 +288,13 @@ function buildBlenderScene(area, roadProvider) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function ensureNativeRoadLayers(area) {
|
function nativeRoadRecords(nativePackage) {
|
||||||
ensureFile(path.join(area.outputs.nativeRoadDir, "compiled.json"), "Native road compilation");
|
const root = path.join(nativePackage.rootDir, "layers");
|
||||||
for (const file of ["road_surface.geojson", "edge_lines.geojson", "intersection_surface.geojson", "sidewalk_surface.geojson", "lane_separators.geojson", "center_lines.geojson", "direction_arrows.geojson", "turn_arrows.geojson", "crosswalks.geojson", "vehicle_stop_lines.geojson"]) {
|
|
||||||
ensureFile(path.join(area.outputs.nativeRoadDir, "layers", file), `Native road layer ${file}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function nativeRoadRecords(area) {
|
|
||||||
const root = path.join(area.outputs.nativeRoadDir, "layers");
|
|
||||||
return {
|
return {
|
||||||
nativeRoadCompiled: fileRecord(path.join(area.outputs.nativeRoadDir, "compiled.json")),
|
nativeRoadZip: nativePackage.zipRecord,
|
||||||
|
nativeRoadImport: fileRecord(nativePackage.rootDir),
|
||||||
|
nativeRoadCompiled: fileRecord(path.join(nativePackage.rootDir, "compiled.json")),
|
||||||
|
nativeRoadSignals: fileRecord(path.join(nativePackage.rootDir, "traffic-signals.json")),
|
||||||
nativeRoadSurface: fileRecord(path.join(root, "road_surface.geojson")),
|
nativeRoadSurface: fileRecord(path.join(root, "road_surface.geojson")),
|
||||||
nativeEdgeLines: fileRecord(path.join(root, "edge_lines.geojson")),
|
nativeEdgeLines: fileRecord(path.join(root, "edge_lines.geojson")),
|
||||||
nativeIntersectionSurface: fileRecord(path.join(root, "intersection_surface.geojson")),
|
nativeIntersectionSurface: fileRecord(path.join(root, "intersection_surface.geojson")),
|
||||||
@@ -315,8 +308,8 @@ function nativeRoadRecords(area) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function nativeRoadFeatureCounts(area) {
|
function nativeRoadFeatureCounts(nativePackage) {
|
||||||
const root = path.join(area.outputs.nativeRoadDir, "layers");
|
const root = path.join(nativePackage.rootDir, "layers");
|
||||||
return {
|
return {
|
||||||
roadSurface: featureCount(path.join(root, "road_surface.geojson")),
|
roadSurface: featureCount(path.join(root, "road_surface.geojson")),
|
||||||
edgeLines: featureCount(path.join(root, "edge_lines.geojson")),
|
edgeLines: featureCount(path.join(root, "edge_lines.geojson")),
|
||||||
@@ -487,8 +480,9 @@ function compressCesiumGlb(area) {
|
|||||||
|
|
||||||
function publishPackage(area, roadProvider) {
|
function publishPackage(area, roadProvider) {
|
||||||
ensureFile(area.outputs.packageStagingManifest, "Staged package manifest");
|
ensureFile(area.outputs.packageStagingManifest, "Staged package manifest");
|
||||||
const trafficSignalsSource = roadProvider === "native"
|
const nativePackage = roadProvider === "native" ? importNativeRoadPackage(area) : null;
|
||||||
? path.join(area.outputs.nativeRoadDir, "traffic-signals.json")
|
const trafficSignalsSource = nativePackage
|
||||||
|
? path.join(nativePackage.rootDir, "traffic-signals.json")
|
||||||
: area.outputs.trafficSignals;
|
: area.outputs.trafficSignals;
|
||||||
ensureFile(trafficSignalsSource, "Traffic signal anchors");
|
ensureFile(trafficSignalsSource, "Traffic signal anchors");
|
||||||
const started = Date.now();
|
const started = Date.now();
|
||||||
@@ -574,7 +568,7 @@ function writeCesiumPreview(area, roadProvider) {
|
|||||||
intersectionSurface: fileRecord(intersectionSurface),
|
intersectionSurface: fileRecord(intersectionSurface),
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
Object.assign(previewInputs, nativeRoadRecords(area));
|
Object.assign(previewInputs, nativeRoadRecords(importNativeRoadPackage(area)));
|
||||||
// This operational preview intentionally has no synthetic vehicle source.
|
// This operational preview intentionally has no synthetic vehicle source.
|
||||||
// A stale descriptor from an older build must not resurrect simulated routes.
|
// A stale descriptor from an older build must not resurrect simulated routes.
|
||||||
fs.rmSync(area.outputs.trafficSimulation, { force: true });
|
fs.rmSync(area.outputs.trafficSimulation, { force: true });
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ const os = require("os");
|
|||||||
const { execFileSync } = require("child_process");
|
const { execFileSync } = require("child_process");
|
||||||
const { JsStreetNetwork } = require("osm2streets-js-node");
|
const { JsStreetNetwork } = require("osm2streets-js-node");
|
||||||
const { qgisPaths } = require("./lib/tool-paths");
|
const { qgisPaths } = require("./lib/tool-paths");
|
||||||
const { buildCustomTurnLaneArrows } = require("./lib/turn-lane-arrows");
|
const { turnLaneArrows: { buildCustomTurnLaneArrows } } = require("@osm-asset/road-compiler");
|
||||||
const { readTrafficSignalFeatures } = require("./lib/traffic-signals");
|
const { readTrafficSignalFeatures } = require("./lib/traffic-signals");
|
||||||
const {
|
const {
|
||||||
SCENE_LAYERS,
|
SCENE_LAYERS,
|
||||||
|
|||||||
@@ -1,35 +1,19 @@
|
|||||||
#!/usr/bin/env node
|
#!/usr/bin/env node
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const fs = require("fs");
|
|
||||||
const path = require("path");
|
const path = require("path");
|
||||||
const { readAreaConfig } = require("./lib/area-config");
|
const { readAreaConfig } = require("./lib/area-config");
|
||||||
const { compileArea, parseArgs } = require("./compile-native-roads");
|
const { compileArea, parseArgs } = require("./compile-native-roads");
|
||||||
|
const { check } = require("@osm-asset/road-compiler");
|
||||||
|
|
||||||
const repoRoot = path.resolve(__dirname, "..");
|
const repoRoot = path.resolve(__dirname, "..");
|
||||||
|
|
||||||
function checkArea(configPath, options = {}) {
|
function checkArea(configPath, options = {}) {
|
||||||
if (options.compile) compileArea(configPath);
|
if (options.compile) compileArea(configPath);
|
||||||
const area = readAreaConfig(configPath, { repoRoot });
|
const area = readAreaConfig(configPath, { repoRoot });
|
||||||
const root = area.outputs.nativeRoadDir;
|
return check.checkOutput({ areaId: area.id, outDir: area.outputs.nativeRoadDir });
|
||||||
const compiledPath = path.join(root, "compiled.json");
|
|
||||||
if (!fs.existsSync(compiledPath)) throw new Error(`Native road output is missing: ${compiledPath}`);
|
|
||||||
const compiled = readJson(compiledPath);
|
|
||||||
const connectors = readJson(path.join(root, "layers", "connectors.geojson"));
|
|
||||||
const published = new Set(connectors.features.map((feature) => feature.properties.movement_id));
|
|
||||||
const failures = [];
|
|
||||||
for (const movement of compiled.movements || []) {
|
|
||||||
if (movement.geometryPublished && !published.has(movement.id)) failures.push(`Published movement has no connector: ${movement.id}`);
|
|
||||||
if (!movement.geometryPublished && published.has(movement.id)) failures.push(`Non-published movement has a connector: ${movement.id}`);
|
|
||||||
if (!movement.geometryStatus) failures.push(`Movement has no geometry status: ${movement.id}`);
|
|
||||||
}
|
|
||||||
const errors = (compiled.diagnostics || []).filter((item) => item.severity === "error");
|
|
||||||
const warnings = (compiled.diagnostics || []).filter((item) => item.severity === "warning");
|
|
||||||
return { schema: "native-road-check/v1", areaId: area.id, ok: failures.length === 0 && errors.length === 0, movementCount: (compiled.movements || []).length, connectorCount: connectors.features.length, errors: errors.map((item) => ({ id: item.id, rule: item.rule, message: item.message })), warningCount: warnings.length, failures };
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function readJson(file) { return JSON.parse(fs.readFileSync(file, "utf8")); }
|
|
||||||
|
|
||||||
function main() {
|
function main() {
|
||||||
const args = parseArgs(process.argv.slice(2));
|
const args = parseArgs(process.argv.slice(2));
|
||||||
const configPath = path.resolve(args.config || path.join(repoRoot, "config", "areas", "nantaizi-lake-innovation-valley.json"));
|
const configPath = path.resolve(args.config || path.join(repoRoot, "config", "areas", "nantaizi-lake-innovation-valley.json"));
|
||||||
|
|||||||
@@ -1,11 +1,9 @@
|
|||||||
#!/usr/bin/env node
|
#!/usr/bin/env node
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const fs = require("fs");
|
|
||||||
const path = require("path");
|
const path = require("path");
|
||||||
const { readAreaConfig } = require("./lib/area-config");
|
const { readAreaConfig } = require("./lib/area-config");
|
||||||
const { compileRoadModel, compileGeometry, loadOverrides, validateOverrides, writeJsonAtomic } = require("./lib/native-road");
|
const { compileArea: compileWithCli } = require("./lib/road-compiler-cli");
|
||||||
const { loadOrGenerate, runtime } = require("./lib/native-traffic-signals");
|
|
||||||
|
|
||||||
const repoRoot = path.resolve(__dirname, "..");
|
const repoRoot = path.resolve(__dirname, "..");
|
||||||
|
|
||||||
@@ -21,119 +19,13 @@ function parseArgs(argv) {
|
|||||||
|
|
||||||
function compileArea(configPath) {
|
function compileArea(configPath) {
|
||||||
const area = readAreaConfig(configPath, { repoRoot });
|
const area = readAreaConfig(configPath, { repoRoot });
|
||||||
const overrides = loadOverrides(area.outputs.nativeRoadOverrides);
|
return { area, marker: compileWithCli(area) };
|
||||||
const model = compileRoadModel(fs.readFileSync(area.input, "utf8"), overrides);
|
|
||||||
// Editing the source OSM retires the ids some overrides point at. Those
|
|
||||||
// entries can no longer match anything, so drop them with a diagnostic rather
|
|
||||||
// than aborting the whole compile — otherwise every OSM edit blocks the
|
|
||||||
// pipeline until the file is hand-pruned, one error message at a time.
|
|
||||||
const validated = validateOverrides(overrides, model, { skipStaleTargets: true });
|
|
||||||
for (const item of validated.stale) console.warn(`[warning] 忽略失效的 override(目标已不存在):${item.id} -> ${item.target}`);
|
|
||||||
fs.mkdirSync(area.outputs.pipelineDir, { recursive: true });
|
|
||||||
const compiled = compileGeometry(model, overrides, { edgeLines: area.nativeRoad.edgeLines, junctionTemplates: area.nativeRoad.junctionTemplates });
|
|
||||||
compiled.diagnostics.push(...validated.stale.map((item) => ({
|
|
||||||
id: `diagnostic:stale-override:${item.id}`,
|
|
||||||
severity: "warning",
|
|
||||||
subjectId: item.id,
|
|
||||||
sourceIds: [],
|
|
||||||
rule: "stale-override-target",
|
|
||||||
message: `该设置指向的 ${item.kind} 目标 ${item.target} 已不存在(OSM 改动后 id 失效),本次编译已忽略。可在工作台重新设置,或从 native-road-overrides.json 中删除。`,
|
|
||||||
geometry: null,
|
|
||||||
})));
|
|
||||||
const signalDocument = loadOrGenerate(area.outputs.nativeTrafficSignals, fs.readFileSync(area.input, "utf8"), compiled.vehicleStopLines, compiled.intersectionSurface);
|
|
||||||
const signalRuntime = runtime(signalDocument);
|
|
||||||
// Persist validation normalization, including one-time legacy heading migration.
|
|
||||||
writeJsonAtomic(area.outputs.nativeTrafficSignals, signalDocument);
|
|
||||||
const staging = fs.mkdtempSync(path.join(area.outputs.pipelineDir, "native-road-"));
|
|
||||||
try {
|
|
||||||
const result = {
|
|
||||||
schema: "native-road-compiled/v1",
|
|
||||||
areaId: area.id,
|
|
||||||
source: { osm: area.input, overrides: area.outputs.nativeRoadOverrides, trafficSignals: area.outputs.nativeTrafficSignals },
|
|
||||||
model: { roads: model.roads, endpoints: model.endpoints, connections: model.connections },
|
|
||||||
movements: compiled.movements,
|
|
||||||
trafficSignals: { assemblies: "traffic-signal-assemblies.json", runtime: "traffic-signals.json", count: signalRuntime.signals.length },
|
|
||||||
diagnostics: compiled.diagnostics,
|
|
||||||
layers: { roadSurface: "layers/road_surface.geojson", edgeLines: "layers/edge_lines.geojson", sidewalkSurface: "layers/sidewalk_surface.geojson", intersectionSurface: "layers/intersection_surface.geojson", laneCenterlines: "layers/lane_centerlines.geojson", laneSeparators: "layers/lane_separators.geojson", centerLines: "layers/center_lines.geojson", directionArrows: "layers/direction_arrows.geojson", turnArrows: "layers/turn_arrows.geojson", crosswalks: "layers/crosswalks.geojson", vehicleStopLines: "layers/vehicle_stop_lines.geojson", connectors: "layers/connectors.geojson" },
|
|
||||||
};
|
|
||||||
const comparison = compareOsm2Streets(area, result.model, compiled);
|
|
||||||
writeJsonAtomic(path.join(staging, "compiled.json"), result);
|
|
||||||
writeJsonAtomic(path.join(staging, "diagnostics.json"), { schema: "native-road-diagnostics/v1", diagnostics: compiled.diagnostics });
|
|
||||||
writeJsonAtomic(path.join(staging, "comparison.json"), comparison);
|
|
||||||
writeJsonAtomic(path.join(staging, "traffic-signal-assemblies.json"), signalDocument.assemblies);
|
|
||||||
writeJsonAtomic(path.join(staging, "traffic-signals.json"), signalRuntime);
|
|
||||||
writeJsonAtomic(path.join(staging, "layers", "road_surface.geojson"), compiled.roadSurface);
|
|
||||||
writeJsonAtomic(path.join(staging, "layers", "edge_lines.geojson"), compiled.edgeLines);
|
|
||||||
writeJsonAtomic(path.join(staging, "layers", "sidewalk_surface.geojson"), compiled.sidewalkSurface);
|
|
||||||
writeJsonAtomic(path.join(staging, "layers", "intersection_surface.geojson"), compiled.intersectionSurface);
|
|
||||||
writeJsonAtomic(path.join(staging, "layers", "lane_centerlines.geojson"), compiled.laneCenterlines);
|
|
||||||
writeJsonAtomic(path.join(staging, "layers", "lane_separators.geojson"), compiled.laneSeparators);
|
|
||||||
writeJsonAtomic(path.join(staging, "layers", "center_lines.geojson"), compiled.centerLines);
|
|
||||||
writeJsonAtomic(path.join(staging, "layers", "direction_arrows.geojson"), compiled.directionArrows);
|
|
||||||
writeJsonAtomic(path.join(staging, "layers", "turn_arrows.geojson"), compiled.turnArrows);
|
|
||||||
writeJsonAtomic(path.join(staging, "layers", "crosswalks.geojson"), compiled.crosswalks);
|
|
||||||
writeJsonAtomic(path.join(staging, "layers", "vehicle_stop_lines.geojson"), compiled.vehicleStopLines);
|
|
||||||
writeJsonAtomic(path.join(staging, "layers", "connectors.geojson"), compiled.connectors);
|
|
||||||
fs.rmSync(area.outputs.nativeRoadDir, { recursive: true, force: true });
|
|
||||||
fs.renameSync(staging, area.outputs.nativeRoadDir);
|
|
||||||
return { area, result, comparison };
|
|
||||||
} catch (error) {
|
|
||||||
fs.rmSync(staging, { recursive: true, force: true });
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function compareOsm2Streets(area, model, compiled) {
|
|
||||||
const source = path.join(area.outputs.geojsonDir, "road_surface.geojson");
|
|
||||||
let featureCount = null;
|
|
||||||
if (fs.existsSync(source)) {
|
|
||||||
const collection = JSON.parse(fs.readFileSync(source, "utf8"));
|
|
||||||
featureCount = Array.isArray(collection.features) ? collection.features.length : null;
|
|
||||||
}
|
|
||||||
const diagnosticsBySeverity = {};
|
|
||||||
const diagnosticsByRule = {};
|
|
||||||
for (const item of compiled.diagnostics) {
|
|
||||||
diagnosticsBySeverity[item.severity] = (diagnosticsBySeverity[item.severity] || 0) + 1;
|
|
||||||
diagnosticsByRule[item.rule] = (diagnosticsByRule[item.rule] || 0) + 1;
|
|
||||||
}
|
|
||||||
const dangling = compiled.diagnostics.filter((item) => item.rule === "unconnected-interior-road-end");
|
|
||||||
const junctions = compiled.intersectionSurface.features;
|
|
||||||
const fallbackJunctions = junctions.filter((feature) => feature.properties.boundary_mode === "connector-convex-fallback");
|
|
||||||
return {
|
|
||||||
schema: "native-road-comparison/v2",
|
|
||||||
nativeRoadCount: model.roads.length,
|
|
||||||
nativeRoadSurfaceFeatures: compiled.roadSurface.features.length,
|
|
||||||
nativeSidewalkSurfaceFeatures: compiled.sidewalkSurface.features.length,
|
|
||||||
nativeJunctionSurfaceFeatures: compiled.intersectionSurface.features.length,
|
|
||||||
nativeApproachEnvelopeJunctions: junctions.length - fallbackJunctions.length,
|
|
||||||
nativeFallbackJunctions: fallbackJunctions.length,
|
|
||||||
nativeMaxJunctionExpansionRatio: junctions.reduce((maximum, feature) => Math.max(maximum, Number(feature.properties.expansion_ratio) || 0), 0),
|
|
||||||
nativeLaneCenterlineFeatures: compiled.laneCenterlines.features.length,
|
|
||||||
nativeLaneSeparatorFeatures: compiled.laneSeparators.features.length,
|
|
||||||
nativeCenterLineFeatures: compiled.centerLines.features.length,
|
|
||||||
nativeDirectionArrowFeatures: compiled.directionArrows.features.length,
|
|
||||||
nativeTurnArrowFeatures: compiled.turnArrows.features.length,
|
|
||||||
nativeCrosswalkFeatures: compiled.crosswalks.features.length,
|
|
||||||
nativeVehicleStopLineFeatures: compiled.vehicleStopLines.features.length,
|
|
||||||
nativeConnectorFeatures: compiled.connectors.features.length,
|
|
||||||
nativeMovementCount: compiled.movements.length,
|
|
||||||
nativePublishedMovementCount: compiled.movements.filter((movement) => movement.geometryPublished).length,
|
|
||||||
nativeConnectionCount: model.connections.length,
|
|
||||||
unconnectedInteriorRoadEnds: dangling.length,
|
|
||||||
unconnectedEndsWithManualCandidates: dangling.filter((item) => item.manualCandidates?.length).length,
|
|
||||||
diagnosticsBySeverity,
|
|
||||||
diagnosticsByRule,
|
|
||||||
osm2streetsRoadSurfaceFeatures: featureCount,
|
|
||||||
osm2streetsAvailable: featureCount !== null,
|
|
||||||
note: "Counts are coverage evidence only; geometry quality requires diagnostic and visual review.",
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function main() {
|
function main() {
|
||||||
const args = parseArgs(process.argv.slice(2));
|
const args = parseArgs(process.argv.slice(2));
|
||||||
const configPath = path.resolve(args.config || path.join(repoRoot, "config", "areas", "nantaizi-lake-innovation-valley.json"));
|
const configPath = path.resolve(args.config || path.join(repoRoot, "config", "areas", "nantaizi-lake-innovation-valley.json"));
|
||||||
const { area, result, comparison } = compileArea(configPath);
|
compileArea(configPath);
|
||||||
console.log(`NATIVE_ROAD_COMPILE_DONE ${JSON.stringify({ areaId: area.id, roads: result.model.roads.length, endpoints: result.model.endpoints.length, diagnostics: result.diagnostics.length, output: area.outputs.nativeRoadDir, comparison })}`);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (require.main === module) main();
|
if (require.main === module) main();
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
const path = require("path");
|
const path = require("path");
|
||||||
const { inspectReference, localReferenceSvg } = require("./lib/gaode-junction-reference");
|
const { gaodeReference: { inspectReference, localReferenceSvg } } = require("@osm-asset/road-compiler");
|
||||||
|
|
||||||
function parseArgs(argv) {
|
function parseArgs(argv) {
|
||||||
const result = {};
|
const result = {};
|
||||||
|
|||||||
+13
-13
@@ -8,7 +8,7 @@ function readAreaConfig(file, options = {}) {
|
|||||||
if (!fs.existsSync(file)) {
|
if (!fs.existsSync(file)) {
|
||||||
throw new Error(`Config file not found: ${file}`);
|
throw new Error(`Config file not found: ${file}`);
|
||||||
}
|
}
|
||||||
return normalizeAreaConfig(JSON.parse(fs.readFileSync(file, "utf8")), options);
|
return normalizeAreaConfig(JSON.parse(fs.readFileSync(file, "utf8")), { ...options, configDir: path.dirname(path.resolve(file)) });
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeAreaConfig(raw, options = {}) {
|
function normalizeAreaConfig(raw, options = {}) {
|
||||||
@@ -25,6 +25,10 @@ function normalizeAreaConfig(raw, options = {}) {
|
|||||||
const fileStem = outputOverrides.fileStem || id;
|
const fileStem = outputOverrides.fileStem || id;
|
||||||
const compress = normalizeCompressConfig(raw.compress);
|
const compress = normalizeCompressConfig(raw.compress);
|
||||||
const budget = normalizeBudgetConfig(raw.budget);
|
const budget = normalizeBudgetConfig(raw.budget);
|
||||||
|
const roadProvider = roadProviderOption(raw.blender?.roadProvider ?? "native");
|
||||||
|
if (roadProvider === "native" && raw.nativeRoadPackage === undefined) {
|
||||||
|
throw new Error("Missing config key: nativeRoadPackage");
|
||||||
|
}
|
||||||
const pipelineDir = path.resolve(outputOverrides.pipelineDir || path.join(areaDir, "_pipeline"));
|
const pipelineDir = path.resolve(outputOverrides.pipelineDir || path.join(areaDir, "_pipeline"));
|
||||||
const packageDir = path.resolve(outputOverrides.packageDir || path.join(areaDir, "package"));
|
const packageDir = path.resolve(outputOverrides.packageDir || path.join(areaDir, "package"));
|
||||||
const packageStagingDir = path.resolve(outputOverrides.packageStagingDir || path.join(pipelineDir, "package-staging"));
|
const packageStagingDir = path.resolve(outputOverrides.packageStagingDir || path.join(pipelineDir, "package-staging"));
|
||||||
@@ -32,13 +36,9 @@ function normalizeAreaConfig(raw, options = {}) {
|
|||||||
const packageStagingRuntimeDir = path.resolve(outputOverrides.packageStagingRuntimeDir || path.join(packageStagingDir, "runtime"));
|
const packageStagingRuntimeDir = path.resolve(outputOverrides.packageStagingRuntimeDir || path.join(packageStagingDir, "runtime"));
|
||||||
const previewDir = path.resolve(outputOverrides.previewDir || path.join(areaDir, "_preview"));
|
const previewDir = path.resolve(outputOverrides.previewDir || path.join(areaDir, "_preview"));
|
||||||
const geojsonDir = path.resolve(outputOverrides.geojsonDir || path.join(areaDir, "osm2streets_web_out"));
|
const geojsonDir = path.resolve(outputOverrides.geojsonDir || path.join(areaDir, "osm2streets_web_out"));
|
||||||
const nativeRoadDir = path.resolve(outputOverrides.nativeRoadDir || path.join(areaDir, "native-road"));
|
|
||||||
const outputs = {
|
const outputs = {
|
||||||
areaDir,
|
areaDir,
|
||||||
geojsonDir,
|
geojsonDir,
|
||||||
nativeRoadDir,
|
|
||||||
nativeRoadOverrides: path.resolve(outputOverrides.nativeRoadOverrides || path.join(areaDir, "native-road-overrides.json")),
|
|
||||||
nativeTrafficSignals: path.resolve(outputOverrides.nativeTrafficSignals || path.join(areaDir, "native-traffic-signals.json")),
|
|
||||||
gpkg: path.resolve(outputOverrides.gpkg || path.join(areaDir, `${fileStem}.gpkg`)),
|
gpkg: path.resolve(outputOverrides.gpkg || path.join(areaDir, `${fileStem}.gpkg`)),
|
||||||
qgisProject: path.resolve(outputOverrides.qgisProject || path.join(areaDir, `${fileStem}.qgz`)),
|
qgisProject: path.resolve(outputOverrides.qgisProject || path.join(areaDir, `${fileStem}.qgz`)),
|
||||||
qgisPreview: path.resolve(outputOverrides.qgisPreview || path.join(areaDir, `${fileStem}-preview.png`)),
|
qgisPreview: path.resolve(outputOverrides.qgisPreview || path.join(areaDir, `${fileStem}-preview.png`)),
|
||||||
@@ -81,6 +81,9 @@ function normalizeAreaConfig(raw, options = {}) {
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
id,
|
id,
|
||||||
|
nativeRoadPackage: raw.nativeRoadPackage === undefined
|
||||||
|
? null
|
||||||
|
: path.resolve(options.configDir || repoRoot, requireText(raw.nativeRoadPackage, "nativeRoadPackage")),
|
||||||
input,
|
input,
|
||||||
outputRoot,
|
outputRoot,
|
||||||
qgisApp: raw.qgisApp || (process.platform === "darwin" ? "/Applications/QGIS.app" : "/usr"),
|
qgisApp: raw.qgisApp || (process.platform === "darwin" ? "/Applications/QGIS.app" : "/usr"),
|
||||||
@@ -111,10 +114,6 @@ function normalizeAreaConfig(raw, options = {}) {
|
|||||||
turnLaneArrows: {
|
turnLaneArrows: {
|
||||||
enabled: booleanOption(raw.turnLaneArrows?.enabled, false, "turnLaneArrows.enabled"),
|
enabled: booleanOption(raw.turnLaneArrows?.enabled, false, "turnLaneArrows.enabled"),
|
||||||
},
|
},
|
||||||
nativeRoad: {
|
|
||||||
edgeLines: booleanOption(raw.nativeRoad?.edgeLines, false, "nativeRoad.edgeLines"),
|
|
||||||
junctionTemplates: normalizeJunctionTemplates(raw.nativeRoad?.junctionTemplates, repoRoot),
|
|
||||||
},
|
|
||||||
osm2streets: raw.osm2streets || {
|
osm2streets: raw.osm2streets || {
|
||||||
debug_each_step: false,
|
debug_each_step: false,
|
||||||
dual_carriageway_experiment: false,
|
dual_carriageway_experiment: false,
|
||||||
@@ -125,7 +124,7 @@ function normalizeAreaConfig(raw, options = {}) {
|
|||||||
blender: {
|
blender: {
|
||||||
treeStyle: raw.blender?.treeStyle || "natural",
|
treeStyle: raw.blender?.treeStyle || "natural",
|
||||||
officeOverrides: raw.blender?.officeOverrides || raw.blender?.office_overrides || "",
|
officeOverrides: raw.blender?.officeOverrides || raw.blender?.office_overrides || "",
|
||||||
roadProvider: roadProviderOption(raw.blender?.roadProvider ?? "native"),
|
roadProvider,
|
||||||
},
|
},
|
||||||
v2xPreview: normalizeV2xPreviewConfig(raw.v2xPreview),
|
v2xPreview: normalizeV2xPreviewConfig(raw.v2xPreview),
|
||||||
compress,
|
compress,
|
||||||
@@ -154,7 +153,7 @@ function normalizeV2xPreviewConfig(raw) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeJunctionTemplates(raw, repoRoot) {
|
function normalizeJunctionTemplates(raw, repoRoot, configDir) {
|
||||||
if (raw === undefined || raw === null) return { enabled: false, references: [] };
|
if (raw === undefined || raw === null) return { enabled: false, references: [] };
|
||||||
if (typeof raw !== "object" || Array.isArray(raw)) throw new Error("nativeRoad.junctionTemplates must be an object");
|
if (typeof raw !== "object" || Array.isArray(raw)) throw new Error("nativeRoad.junctionTemplates must be an object");
|
||||||
const enabled = booleanOption(raw.enabled, false, "nativeRoad.junctionTemplates.enabled");
|
const enabled = booleanOption(raw.enabled, false, "nativeRoad.junctionTemplates.enabled");
|
||||||
@@ -164,7 +163,7 @@ function normalizeJunctionTemplates(raw, repoRoot) {
|
|||||||
const nodeId = requireText(item.nodeId, `nativeRoad.junctionTemplates.references[${index}].nodeId`);
|
const nodeId = requireText(item.nodeId, `nativeRoad.junctionTemplates.references[${index}].nodeId`);
|
||||||
const template = item.template ?? "cross-v1";
|
const template = item.template ?? "cross-v1";
|
||||||
if (template !== "cross-v1") throw new Error(`nativeRoad.junctionTemplates.references[${index}].template must be \"cross-v1\"`);
|
if (template !== "cross-v1") throw new Error(`nativeRoad.junctionTemplates.references[${index}].template must be \"cross-v1\"`);
|
||||||
const referenceFile = item.referenceFile ? path.resolve(item.referenceFile) : null;
|
const referenceFile = item.referenceFile ? path.resolve(configDir, item.referenceFile) : null;
|
||||||
const coordinateSystem = item.coordinateSystem ?? "GCJ-02";
|
const coordinateSystem = item.coordinateSystem ?? "GCJ-02";
|
||||||
if (coordinateSystem !== "GCJ-02") throw new Error(`nativeRoad.junctionTemplates.references[${index}].coordinateSystem must be \"GCJ-02\"`);
|
if (coordinateSystem !== "GCJ-02") throw new Error(`nativeRoad.junctionTemplates.references[${index}].coordinateSystem must be \"GCJ-02\"`);
|
||||||
const cornerRadiusMultiplier = numberOption(item.cornerRadiusMultiplier, 1, `nativeRoad.junctionTemplates.references[${index}].cornerRadiusMultiplier`, 0.75, 1.25);
|
const cornerRadiusMultiplier = numberOption(item.cornerRadiusMultiplier, 1, `nativeRoad.junctionTemplates.references[${index}].cornerRadiusMultiplier`, 0.75, 1.25);
|
||||||
@@ -181,7 +180,7 @@ function normalizeJunctionTemplates(raw, repoRoot) {
|
|||||||
if (!Array.isArray(nodeIds) || nodeIds.length < 2 || nodeIds.some((value) => typeof value !== "string" && typeof value !== "number")) throw new Error(`nativeRoad.junctionTemplates.clusters[${index}].nodeIds must contain at least two node ids`);
|
if (!Array.isArray(nodeIds) || nodeIds.length < 2 || nodeIds.some((value) => typeof value !== "string" && typeof value !== "number")) throw new Error(`nativeRoad.junctionTemplates.clusters[${index}].nodeIds must contain at least two node ids`);
|
||||||
const template = item.template ?? "complex-junction-v1";
|
const template = item.template ?? "complex-junction-v1";
|
||||||
if (template !== "cross-cluster-v1" && template !== "complex-junction-v1") throw new Error(`nativeRoad.junctionTemplates.clusters[${index}].template must be \"cross-cluster-v1\" or \"complex-junction-v1\"`);
|
if (template !== "cross-cluster-v1" && template !== "complex-junction-v1") throw new Error(`nativeRoad.junctionTemplates.clusters[${index}].template must be \"cross-cluster-v1\" or \"complex-junction-v1\"`);
|
||||||
const referenceFile = item.referenceFile ? path.resolve(item.referenceFile) : null;
|
const referenceFile = item.referenceFile ? path.resolve(configDir, item.referenceFile) : null;
|
||||||
const approachWidthMultiplier = numberOption(item.approachWidthMultiplier, 1.45, `nativeRoad.junctionTemplates.clusters[${index}].approachWidthMultiplier`, 1, 1.8);
|
const approachWidthMultiplier = numberOption(item.approachWidthMultiplier, 1.45, `nativeRoad.junctionTemplates.clusters[${index}].approachWidthMultiplier`, 1, 1.8);
|
||||||
const approachLengthMeters = numberOption(item.approachLengthMeters, 32, `nativeRoad.junctionTemplates.clusters[${index}].approachLengthMeters`, 10, 50);
|
const approachLengthMeters = numberOption(item.approachLengthMeters, 32, `nativeRoad.junctionTemplates.clusters[${index}].approachLengthMeters`, 10, 50);
|
||||||
const coreRadiusMeters = numberOption(item.coreRadiusMeters, 28, `nativeRoad.junctionTemplates.clusters[${index}].coreRadiusMeters`, 12, 80);
|
const coreRadiusMeters = numberOption(item.coreRadiusMeters, 28, `nativeRoad.junctionTemplates.clusters[${index}].coreRadiusMeters`, 12, 80);
|
||||||
@@ -272,6 +271,7 @@ function booleanOption(value, fallback, label) {
|
|||||||
throw new Error(`${label} must be boolean`);
|
throw new Error(`${label} must be boolean`);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
normalizeAreaConfig,
|
normalizeAreaConfig,
|
||||||
readAreaConfig,
|
readAreaConfig,
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
const path = require("path");
|
const path = require("path");
|
||||||
const { readAreaConfig } = require("./area-config");
|
const { readAreaConfig } = require("./area-config");
|
||||||
|
const { importNativeRoadPackage } = require("./native-road-package");
|
||||||
const {
|
const {
|
||||||
SCENE_LAYERS,
|
SCENE_LAYERS,
|
||||||
SCENE_FILE,
|
SCENE_FILE,
|
||||||
@@ -324,6 +325,11 @@ function addEndpoint(map, ref) {
|
|||||||
|
|
||||||
function artifactStatus(area) {
|
function artifactStatus(area) {
|
||||||
const native = area.blender.roadProvider === "native";
|
const native = area.blender.roadProvider === "native";
|
||||||
|
let nativePackage = null;
|
||||||
|
let nativePackageError = null;
|
||||||
|
if (native) {
|
||||||
|
try { nativePackage = importNativeRoadPackage(area); } catch (error) { nativePackageError = error.message; }
|
||||||
|
}
|
||||||
const entries = [
|
const entries = [
|
||||||
...(native ? [] : [
|
...(native ? [] : [
|
||||||
["GeoJSON dir", area.outputs.geojsonDir, true, "dir"],
|
["GeoJSON dir", area.outputs.geojsonDir, true, "dir"],
|
||||||
@@ -332,15 +338,16 @@ function artifactStatus(area) {
|
|||||||
["QGIS preview", area.outputs.qgisPreview, true, "file"],
|
["QGIS preview", area.outputs.qgisPreview, true, "file"],
|
||||||
["Traffic signal assemblies", area.outputs.trafficSignalAssemblies, true, "file"],
|
["Traffic signal assemblies", area.outputs.trafficSignalAssemblies, true, "file"],
|
||||||
]),
|
]),
|
||||||
["Native road directory", area.outputs.nativeRoadDir, native, "dir"],
|
["Native road ZIP", area.nativeRoadPackage, native, "file"],
|
||||||
["Traffic signal runtime", native ? path.join(area.outputs.nativeRoadDir, "traffic-signals.json") : area.outputs.packageTrafficSignals, true, "file"],
|
["Native road import", nativePackage?.rootDir || path.join(area.outputs.pipelineDir, "native-road-import"), native, "dir"],
|
||||||
|
["Traffic signal runtime", native ? path.join(nativePackage?.rootDir || "", "traffic-signals.json") : area.outputs.packageTrafficSignals, true, "file"],
|
||||||
["Blend scene", area.outputs.blend, true, "file"],
|
["Blend scene", area.outputs.blend, true, "file"],
|
||||||
["Render PNG", area.outputs.render, true, "file"],
|
["Render PNG", area.outputs.render, true, "file"],
|
||||||
["Package manifest", area.outputs.packageManifest, true, "file"],
|
["Package manifest", area.outputs.packageManifest, true, "file"],
|
||||||
["Package primary GLB", area.outputs.packagePrimaryGlb, true, "file"],
|
["Package primary GLB", area.outputs.packagePrimaryGlb, true, "file"],
|
||||||
["Cesium preview", area.outputs.cesiumPreview, true, "file"],
|
["Cesium preview", area.outputs.cesiumPreview, true, "file"],
|
||||||
];
|
];
|
||||||
return entries.map(([label, file, expected, type]) => {
|
const result = entries.map(([label, file, expected, type]) => {
|
||||||
const exists = fs.existsSync(file);
|
const exists = fs.existsSync(file);
|
||||||
const stat = exists ? fs.statSync(file) : null;
|
const stat = exists ? fs.statSync(file) : null;
|
||||||
const validType = !exists || (type === "dir" ? stat.isDirectory() : stat.isFile());
|
const validType = !exists || (type === "dir" ? stat.isDirectory() : stat.isFile());
|
||||||
@@ -358,6 +365,8 @@ function artifactStatus(area) {
|
|||||||
geojsonFiles,
|
geojsonFiles,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
if (nativePackageError) result.push({ label: "Native road ZIP validation", path: area.nativeRoadPackage, expected: true, type: "file", exists: false, validType: false, error: nativePackageError });
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
function metadataSummary(file, warnings) {
|
function metadataSummary(file, warnings) {
|
||||||
@@ -378,6 +387,10 @@ function metadataSummary(file, warnings) {
|
|||||||
|
|
||||||
function stageManifestStatus(area, configPath = null) {
|
function stageManifestStatus(area, configPath = null) {
|
||||||
const native = area.blender.roadProvider === "native";
|
const native = area.blender.roadProvider === "native";
|
||||||
|
let nativePackage = null;
|
||||||
|
if (native) {
|
||||||
|
try { nativePackage = importNativeRoadPackage(area); } catch (_) { /* artifact status reports the validation failure */ }
|
||||||
|
}
|
||||||
const compressionComplete = fs.existsSync(stageManifestPath(area, "compress"));
|
const compressionComplete = fs.existsSync(stageManifestPath(area, "compress"));
|
||||||
const reimportManifest = stageManifestPath(area, "reimport");
|
const reimportManifest = stageManifestPath(area, "reimport");
|
||||||
const hasReimportManifest = fs.existsSync(reimportManifest);
|
const hasReimportManifest = fs.existsSync(reimportManifest);
|
||||||
@@ -435,7 +448,7 @@ function stageManifestStatus(area, configPath = null) {
|
|||||||
inputs: {
|
inputs: {
|
||||||
...(configPath ? { config: configPath } : {}),
|
...(configPath ? { config: configPath } : {}),
|
||||||
osm: area.input,
|
osm: area.input,
|
||||||
...(native ? nativeRoadRecords(area) : {
|
...(native && nativePackage ? nativeRoadRecords(nativePackage) : {
|
||||||
geojsonDir: area.outputs.geojsonDir,
|
geojsonDir: area.outputs.geojsonDir,
|
||||||
...sceneGeojsonFiles(area),
|
...sceneGeojsonFiles(area),
|
||||||
trafficSignalAssemblies: area.outputs.trafficSignalAssemblies,
|
trafficSignalAssemblies: area.outputs.trafficSignalAssemblies,
|
||||||
@@ -468,18 +481,16 @@ function stageManifestStatus(area, configPath = null) {
|
|||||||
glb: area.outputs.glb,
|
glb: area.outputs.glb,
|
||||||
metadata: area.outputs.metadata,
|
metadata: area.outputs.metadata,
|
||||||
}),
|
}),
|
||||||
...(native ? nativeRoadRecords(area) : {
|
...(native && nativePackage ? nativeRoadRecords(nativePackage) : {
|
||||||
lanePolygons: path.join(area.outputs.geojsonDir, "lane_polygons.geojson"),
|
lanePolygons: path.join(area.outputs.geojsonDir, "lane_polygons.geojson"),
|
||||||
network: path.join(area.outputs.geojsonDir, "network.json"),
|
network: path.join(area.outputs.geojsonDir, "network.json"),
|
||||||
intersectionSurface: path.join(area.outputs.geojsonDir, "intersection_surface.geojson"),
|
intersectionSurface: path.join(area.outputs.geojsonDir, "intersection_surface.geojson"),
|
||||||
}),
|
}),
|
||||||
...(native ? { trafficSimulation: area.outputs.trafficSimulation } : {}),
|
|
||||||
previewCss: path.join(path.resolve(__dirname, ".."), "lib", "cesium-preview.css"),
|
previewCss: path.join(path.resolve(__dirname, ".."), "lib", "cesium-preview.css"),
|
||||||
previewJs: path.join(path.resolve(__dirname, ".."), "lib", "cesium-preview.js"),
|
previewJs: path.join(path.resolve(__dirname, ".."), "lib", "cesium-preview.js"),
|
||||||
},
|
},
|
||||||
outputs: compressionComplete ? {
|
outputs: compressionComplete ? {
|
||||||
vehicleRoute: native ? optionalExpectedFile(area.outputs.vehicleRoute) : area.outputs.vehicleRoute,
|
vehicleRoute: native ? optionalExpectedFile(area.outputs.vehicleRoute) : area.outputs.vehicleRoute,
|
||||||
...(native ? { trafficSimulation: area.outputs.trafficSimulation } : {}),
|
|
||||||
vehicleModel: area.outputs.vehicleModel,
|
vehicleModel: area.outputs.vehicleModel,
|
||||||
} : {
|
} : {
|
||||||
cesiumPreview: area.outputs.cesiumPreview,
|
cesiumPreview: area.outputs.cesiumPreview,
|
||||||
@@ -609,11 +620,13 @@ function sceneGeojsonFiles(area) {
|
|||||||
return files;
|
return files;
|
||||||
}
|
}
|
||||||
|
|
||||||
function nativeRoadRecords(area) {
|
function nativeRoadRecords(nativePackage) {
|
||||||
const root = path.join(area.outputs.nativeRoadDir, "layers");
|
const root = path.join(nativePackage.rootDir, "layers");
|
||||||
return {
|
return {
|
||||||
nativeRoadCompiled: path.join(area.outputs.nativeRoadDir, "compiled.json"),
|
nativeRoadZip: nativePackage.zipFile,
|
||||||
nativeRoadSignals: path.join(area.outputs.nativeRoadDir, "traffic-signals.json"),
|
nativeRoadImport: nativePackage.rootDir,
|
||||||
|
nativeRoadCompiled: path.join(nativePackage.rootDir, "compiled.json"),
|
||||||
|
nativeRoadSignals: path.join(nativePackage.rootDir, "traffic-signals.json"),
|
||||||
nativeRoadSurface: path.join(root, "road_surface.geojson"),
|
nativeRoadSurface: path.join(root, "road_surface.geojson"),
|
||||||
nativeEdgeLines: path.join(root, "edge_lines.geojson"),
|
nativeEdgeLines: path.join(root, "edge_lines.geojson"),
|
||||||
nativeIntersectionSurface: path.join(root, "intersection_surface.geojson"),
|
nativeIntersectionSurface: path.join(root, "intersection_surface.geojson"),
|
||||||
|
|||||||
@@ -1,474 +0,0 @@
|
|||||||
"use strict";
|
|
||||||
|
|
||||||
const fs = require("fs");
|
|
||||||
const { convertGeoJson, boundsOf } = require("./gaode-junction-reference");
|
|
||||||
const metricsCache = new WeakMap();
|
|
||||||
const CORNER_FILLET_SEGMENTS = 12;
|
|
||||||
// Must match DEFAULT_SIDEWALK_WIDTH_METERS in native-road.js so the corner band
|
|
||||||
// lines up with the straight strips it joins.
|
|
||||||
const SIDEWALK_WIDTH_METERS = 2;
|
|
||||||
// The straight strips are trimmed against the cluster boundary using the road
|
|
||||||
// centerline, so they stop a little beyond the carriageway end. Run the corner
|
|
||||||
// past that end and let the two overlap rather than chase an exact seam.
|
|
||||||
const SIDEWALK_CORNER_OVERRUN_METERS = 6;
|
|
||||||
|
|
||||||
function buildComplexJunctionGeometry(model, cluster, helpers) {
|
|
||||||
const nodeIds = new Set(cluster.nodeIds.map(String));
|
|
||||||
const nodes = cluster.nodeIds.map((id) => helpers.junctionPlans.get(String(id))?.node).filter(Boolean);
|
|
||||||
if (nodes.length < 2) return { features: [], diagnostics: [helpers.diagnostic("warning", `junction-cluster:${cluster.id}`, [...nodeIds], "complex-junction-insufficient-nodes", "复合路口至少需要两个有效节点。", null)] };
|
|
||||||
const center = nodes.reduce((sum, point) => [sum[0] + point[0] / nodes.length, sum[1] + point[1] / nodes.length], [0, 0]);
|
|
||||||
const approaches = [];
|
|
||||||
const carriageways = [];
|
|
||||||
for (const [nodeId, plan] of helpers.junctionPlans) {
|
|
||||||
if (!nodeIds.has(String(nodeId))) continue;
|
|
||||||
for (const approach of plan.approaches) {
|
|
||||||
const endpoint = approach.line.at(-1);
|
|
||||||
if (nodes.some((node) => node !== plan.node && helpers.distanceMeters(endpoint, node) < 4)) continue;
|
|
||||||
const heading = helpers.headingAtEndpoint(approach.line);
|
|
||||||
const length = helpers.lineLengthMeters(approach.line);
|
|
||||||
carriageways.push({ nodeId, approach, plan, heading, length });
|
|
||||||
if (approaches.some((item) => Math.abs(normalizeHeading(item.heading - heading)) < 20)) continue;
|
|
||||||
approaches.push({ nodeId, approach, plan, heading, length });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (approaches.length < 3) return { features: [], diagnostics: [helpers.diagnostic("warning", `junction-cluster:${cluster.id}`, [...nodeIds], "complex-junction-insufficient-approaches", "复合路口无法识别足够的外部进口。", center)] };
|
|
||||||
const { calibration, coreRadius } = complexJunctionMetrics(cluster);
|
|
||||||
const sorted = [...approaches].sort((a, b) => a.heading - b.heading);
|
|
||||||
const arms = sorted.map((representative) => ({
|
|
||||||
representative,
|
|
||||||
heading: averageHeading(carriageways.filter((candidate) => Math.abs(normalizeHeading(candidate.heading - representative.heading)) < 20).map((candidate) => candidate.heading)),
|
|
||||||
members: carriageways.filter((candidate) => Math.abs(normalizeHeading(candidate.heading - representative.heading)) < 20),
|
|
||||||
}));
|
|
||||||
const outerRadius = complexJunctionMetrics(cluster).approachOuterRadius;
|
|
||||||
const boundaryParts = [];
|
|
||||||
const crosswalks = [];
|
|
||||||
const stopLines = [];
|
|
||||||
const islands = [];
|
|
||||||
const armCrosswalkRadius = coreRadius * .68;
|
|
||||||
for (const item of carriageways) {
|
|
||||||
const outer = pointOnCarriagewayRadius(item, center, outerRadius, helpers);
|
|
||||||
const inner = pointOnCarriagewayRadius(item, center, coreRadius * .7, helpers);
|
|
||||||
const outerHalf = item.approach.widthMeters / 2;
|
|
||||||
const innerHalf = outerHalf;
|
|
||||||
boundaryParts.push({ item, outer, inner, outerHalf, innerHalf });
|
|
||||||
const incomingRoad = item.approach.roadIds.map((roadId) => model.roads.find((road) => road.id === roadId)).find((road) => String(road?.sourceNodeIds.at(-1)) === String(item.nodeId));
|
|
||||||
if (incomingRoad) {
|
|
||||||
// Keep the stop bar just outside the road crosswalk. The previous fixed
|
|
||||||
// core-radius offset placed it nearly ten metres beyond the crossing.
|
|
||||||
const stopCenter = pointOnCarriagewayRadius(item, center, armCrosswalkRadius + 3, helpers);
|
|
||||||
const ring = [
|
|
||||||
helpers.offsetCoordinate(helpers.offsetCoordinate(stopCenter, item.heading + 90, -outerHalf), item.heading, -.24),
|
|
||||||
helpers.offsetCoordinate(helpers.offsetCoordinate(stopCenter, item.heading + 90, outerHalf), item.heading, -.24),
|
|
||||||
helpers.offsetCoordinate(helpers.offsetCoordinate(stopCenter, item.heading + 90, outerHalf), item.heading, .24),
|
|
||||||
helpers.offsetCoordinate(helpers.offsetCoordinate(stopCenter, item.heading + 90, -outerHalf), item.heading, .24),
|
|
||||||
helpers.offsetCoordinate(helpers.offsetCoordinate(stopCenter, item.heading + 90, -outerHalf), item.heading, -.24),
|
|
||||||
];
|
|
||||||
stopLines.push({ type: "Feature", properties: { native_id: `complex-stop-line:${cluster.id}:${item.approach.segmentId}`, cluster_id: cluster.id, kind: "complex-stop-line", road_id: incomingRoad.id, node_id: item.nodeId, direction: item.heading, provenance: "native-road-complex-junction-stop-line/v1" }, geometry: { type: "Polygon", coordinates: [ring] } });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// The four support lines provide a common corner frame, but each long
|
|
||||||
// crossing remains clipped to its OSM-derived road envelope. Corner islands
|
|
||||||
// fill the remaining frame gaps; crossings must never do that job.
|
|
||||||
for (const arm of arms) {
|
|
||||||
const envelope = armEnvelopeAtRadius(arm, armCrosswalkRadius, center, helpers);
|
|
||||||
if (!envelope) continue;
|
|
||||||
arm.crosswalkFrame = {
|
|
||||||
center: envelope.center,
|
|
||||||
groupDepth: 3.4,
|
|
||||||
supportHeading: normalizeHeading(arm.heading + 90),
|
|
||||||
envelopeWidthMeters: envelope.widthMeters,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
const frameCorners = arms.map((arm, index) => {
|
|
||||||
const next = arms[(index + 1) % arms.length];
|
|
||||||
const delta = positiveHeadingDelta(arm.heading, next.heading);
|
|
||||||
if (delta < 45 || delta > 135 || !arm.crosswalkFrame || !next.crosswalkFrame) return null;
|
|
||||||
return supportLineIntersection(arm.crosswalkFrame, next.crosswalkFrame, center);
|
|
||||||
});
|
|
||||||
for (let index = 0; index < arms.length; index += 1) {
|
|
||||||
const arm = arms[index];
|
|
||||||
if (!arm.crosswalkFrame) continue;
|
|
||||||
const item = arm.representative;
|
|
||||||
const roadEdgeInset = .35;
|
|
||||||
const usableSpan = Math.max(.42, arm.crosswalkFrame.envelopeWidthMeters - roadEdgeInset * 2);
|
|
||||||
const endpoints = [
|
|
||||||
helpers.offsetCoordinate(arm.crosswalkFrame.center, arm.heading + 90, -usableSpan / 2),
|
|
||||||
helpers.offsetCoordinate(arm.crosswalkFrame.center, arm.heading + 90, usableSpan / 2),
|
|
||||||
];
|
|
||||||
const groupDepth = arm.crosswalkFrame.groupDepth;
|
|
||||||
const stripeWidth = .42;
|
|
||||||
const stripeCount = Math.max(6, Math.floor((usableSpan - stripeWidth) / .82) + 1);
|
|
||||||
const stripeSpacing = stripeCount > 1 ? (usableSpan - stripeWidth) / (stripeCount - 1) : 0;
|
|
||||||
arm.crosswalkFrame.center = midpoint(...endpoints);
|
|
||||||
arm.crosswalkFrame.endpoints = endpoints;
|
|
||||||
arm.crosswalkFrame.spanMeters = usableSpan;
|
|
||||||
arm.crosswalkFrame.roadEdgeInsetMeters = roadEdgeInset;
|
|
||||||
for (let stripe = 0; stripe < stripeCount; stripe += 1) {
|
|
||||||
const along = stripeWidth / 2 + stripe * stripeSpacing;
|
|
||||||
const centerPoint = helpers.offsetCoordinate(endpoints[0], bearing(...endpoints), along);
|
|
||||||
const ring = [
|
|
||||||
helpers.offsetCoordinate(helpers.offsetCoordinate(centerPoint, arm.heading, -groupDepth / 2), arm.heading + 90, -stripeWidth / 2),
|
|
||||||
helpers.offsetCoordinate(helpers.offsetCoordinate(centerPoint, arm.heading, groupDepth / 2), arm.heading + 90, -stripeWidth / 2),
|
|
||||||
helpers.offsetCoordinate(helpers.offsetCoordinate(centerPoint, arm.heading, groupDepth / 2), arm.heading + 90, stripeWidth / 2),
|
|
||||||
helpers.offsetCoordinate(helpers.offsetCoordinate(centerPoint, arm.heading, -groupDepth / 2), arm.heading + 90, stripeWidth / 2),
|
|
||||||
helpers.offsetCoordinate(helpers.offsetCoordinate(centerPoint, arm.heading, -groupDepth / 2), arm.heading + 90, -stripeWidth / 2),
|
|
||||||
];
|
|
||||||
crosswalks.push({ type: "Feature", properties: { native_id: `complex-crosswalk:${cluster.id}:${item.nodeId}:${item.approach.segmentId}:${stripe + 1}`, cluster_id: cluster.id, kind: "complex-crosswalk", crossing_node_id: item.nodeId, road_id: item.approach.roadIds[0], direction: arm.heading, radial_distance_m: armCrosswalkRadius, span_m: usableSpan, road_envelope_span_m: arm.crosswalkFrame.envelopeWidthMeters, road_edge_inset_m: roadEdgeInset, group_depth_m: groupDepth, stripe_width_m: stripeWidth, stripe_spacing_m: stripeSpacing, frame_center: arm.crosswalkFrame.center, frame_support_heading: arm.crosswalkFrame.supportHeading, provenance: "native-road-complex-junction-crosswalk/v6-road-clipped" }, geometry: { type: "Polygon", coordinates: [ring] } });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// The four arm groups are the sides of one pedestrian frame. Each diagonal
|
|
||||||
// group is anchored at the intersection of its adjacent side support lines,
|
|
||||||
// so all eight groups stay one composition when the OSM arms are skewed.
|
|
||||||
for (let index = 0; index < arms.length; index += 1) {
|
|
||||||
const first = arms[index];
|
|
||||||
const second = arms[(index + 1) % arms.length];
|
|
||||||
const delta = positiveHeadingDelta(first.heading, second.heading);
|
|
||||||
if (delta < 45 || delta > 135) continue;
|
|
||||||
if (!first.crosswalkFrame || !second.crosswalkFrame) continue;
|
|
||||||
const bisector = normalizeHeading(first.heading + delta / 2);
|
|
||||||
const frameCorner = frameCorners[index];
|
|
||||||
if (!frameCorner) continue;
|
|
||||||
const cornerStripeSpacing = .62;
|
|
||||||
const cornerStripeWidth = .4;
|
|
||||||
const cornerGroupHalfDepth = (5 * cornerStripeSpacing + cornerStripeWidth) / 2;
|
|
||||||
const endpointForCorner = (arm) => [...arm.crosswalkFrame.endpoints].sort((a, b) => helpers.distanceMeters(a, frameCorner) - helpers.distanceMeters(b, frameCorner))[0];
|
|
||||||
const outerEdgeAtCorner = (arm) => {
|
|
||||||
const endpoint = endpointForCorner(arm);
|
|
||||||
return [arm.heading, arm.heading + 180]
|
|
||||||
.map((heading) => helpers.offsetCoordinate(endpoint, heading, arm.crosswalkFrame.groupDepth / 2))
|
|
||||||
.sort((a, b) => directionalProjectionMeters(center, b, bisector) - directionalProjectionMeters(center, a, bisector))[0];
|
|
||||||
};
|
|
||||||
const islandBaseGap = .05;
|
|
||||||
const islandApexOffset = 1.5;
|
|
||||||
const islandBase = [outerEdgeAtCorner(first), outerEdgeAtCorner(second)].map((point) => helpers.offsetCoordinate(point, bisector, islandBaseGap));
|
|
||||||
const islandApex = helpers.offsetCoordinate(frameCorner, bisector, islandApexOffset);
|
|
||||||
const islandCrossingClearance = .2;
|
|
||||||
const cornerCrossingOffset = islandApexOffset + islandCrossingClearance + cornerGroupHalfDepth;
|
|
||||||
const islandInnerRadius = Math.min(...islandBase.map((point) => directionalProjectionMeters(center, point, bisector)));
|
|
||||||
const islandOuterRadius = directionalProjectionMeters(center, islandApex, bisector);
|
|
||||||
const cornerCrossingCenter = helpers.offsetCoordinate(frameCorner, bisector, cornerCrossingOffset);
|
|
||||||
const islandRing = roundedPolygonRing([islandBase[0], islandApex, islandBase[1]], .24);
|
|
||||||
islands.push({ type: "Feature", properties: { native_id: `complex-corner-island:${cluster.id}:${index + 1}`, cluster_id: cluster.id, kind: "complex-corner-island", corner_index: index + 1, from_heading: first.heading, to_heading: second.heading, frame_corner: frameCorner, base_points: islandBase, apex_point: islandApex, inner_radius_m: islandInnerRadius, outer_radius_m: islandOuterRadius, base_width_m: helpers.distanceMeters(...islandBase), crossing_clearance_m: islandCrossingClearance, corner_rounding_ratio: .24, provenance: "native-road-complex-junction-corner/v7-road-gap-fill" }, geometry: { type: "Polygon", coordinates: [islandRing] } });
|
|
||||||
|
|
||||||
let cornerCrossingHalfSpan = .4;
|
|
||||||
for (let stripe = 0; stripe < 6; stripe += 1) {
|
|
||||||
const stripeOffset = (stripe - 2.5) * cornerStripeSpacing;
|
|
||||||
const stripeCenter = helpers.offsetCoordinate(cornerCrossingCenter, bisector, stripeOffset);
|
|
||||||
const stripeRadius = directionalProjectionMeters(center, stripeCenter, bisector);
|
|
||||||
const curbPair = limitedCornerPair(first, second, stripeRadius, bisector, center, 6.5, helpers);
|
|
||||||
if (!curbPair) continue;
|
|
||||||
const halfSpan = Math.max(.4, Math.min(6.5, helpers.distanceMeters(...curbPair)) / 2);
|
|
||||||
cornerCrossingHalfSpan = Math.max(cornerCrossingHalfSpan, halfSpan);
|
|
||||||
const stripePair = [
|
|
||||||
helpers.offsetCoordinate(stripeCenter, bisector - 90, halfSpan),
|
|
||||||
helpers.offsetCoordinate(stripeCenter, bisector + 90, halfSpan),
|
|
||||||
];
|
|
||||||
const ring = [
|
|
||||||
helpers.offsetCoordinate(stripePair[0], bisector, -cornerStripeWidth / 2),
|
|
||||||
helpers.offsetCoordinate(stripePair[1], bisector, -cornerStripeWidth / 2),
|
|
||||||
helpers.offsetCoordinate(stripePair[1], bisector, cornerStripeWidth / 2),
|
|
||||||
helpers.offsetCoordinate(stripePair[0], bisector, cornerStripeWidth / 2),
|
|
||||||
helpers.offsetCoordinate(stripePair[0], bisector, -cornerStripeWidth / 2),
|
|
||||||
];
|
|
||||||
crosswalks.push({ type: "Feature", properties: { native_id: `complex-corner-crosswalk:${cluster.id}:${index + 1}:${stripe + 1}`, cluster_id: cluster.id, kind: "complex-corner-crosswalk", corner_index: index + 1, direction: bisector, radial_distance_m: stripeRadius, frame_corner: frameCorner, from_heading: first.heading, to_heading: second.heading, provenance: "native-road-complex-junction-corner-crosswalk/v3" }, geometry: { type: "Polygon", coordinates: [ring] } });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Each carriageway ends in its own rectangle, so adjacent arms meet at a
|
|
||||||
// sharp notch instead of a curb. A real corner is one tangent-continuous
|
|
||||||
// sweep between the two outermost road edges, so fit a fixed-radius fillet
|
|
||||||
// into the wedge those edges form and fill the sector behind it.
|
|
||||||
const cornerFills = [];
|
|
||||||
const sidewalkCorners = [];
|
|
||||||
const cornerDiagnostics = [];
|
|
||||||
const cornerRadius = Math.max(4, Math.min(25, Number(cluster.cornerRadiusMeters) || 12));
|
|
||||||
for (let index = 0; index < arms.length; index += 1) {
|
|
||||||
const first = arms[index];
|
|
||||||
const second = arms[(index + 1) % arms.length];
|
|
||||||
const delta = positiveHeadingDelta(first.heading, second.heading);
|
|
||||||
if (delta < 45 || delta > 135) continue;
|
|
||||||
const bisector = normalizeHeading(first.heading + delta / 2);
|
|
||||||
const edges = [first, second].map((arm) => cornerEdgeAt(arm, coreRadius + 6, bisector, center, helpers));
|
|
||||||
if (!edges.every(Boolean)) continue;
|
|
||||||
const apex = rayIntersection(edges[0], edges[1], center);
|
|
||||||
const apexReach = apex ? directionalProjectionMeters(center, apex, bisector) : null;
|
|
||||||
// The wedge apex has to sit ahead of the core and inside the arm handoff;
|
|
||||||
// outside that band the two edges are near parallel and any fillet fitted
|
|
||||||
// to them would sweep across the carriageways instead of the corner.
|
|
||||||
if (apexReach === null || apexReach < 1 || apexReach > outerRadius) {
|
|
||||||
cornerDiagnostics.push(helpers.diagnostic("warning", `junction-cluster:${cluster.id}`, [...nodeIds], "complex-junction-corner-fillet-fallback", "该夹角的道路边缘切线无法安全构造圆角,已保留直角过渡。", center));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
// Tangent distance for a circle of `cornerRadius` inscribed in a wedge of
|
|
||||||
// opening `delta`, clamped so the tangent points stay on the built arms.
|
|
||||||
const tangentDistance = Math.min(cornerRadius / Math.tan(delta * Math.PI / 360), Math.max(2, outerRadius - apexReach));
|
|
||||||
const tangents = edges.map((edge) => helpers.offsetCoordinate(apex, edge.heading, tangentDistance));
|
|
||||||
const curve = quadraticCurve(tangents[0], apex, tangents[1], CORNER_FILLET_SEGMENTS);
|
|
||||||
const ring = [...curve, center, curve[0]];
|
|
||||||
if (!ring.every((point) => point.every(Number.isFinite))) continue;
|
|
||||||
cornerFills.push({ type: "Feature", properties: { native_id: `complex-corner-fillet:${cluster.id}:${index + 1}`, cluster_id: cluster.id, kind: "complex-corner-fillet", complex_part: "corner-fillet", corner_index: index + 1, from_heading: first.heading, to_heading: second.heading, bisector_heading: bisector, corner_radius_m: cornerRadius, tangent_distance_m: Math.round(tangentDistance * 100) / 100, apex_reach_m: Math.round(apexReach * 100) / 100, provenance: "native-road-complex-junction-corner-fillet/v1" }, geometry: { type: "Polygon", coordinates: [ring] } });
|
|
||||||
|
|
||||||
// The straight pedestrian strips are trimmed at the cluster boundary, so
|
|
||||||
// two arms that both carry a footway still meet as two loose ends across
|
|
||||||
// an empty wedge. Bridge them along the curb the fillet already defines.
|
|
||||||
// The corner faces clockwise from `first` and counter-clockwise from
|
|
||||||
// `second`, so each arm must carry the footway on that facing side.
|
|
||||||
if (!armCarriesSidewalk(first, model, true) || !armCarriesSidewalk(second, model, false)) continue;
|
|
||||||
const curb = [
|
|
||||||
...edgeRunToRadius(apex, edges[0], tangentDistance, outerRadius + SIDEWALK_CORNER_OVERRUN_METERS, center, helpers).reverse(),
|
|
||||||
...curve.slice(1, -1),
|
|
||||||
...edgeRunToRadius(apex, edges[1], tangentDistance, outerRadius + SIDEWALK_CORNER_OVERRUN_METERS, center, helpers),
|
|
||||||
];
|
|
||||||
const outerEdge = offsetPolylineAwayFromCenter(curb, center, SIDEWALK_WIDTH_METERS, helpers);
|
|
||||||
const sidewalkRing = [...curb, ...outerEdge.slice().reverse(), curb[0]];
|
|
||||||
if (!sidewalkRing.every((point) => point.every(Number.isFinite)) || ringSelfIntersects(sidewalkRing)) {
|
|
||||||
cornerDiagnostics.push(helpers.diagnostic("warning", `junction-cluster:${cluster.id}`, [...nodeIds], "complex-junction-sidewalk-corner-fallback", "该夹角的人行道转角几何自交或无效,已跳过,两侧步行带保持断开。", center));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
sidewalkCorners.push({ type: "Feature", properties: { native_id: `complex-sidewalk-corner:${cluster.id}:${index + 1}`, cluster_id: cluster.id, kind: "complex-sidewalk-corner", corner_index: index + 1, from_heading: first.heading, to_heading: second.heading, bisector_heading: bisector, width_m: SIDEWALK_WIDTH_METERS, overrun_m: SIDEWALK_CORNER_OVERRUN_METERS, provenance: "native-road-complex-junction-sidewalk-corner/v1" }, geometry: { type: "Polygon", coordinates: [sidewalkRing] } });
|
|
||||||
}
|
|
||||||
const corePoints = boundaryParts.flatMap(({ item, inner, innerHalf }) => [helpers.offsetCoordinate(inner, item.heading + 90, innerHalf), helpers.offsetCoordinate(inner, item.heading - 90, innerHalf)]).sort((first, second) => angleAround(center, first) - angleAround(center, second));
|
|
||||||
const coreRing = roundedPolygonRing(corePoints, .16);
|
|
||||||
const features = [{ type: "Feature", properties: { native_id: `complex-junction:${cluster.id}:core`, cluster_id: cluster.id, kind: "complex-core", complex_part: "core", center, radius_m: coreRadius, configured_radius_m: cluster.coreRadiusMeters, approach_count: approaches.length, carriageway_count: carriageways.length, approach_headings: sorted.map((item) => Math.round(item.heading * 10) / 10), corner_rounding_ratio: .16, provenance: "native-road-complex-junction/v6-rounded-core" }, geometry: { type: "Polygon", coordinates: [coreRing] } }];
|
|
||||||
for (const { item, outer, inner, outerHalf, innerHalf } of boundaryParts) {
|
|
||||||
const ring = [helpers.offsetCoordinate(outer, item.heading + 90, outerHalf), helpers.offsetCoordinate(inner, item.heading + 90, innerHalf), helpers.offsetCoordinate(inner, item.heading - 90, innerHalf), helpers.offsetCoordinate(outer, item.heading - 90, outerHalf), helpers.offsetCoordinate(outer, item.heading + 90, outerHalf)];
|
|
||||||
features.push({ type: "Feature", properties: { native_id: `complex-junction:${cluster.id}:carriageway:${item.approach.segmentId}`, cluster_id: cluster.id, kind: "complex-approach", complex_part: "carriageway", heading_deg: item.heading, lane_count: item.approach.roadIds.reduce((sum, roadId) => sum + (model.roads.find((road) => road.id === roadId)?.laneCount || 0), 0), width_m: item.approach.widthMeters, provenance: "native-road-complex-junction/v5" }, geometry: { type: "Polygon", coordinates: [ring] } });
|
|
||||||
}
|
|
||||||
// Corner fills come last so they overlay the rectangular carriageway ends
|
|
||||||
// they are smoothing; they never replace an OSM-derived road surface.
|
|
||||||
features.push(...cornerFills);
|
|
||||||
// `coreRadiusMeters` is only consulted when there is no reference geometry.
|
|
||||||
// Under calibration the radius comes from the reference span, so a configured
|
|
||||||
// value that silently does nothing has to be reported, not swallowed.
|
|
||||||
const configuredRadiusIgnored = calibration && Number.isFinite(cluster.coreRadiusMeters) && Math.abs(coreRadius - cluster.coreRadiusMeters) > .5;
|
|
||||||
const configurationDiagnostics = configuredRadiusIgnored
|
|
||||||
? [helpers.diagnostic("info", `junction-cluster:${cluster.id}`, [...nodeIds], "complex-junction-configured-radius-ignored", `已按参考几何校准核心半径为 ${Math.round(coreRadius * 10) / 10} 米,配置的 coreRadiusMeters=${cluster.coreRadiusMeters} 在有参考文件时不生效。`, center)]
|
|
||||||
: [];
|
|
||||||
return { features, islands: [...islands, ...sidewalkCorners], crosswalks, stopLines, center, approaches, diagnostics: [...cornerDiagnostics, ...configurationDiagnostics, helpers.diagnostic("info", `junction-cluster:${cluster.id}`, [...nodeIds], calibration ? "complex-junction-reference-calibrated" : "complex-junction-generated", calibration ? `已使用参考几何校准参数后,由 OSM/native 重新生成 ${approaches.length} 个进口、道路面、中央分隔带、斑马线和停止线。` : `已独立生成 ${approaches.length} 个进口、道路面、中央分隔带、斑马线和停止线。`, center)] };
|
|
||||||
}
|
|
||||||
|
|
||||||
function readReferenceCalibration(cluster) {
|
|
||||||
if (!cluster.referenceFile || !fs.existsSync(cluster.referenceFile)) return null;
|
|
||||||
try {
|
|
||||||
const converted = convertGeoJson(JSON.parse(fs.readFileSync(cluster.referenceFile, "utf8")));
|
|
||||||
const bounds = boundsOf({ features: converted.features.filter((feature) => [1, 2, 3, 4].includes(Number(feature.properties?.type))) });
|
|
||||||
const lonScale = 111320 * Math.cos(((bounds.minLat + bounds.maxLat) / 2) * Math.PI / 180);
|
|
||||||
return { longSpanMeters: (bounds.maxLon - bounds.minLon) * lonScale, shortSpanMeters: (bounds.maxLat - bounds.minLat) * 111320 };
|
|
||||||
} catch (_) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function complexJunctionMetrics(cluster) {
|
|
||||||
if (metricsCache.has(cluster)) return metricsCache.get(cluster);
|
|
||||||
const calibration = readReferenceCalibration(cluster);
|
|
||||||
// Without a reference geometry `coreRadiusMeters` is the only size input the
|
|
||||||
// template has, so honour it literally within the schema's own 12..80 range.
|
|
||||||
// It used to be scaled by .52 and clamped to 17, which silently capped every
|
|
||||||
// unreferenced junction at a core far smaller than its own approach envelope
|
|
||||||
// — a 24 m dual-carriageway arm was being fitted into a 16.6 m core no matter
|
|
||||||
// what the config asked for. The calibrated branch is unchanged.
|
|
||||||
const coreRadius = calibration
|
|
||||||
? Math.max(12, Math.min(24, calibration.shortSpanMeters * .14))
|
|
||||||
: Math.max(12, Math.min(80, Number(cluster.coreRadiusMeters) || 28));
|
|
||||||
const metrics = { calibration, coreRadius, approachOuterRadius: coreRadius + (Number(cluster.outerRadiusExtraMeters) || 18) };
|
|
||||||
metricsCache.set(cluster, metrics);
|
|
||||||
return metrics;
|
|
||||||
}
|
|
||||||
|
|
||||||
function normalizeHeading(value) { return ((value + 180) % 360 + 360) % 360 - 180; }
|
|
||||||
|
|
||||||
// `arm.heading` points outward from the junction, so the corner clockwise from
|
|
||||||
// it sits at heading+90 and the one counter-clockwise at heading-90. A road's
|
|
||||||
// own sidewalk flags are relative to its digitisation direction, so flip them
|
|
||||||
// whenever the arm runs against that direction.
|
|
||||||
function armCarriesSidewalk(arm, model, cornerIsClockwise) {
|
|
||||||
return arm.members.some((member) => member.approach.roadIds
|
|
||||||
.map((roadId) => model.roads.find((road) => road.id === roadId))
|
|
||||||
.filter(Boolean)
|
|
||||||
.some((road) => {
|
|
||||||
const outwardIsForward = String(road.sourceNodeIds[0]) === String(member.nodeId);
|
|
||||||
const onClockwiseSide = outwardIsForward ? road.sidewalkRight : road.sidewalkLeft;
|
|
||||||
const onCounterClockwiseSide = outwardIsForward ? road.sidewalkLeft : road.sidewalkRight;
|
|
||||||
return Boolean(cornerIsClockwise ? onClockwiseSide : onCounterClockwiseSide);
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Walk outward along a wedge edge from its tangent point until the curb reaches
|
|
||||||
// `targetRadius`, so the corner band overlaps the straight strip it joins.
|
|
||||||
function edgeRunToRadius(apex, edge, tangentDistance, targetRadius, center, helpers) {
|
|
||||||
const points = [];
|
|
||||||
for (let extra = 0; extra <= 40; extra += 2) {
|
|
||||||
const point = helpers.offsetCoordinate(apex, edge.heading, tangentDistance + extra);
|
|
||||||
points.push(point);
|
|
||||||
if (helpers.distanceMeters(point, center) >= targetRadius) break;
|
|
||||||
}
|
|
||||||
return points;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Offset each vertex along the polyline normal that increases distance from the
|
|
||||||
// junction centre. The curb is star-shaped around that centre, so "farther from
|
|
||||||
// the centre" is a reliable stand-in for "on the pedestrian side".
|
|
||||||
function offsetPolylineAwayFromCenter(points, center, meters, helpers) {
|
|
||||||
return points.map((point, index) => {
|
|
||||||
const previous = points[Math.max(0, index - 1)];
|
|
||||||
const next = points[Math.min(points.length - 1, index + 1)];
|
|
||||||
const tangent = previous === next ? 0 : bearing(previous, next);
|
|
||||||
return [tangent + 90, tangent - 90]
|
|
||||||
.map((heading) => helpers.offsetCoordinate(point, heading, meters))
|
|
||||||
.sort((first, second) => helpers.distanceMeters(second, center) - helpers.distanceMeters(first, center))[0];
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function ringSelfIntersects(ring) {
|
|
||||||
const cross = (a, b, c) => (b[0] - a[0]) * (c[1] - a[1]) - (b[1] - a[1]) * (c[0] - a[0]);
|
|
||||||
const straddles = (p1, p2, p3, p4) => {
|
|
||||||
const d1 = cross(p3, p4, p1); const d2 = cross(p3, p4, p2);
|
|
||||||
const d3 = cross(p1, p2, p3); const d4 = cross(p1, p2, p4);
|
|
||||||
return ((d1 > 0 && d2 < 0) || (d1 < 0 && d2 > 0)) && ((d3 > 0 && d4 < 0) || (d3 < 0 && d4 > 0));
|
|
||||||
};
|
|
||||||
for (let first = 0; first < ring.length - 1; first += 1) {
|
|
||||||
for (let second = first + 2; second < ring.length - 1; second += 1) {
|
|
||||||
if (first === 0 && second === ring.length - 2) continue;
|
|
||||||
if (straddles(ring[first], ring[first + 1], ring[second], ring[second + 1])) return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
function angleAround(center, point) { return Math.atan2(point[1] - center[1], point[0] - center[0]); }
|
|
||||||
function signedLateralMeters(origin, point, heading) {
|
|
||||||
const east = (point[0] - origin[0]) * 111320 * Math.cos(origin[1] * Math.PI / 180);
|
|
||||||
const north = (point[1] - origin[1]) * 111320;
|
|
||||||
const radians = (heading + 90) * Math.PI / 180;
|
|
||||||
return east * Math.sin(radians) + north * Math.cos(radians);
|
|
||||||
}
|
|
||||||
function bearing(first, second) {
|
|
||||||
const east = (second[0] - first[0]) * Math.cos(first[1] * Math.PI / 180);
|
|
||||||
const north = second[1] - first[1];
|
|
||||||
return Math.atan2(east, north) * 180 / Math.PI;
|
|
||||||
}
|
|
||||||
function midpoint(first, second) { return [(first[0] + second[0]) / 2, (first[1] + second[1]) / 2]; }
|
|
||||||
function averageHeading(headings) {
|
|
||||||
const vector = headings.reduce((sum, heading) => {
|
|
||||||
const radians = heading * Math.PI / 180;
|
|
||||||
return [sum[0] + Math.sin(radians), sum[1] + Math.cos(radians)];
|
|
||||||
}, [0, 0]);
|
|
||||||
return Math.atan2(vector[0], vector[1]) * 180 / Math.PI;
|
|
||||||
}
|
|
||||||
function positiveHeadingDelta(first, second) { return ((second - first) % 360 + 360) % 360; }
|
|
||||||
function pointOnCarriagewayRadius(item, center, radius, helpers) {
|
|
||||||
const start = item.approach.line[0];
|
|
||||||
const startRadius = directionalProjectionMeters(center, start, item.heading);
|
|
||||||
return helpers.pointAlongLine(item.approach.line, Math.max(0, Math.min(item.length, radius - startRadius)));
|
|
||||||
}
|
|
||||||
function armEnvelopeAtRadius(arm, radius, center, helpers) {
|
|
||||||
if (!arm.members.length) return null;
|
|
||||||
const centers = arm.members.map((member) => pointOnCarriagewayRadius(member, center, radius, helpers));
|
|
||||||
const reference = centers[0];
|
|
||||||
let minimum = Infinity;
|
|
||||||
let maximum = -Infinity;
|
|
||||||
centers.forEach((point, index) => {
|
|
||||||
const lateral = signedLateralMeters(reference, point, arm.heading);
|
|
||||||
const halfWidth = arm.members[index].approach.widthMeters / 2;
|
|
||||||
minimum = Math.min(minimum, lateral - halfWidth);
|
|
||||||
maximum = Math.max(maximum, lateral + halfWidth);
|
|
||||||
});
|
|
||||||
if (!Number.isFinite(minimum) || maximum - minimum < 1) return null;
|
|
||||||
return { center: helpers.offsetCoordinate(reference, arm.heading + 90, (minimum + maximum) / 2), widthMeters: maximum - minimum };
|
|
||||||
}
|
|
||||||
function supportLineIntersection(first, second, origin) {
|
|
||||||
const lonScale = 111320 * Math.cos(origin[1] * Math.PI / 180);
|
|
||||||
const toLocal = (point) => [(point[0] - origin[0]) * lonScale, (point[1] - origin[1]) * 111320];
|
|
||||||
const firstPoint = toLocal(first.center);
|
|
||||||
const secondPoint = toLocal(second.center);
|
|
||||||
const direction = (heading) => {
|
|
||||||
const radians = heading * Math.PI / 180;
|
|
||||||
return [Math.sin(radians), Math.cos(radians)];
|
|
||||||
};
|
|
||||||
const firstDirection = direction(first.supportHeading);
|
|
||||||
const secondDirection = direction(second.supportHeading);
|
|
||||||
const denominator = firstDirection[0] * secondDirection[1] - firstDirection[1] * secondDirection[0];
|
|
||||||
if (Math.abs(denominator) < 1e-6) return null;
|
|
||||||
const delta = [secondPoint[0] - firstPoint[0], secondPoint[1] - firstPoint[1]];
|
|
||||||
const distanceAlongFirst = (delta[0] * secondDirection[1] - delta[1] * secondDirection[0]) / denominator;
|
|
||||||
const intersection = [firstPoint[0] + firstDirection[0] * distanceAlongFirst, firstPoint[1] + firstDirection[1] * distanceAlongFirst];
|
|
||||||
return [origin[0] + intersection[0] / lonScale, origin[1] + intersection[1] / 111320];
|
|
||||||
}
|
|
||||||
function limitedCornerPair(first, second, radius, bisector, center, maxWidth, helpers) {
|
|
||||||
const pair = [cornerEdgeAtRadius(first, radius, bisector, center, helpers), cornerEdgeAtRadius(second, radius, bisector, center, helpers)];
|
|
||||||
if (!pair.every(Boolean)) return null;
|
|
||||||
const width = helpers.distanceMeters(pair[0], pair[1]);
|
|
||||||
const middle = midpoint(pair[0], pair[1]);
|
|
||||||
const halfWidth = Math.max(.4, Math.min(width, maxWidth) / 2);
|
|
||||||
const acrossHeading = width > .1 ? bearing(pair[0], pair[1]) : bisector + 90;
|
|
||||||
return [helpers.offsetCoordinate(middle, acrossHeading + 180, halfWidth), helpers.offsetCoordinate(middle, acrossHeading, halfWidth)];
|
|
||||||
}
|
|
||||||
function cornerEdgeAtRadius(arm, radius, bisector, center, helpers) {
|
|
||||||
return cornerEdgeAt(arm, radius, bisector, center, helpers)?.point || null;
|
|
||||||
}
|
|
||||||
function cornerEdgeAt(arm, radius, bisector, center, helpers) {
|
|
||||||
const candidates = arm.members.flatMap((member) => {
|
|
||||||
const point = pointOnCarriagewayRadius(member, center, radius, helpers);
|
|
||||||
const halfWidth = member.approach.widthMeters / 2;
|
|
||||||
return [90, -90].map((side) => ({ point: helpers.offsetCoordinate(point, member.heading + side, halfWidth), heading: member.heading }));
|
|
||||||
});
|
|
||||||
return candidates.sort((first, second) => directionalProjectionMeters(center, second.point, bisector) - directionalProjectionMeters(center, first.point, bisector))[0] || null;
|
|
||||||
}
|
|
||||||
function rayIntersection(first, second, origin) {
|
|
||||||
const lonScale = 111320 * Math.cos(origin[1] * Math.PI / 180);
|
|
||||||
const toLocal = (point) => [(point[0] - origin[0]) * lonScale, (point[1] - origin[1]) * 111320];
|
|
||||||
const direction = (heading) => {
|
|
||||||
const radians = heading * Math.PI / 180;
|
|
||||||
return [Math.sin(radians), Math.cos(radians)];
|
|
||||||
};
|
|
||||||
const firstPoint = toLocal(first.point);
|
|
||||||
const secondPoint = toLocal(second.point);
|
|
||||||
const firstDirection = direction(first.heading);
|
|
||||||
const secondDirection = direction(second.heading);
|
|
||||||
const denominator = firstDirection[0] * secondDirection[1] - firstDirection[1] * secondDirection[0];
|
|
||||||
if (Math.abs(denominator) < 1e-4) return null;
|
|
||||||
const delta = [secondPoint[0] - firstPoint[0], secondPoint[1] - firstPoint[1]];
|
|
||||||
const distanceAlongFirst = (delta[0] * secondDirection[1] - delta[1] * secondDirection[0]) / denominator;
|
|
||||||
const local = [firstPoint[0] + firstDirection[0] * distanceAlongFirst, firstPoint[1] + firstDirection[1] * distanceAlongFirst];
|
|
||||||
if (!local.every(Number.isFinite)) return null;
|
|
||||||
return [origin[0] + local[0] / lonScale, origin[1] + local[1] / 111320];
|
|
||||||
}
|
|
||||||
function quadraticCurve(start, control, end, segments) {
|
|
||||||
const result = [];
|
|
||||||
for (let index = 0; index <= segments; index += 1) {
|
|
||||||
const t = index / segments;
|
|
||||||
const u = 1 - t;
|
|
||||||
result.push([u * u * start[0] + 2 * u * t * control[0] + t * t * end[0], u * u * start[1] + 2 * u * t * control[1] + t * t * end[1]]);
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
function directionalProjectionMeters(origin, point, heading) {
|
|
||||||
const east = (point[0] - origin[0]) * 111320 * Math.cos(origin[1] * Math.PI / 180);
|
|
||||||
const north = (point[1] - origin[1]) * 111320;
|
|
||||||
const radians = heading * Math.PI / 180;
|
|
||||||
return east * Math.sin(radians) + north * Math.cos(radians);
|
|
||||||
}
|
|
||||||
function smoothClosedRing(vertices) {
|
|
||||||
// Curb-edge candidates can arrive in opposite winding orders when an OSM
|
|
||||||
// carriageway bends slightly. Sort this local corner only around its own
|
|
||||||
// centroid before rounding, avoiding a self-crossing safety island while
|
|
||||||
// keeping the global junction boundary fully OSM-driven.
|
|
||||||
const centroid = vertices.reduce((sum, point) => [sum[0] + point[0] / vertices.length, sum[1] + point[1] / vertices.length], [0, 0]);
|
|
||||||
const ordered = [...vertices].sort((first, second) => Math.atan2(first[1] - centroid[1], first[0] - centroid[0]) - Math.atan2(second[1] - centroid[1], second[0] - centroid[0]));
|
|
||||||
const points = ordered.flatMap((point, index) => {
|
|
||||||
const next = ordered[(index + 1) % ordered.length];
|
|
||||||
return [interpolateCoordinate(point, next, .18), interpolateCoordinate(point, next, .82)];
|
|
||||||
});
|
|
||||||
return [...points, points[0]];
|
|
||||||
}
|
|
||||||
function roundedPolygonRing(vertices, ratio) {
|
|
||||||
const points = vertices.flatMap((point, index) => {
|
|
||||||
const previous = vertices[(index - 1 + vertices.length) % vertices.length];
|
|
||||||
const next = vertices[(index + 1) % vertices.length];
|
|
||||||
return [interpolateCoordinate(previous, point, 1 - ratio), interpolateCoordinate(point, next, ratio)];
|
|
||||||
});
|
|
||||||
return [...points, points[0]];
|
|
||||||
}
|
|
||||||
function interpolateCoordinate(first, second, ratio) { return [first[0] + (second[0] - first[0]) * ratio, first[1] + (second[1] - first[1]) * ratio]; }
|
|
||||||
|
|
||||||
module.exports = { buildComplexJunctionGeometry, complexJunctionMetrics };
|
|
||||||
@@ -1,231 +0,0 @@
|
|||||||
"use strict";
|
|
||||||
|
|
||||||
const fs = require("fs");
|
|
||||||
|
|
||||||
const PI = Math.PI;
|
|
||||||
const EARTH_A = 6378245.0;
|
|
||||||
const EARTH_EE = 0.00669342162296594323;
|
|
||||||
|
|
||||||
function transformLat(x, y) {
|
|
||||||
let value = -100 + 2 * x + 3 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x));
|
|
||||||
value += (20 * Math.sin(6 * x * PI) + 20 * Math.sin(2 * x * PI)) * 2 / 3;
|
|
||||||
value += (20 * Math.sin(y * PI) + 40 * Math.sin(y / 3 * PI)) * 2 / 3;
|
|
||||||
value += (160 * Math.sin(y / 12 * PI) + 320 * Math.sin(y * PI / 30)) * 2 / 3;
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
function transformLon(x, y) {
|
|
||||||
let value = 300 + x + 2 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x));
|
|
||||||
value += (20 * Math.sin(6 * x * PI) + 20 * Math.sin(2 * x * PI)) * 2 / 3;
|
|
||||||
value += (20 * Math.sin(x * PI) + 40 * Math.sin(x / 3 * PI)) * 2 / 3;
|
|
||||||
value += (150 * Math.sin(x / 12 * PI) + 300 * Math.sin(x / 30 * PI)) * 2 / 3;
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
// This is the standard local inverse approximation used for GCJ-02 reference
|
|
||||||
// data. It is intentionally kept separate from native road geometry, whose
|
|
||||||
// source coordinates remain WGS84.
|
|
||||||
function gcj02ToWgs84(coordinate) {
|
|
||||||
const [longitude, latitude] = coordinate;
|
|
||||||
if (!Number.isFinite(longitude) || !Number.isFinite(latitude)) throw new Error("Reference coordinate must be finite");
|
|
||||||
const dLat = transformLat(longitude - 105, latitude - 35);
|
|
||||||
const dLon = transformLon(longitude - 105, latitude - 35);
|
|
||||||
const radLat = latitude / 180 * PI;
|
|
||||||
const magic = 1 - EARTH_EE * Math.sin(radLat) ** 2;
|
|
||||||
const sqrtMagic = Math.sqrt(magic);
|
|
||||||
return [
|
|
||||||
longitude - dLon * 180 / (EARTH_A / sqrtMagic * Math.cos(radLat) * PI),
|
|
||||||
latitude - dLat * 180 / (EARTH_A * (1 - EARTH_EE) / (magic * sqrtMagic) * PI),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
function mapCoordinates(coordinates, mapper) {
|
|
||||||
if (typeof coordinates[0] === "number") return mapper(coordinates);
|
|
||||||
return coordinates.map((value) => mapCoordinates(value, mapper));
|
|
||||||
}
|
|
||||||
|
|
||||||
function convertGeoJson(document) {
|
|
||||||
if (!document || document.type !== "FeatureCollection" || !Array.isArray(document.features)) {
|
|
||||||
throw new Error("Reference must be a GeoJSON FeatureCollection");
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
...document,
|
|
||||||
crs: undefined,
|
|
||||||
features: document.features.map((feature) => {
|
|
||||||
if (!feature || !feature.geometry || !feature.geometry.coordinates) throw new Error("Reference feature is missing geometry");
|
|
||||||
return { ...feature, geometry: { ...feature.geometry, coordinates: mapCoordinates(feature.geometry.coordinates, gcj02ToWgs84) } };
|
|
||||||
}),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function coordinatesOf(document) {
|
|
||||||
const points = [];
|
|
||||||
for (const feature of document.features || []) walkCoordinates(feature.geometry?.coordinates, points);
|
|
||||||
return points;
|
|
||||||
}
|
|
||||||
|
|
||||||
function walkCoordinates(value, points) {
|
|
||||||
if (!Array.isArray(value) || !value.length) return;
|
|
||||||
if (typeof value[0] === "number") {
|
|
||||||
points.push(value);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
for (const child of value) walkCoordinates(child, points);
|
|
||||||
}
|
|
||||||
|
|
||||||
function boundsOf(document) {
|
|
||||||
const points = coordinatesOf(document);
|
|
||||||
if (!points.length) throw new Error("Reference contains no coordinates");
|
|
||||||
return {
|
|
||||||
minLon: Math.min(...points.map((point) => point[0])),
|
|
||||||
minLat: Math.min(...points.map((point) => point[1])),
|
|
||||||
maxLon: Math.max(...points.map((point) => point[0])),
|
|
||||||
maxLat: Math.max(...points.map((point) => point[1])),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function centerOf(bounds) {
|
|
||||||
return [(bounds.minLon + bounds.maxLon) / 2, (bounds.minLat + bounds.maxLat) / 2];
|
|
||||||
}
|
|
||||||
|
|
||||||
function distanceMeters(first, second) {
|
|
||||||
const lonScale = 111320 * Math.cos(first[1] * PI / 180);
|
|
||||||
return Math.hypot((second[0] - first[0]) * lonScale, (second[1] - first[1]) * 111320);
|
|
||||||
}
|
|
||||||
|
|
||||||
function parseOsmNodes(xml) {
|
|
||||||
const nodes = [];
|
|
||||||
for (const match of xml.matchAll(/<node\b([^>]*?)(?:\/>|>([\s\S]*?)<\/node>)/g)) {
|
|
||||||
const attrs = {};
|
|
||||||
for (const item of match[1].matchAll(/([:\w-]+)\s*=\s*(?:"([^"]*)"|'([^']*)')/g)) attrs[item[1]] = item[2] ?? item[3];
|
|
||||||
if (!attrs.id || !Number.isFinite(Number(attrs.lon)) || !Number.isFinite(Number(attrs.lat))) continue;
|
|
||||||
const tags = {};
|
|
||||||
for (const item of (match[2] || "").matchAll(/<tag\b([^>]*)\/?\s*>/g)) {
|
|
||||||
const tag = {};
|
|
||||||
for (const attr of item[1].matchAll(/([:\w-]+)\s*=\s*(?:"([^"]*)"|'([^']*)')/g)) tag[attr[1]] = attr[2] ?? attr[3];
|
|
||||||
if (tag.k) tags[tag.k] = tag.v || "";
|
|
||||||
}
|
|
||||||
nodes.push({ id: String(attrs.id), coordinate: [Number(attrs.lon), Number(attrs.lat)], tags });
|
|
||||||
}
|
|
||||||
return nodes;
|
|
||||||
}
|
|
||||||
|
|
||||||
function nearestNode(nodes, coordinate, nodeId) {
|
|
||||||
if (nodeId) {
|
|
||||||
const exact = nodes.find((node) => node.id === String(nodeId));
|
|
||||||
if (!exact) throw new Error(`OSM node not found: ${nodeId}`);
|
|
||||||
return { ...exact, distanceMeters: distanceMeters(exact.coordinate, coordinate), match: "node-id" };
|
|
||||||
}
|
|
||||||
const candidates = nodes.map((node) => ({ ...node, distanceMeters: distanceMeters(node.coordinate, coordinate) }));
|
|
||||||
candidates.sort((first, second) => first.distanceMeters - second.distanceMeters);
|
|
||||||
if (!candidates[0]) throw new Error("OSM contains no usable nodes");
|
|
||||||
return { ...candidates[0], match: "nearest-node" };
|
|
||||||
}
|
|
||||||
|
|
||||||
function bboxIntersectionRatio(first, second) {
|
|
||||||
const width = Math.max(0, Math.min(first.maxLon, second.maxLon) - Math.max(first.minLon, second.minLon));
|
|
||||||
const height = Math.max(0, Math.min(first.maxLat, second.maxLat) - Math.max(first.minLat, second.minLat));
|
|
||||||
const intersection = width * height;
|
|
||||||
const firstArea = Math.max(0, first.maxLon - first.minLon) * Math.max(0, first.maxLat - first.minLat);
|
|
||||||
const secondArea = Math.max(0, second.maxLon - second.minLon) * Math.max(0, second.maxLat - second.minLat);
|
|
||||||
return intersection / Math.max(firstArea + secondArea - intersection, Number.EPSILON);
|
|
||||||
}
|
|
||||||
|
|
||||||
// A complex junction is compiled as one cluster of `complex_part` polygons in
|
|
||||||
// road_surface.geojson, not as a per-node feature in intersection_surface.
|
|
||||||
// Match it by cluster id, or by whichever cluster core sits nearest the node.
|
|
||||||
function complexClusterSurface(nativeRoadSurfaceFile, node, clusterId) {
|
|
||||||
if (!nativeRoadSurfaceFile || !fs.existsSync(nativeRoadSurfaceFile)) return null;
|
|
||||||
const surface = JSON.parse(fs.readFileSync(nativeRoadSurfaceFile, "utf8"));
|
|
||||||
const parts = (surface.features || []).filter((item) => item.properties?.cluster_id && item.properties?.complex_part);
|
|
||||||
const cores = parts.filter((item) => item.properties.complex_part === "core" && Array.isArray(item.properties.center));
|
|
||||||
if (!cores.length) return null;
|
|
||||||
const core = clusterId
|
|
||||||
? cores.find((item) => String(item.properties.cluster_id) === String(clusterId))
|
|
||||||
: [...cores].sort((first, second) => distanceMeters(first.properties.center, node.coordinate) - distanceMeters(second.properties.center, node.coordinate))[0];
|
|
||||||
if (!core) return null;
|
|
||||||
const features = parts.filter((item) => item.properties.cluster_id === core.properties.cluster_id);
|
|
||||||
return { clusterId: core.properties.cluster_id, core, features };
|
|
||||||
}
|
|
||||||
|
|
||||||
function inspectReference({ referenceFile, osmFile, nativeIntersectionFile, nativeRoadSurfaceFile, nodeId, clusterId }) {
|
|
||||||
const source = JSON.parse(fs.readFileSync(referenceFile, "utf8"));
|
|
||||||
const converted = convertGeoJson(source);
|
|
||||||
const referenceBounds = boundsOf(converted);
|
|
||||||
const referenceCenter = centerOf(referenceBounds);
|
|
||||||
const nodes = parseOsmNodes(fs.readFileSync(osmFile, "utf8"));
|
|
||||||
const matchedNode = nearestNode(nodes, referenceCenter, nodeId);
|
|
||||||
const native = JSON.parse(fs.readFileSync(nativeIntersectionFile, "utf8"));
|
|
||||||
const feature = (native.features || []).find((item) => item.properties?.osm_node_id === matchedNode.id);
|
|
||||||
const cluster = feature ? null : complexClusterSurface(nativeRoadSurfaceFile, matchedNode, clusterId);
|
|
||||||
const matchedFeatures = feature ? [feature] : cluster?.features || null;
|
|
||||||
const nativeBounds = matchedFeatures ? boundsOf({ features: matchedFeatures }) : null;
|
|
||||||
const diagnostics = [];
|
|
||||||
if (!matchedFeatures) diagnostics.push(nativeRoadSurfaceFile ? "No native intersection surface or complex cluster matched the OSM node" : "No native intersection surface matched the OSM node; pass --native-road-surface to also search complex junction clusters");
|
|
||||||
return {
|
|
||||||
schema: "gaode-junction-reference-comparison/v2",
|
|
||||||
source: { file: referenceFile, coordinateSystem: "GCJ-02", featureCount: converted.features.length },
|
|
||||||
conversion: { target: "WGS84", method: "gcj02-inverse-approximation" },
|
|
||||||
reference: { bounds: referenceBounds, center: referenceCenter },
|
|
||||||
matchedOsmNode: { id: matchedNode.id, coordinate: matchedNode.coordinate, tags: matchedNode.tags, match: matchedNode.match, centerDistanceMeters: matchedNode.distanceMeters },
|
|
||||||
nativeIntersection: nativeBounds ? {
|
|
||||||
kind: feature ? "junction-node" : "complex-cluster",
|
|
||||||
clusterId: cluster?.clusterId || null,
|
|
||||||
featureCount: matchedFeatures.length,
|
|
||||||
bounds: nativeBounds,
|
|
||||||
bboxIoU: bboxIntersectionRatio(referenceBounds, nativeBounds),
|
|
||||||
centerOffsetMeters: distanceMeters(referenceCenter, centerOf(nativeBounds)),
|
|
||||||
featureProperties: feature ? feature.properties : cluster.core.properties,
|
|
||||||
} : null,
|
|
||||||
diagnostics,
|
|
||||||
converted,
|
|
||||||
matchedFeatures,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function localReferenceSvg({ converted, nativeIntersection, center, radiusMeters = 180 }) {
|
|
||||||
const width = 1000;
|
|
||||||
const height = 1000;
|
|
||||||
const lonScale = 111320 * Math.cos(center[1] * PI / 180);
|
|
||||||
const project = (point) => [
|
|
||||||
width / 2 + (point[0] - center[0]) * lonScale * width / (radiusMeters * 2),
|
|
||||||
height / 2 - (point[1] - center[1]) * 111320 * height / (radiusMeters * 2),
|
|
||||||
];
|
|
||||||
const pathFor = (coordinates) => {
|
|
||||||
const parts = [];
|
|
||||||
const appendLine = (line, close) => {
|
|
||||||
if (!line?.length) return;
|
|
||||||
const [firstX, firstY] = project(line[0]);
|
|
||||||
parts.push(`M ${firstX.toFixed(1)} ${firstY.toFixed(1)}`);
|
|
||||||
for (const point of line.slice(1)) {
|
|
||||||
const [x, y] = project(point);
|
|
||||||
parts.push(`L ${x.toFixed(1)} ${y.toFixed(1)}`);
|
|
||||||
}
|
|
||||||
if (close) parts.push("Z");
|
|
||||||
};
|
|
||||||
const visit = (value) => {
|
|
||||||
if (!Array.isArray(value) || !value.length) return;
|
|
||||||
if (typeof value[0] === "number") return;
|
|
||||||
if (typeof value[0][0] === "number") appendLine(value, value.length > 2);
|
|
||||||
else value.forEach(visit);
|
|
||||||
};
|
|
||||||
visit(coordinates);
|
|
||||||
return parts.join(" ");
|
|
||||||
};
|
|
||||||
const color = { 1: "#2563eb", 2: "#0f766e", 3: "#7c3aed", 4: "#ea580c", 5: "#64748b" };
|
|
||||||
const references = converted.features.map((feature) => {
|
|
||||||
const type = feature.properties?.type || "unknown";
|
|
||||||
return `<path d="${pathFor(feature.geometry.coordinates)}" fill="${feature.geometry.type.includes("Polygon") ? `${color[type] || "#334155"}18` : "none"}" stroke="${color[type] || "#334155"}" stroke-width="1.2"/>`;
|
|
||||||
}).join("\n");
|
|
||||||
const nativePaths = (nativeIntersection?.features || []).map((feature) => `<path d="${pathFor(feature.geometry.coordinates)}" fill="#dc262655" stroke="#dc2626" stroke-width="3"/>`).join("\n");
|
|
||||||
return `<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="${width}" height="${height}" viewBox="0 0 ${width} ${height}">
|
|
||||||
<rect width="100%" height="100%" fill="#f8fafc"/>
|
|
||||||
${references}
|
|
||||||
${nativePaths}
|
|
||||||
<circle cx="${width / 2}" cy="${height / 2}" r="5" fill="#111827"/>
|
|
||||||
<text x="20" y="35" font-family="sans-serif" font-size="22" fill="#111827">Gaode reference (type colors) / native intersection (red)</text>
|
|
||||||
</svg>`;
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = { gcj02ToWgs84, convertGeoJson, boundsOf, parseOsmNodes, nearestNode, inspectReference, localReferenceSvg };
|
|
||||||
@@ -1,161 +0,0 @@
|
|||||||
"use strict";
|
|
||||||
|
|
||||||
const EARTH_RADIUS_METERS = 6371008.8;
|
|
||||||
|
|
||||||
function laneCenterline(lane) {
|
|
||||||
const ring = lane?.geometry?.type === "Polygon" ? lane.geometry.coordinates?.[0] : null;
|
|
||||||
if (!Array.isArray(ring) || ring.length < 5 || !sameCoordinate(ring[0], ring.at(-1))) return null;
|
|
||||||
const vertices = ring.slice(0, -1);
|
|
||||||
if (!vertices.every(validCoordinate)) return null;
|
|
||||||
const half = vertices.length / 2;
|
|
||||||
if (!Number.isInteger(half) || half < 2) return null;
|
|
||||||
const centerline = vertices.slice(0, half).map((point, index) => [
|
|
||||||
(point[0] + vertices[vertices.length - 1 - index][0]) / 2,
|
|
||||||
(point[1] + vertices[vertices.length - 1 - index][1]) / 2,
|
|
||||||
]);
|
|
||||||
return polylineLength(centerline) > 0.01 ? centerline : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
function orientPolyline(polyline, reference) {
|
|
||||||
if (!polyline?.length || !reference?.length) return null;
|
|
||||||
const forward = projectedDistanceAlong(reference, polyline.at(-1)) - projectedDistanceAlong(reference, polyline[0]);
|
|
||||||
if (Math.abs(forward) < 0.01) return null;
|
|
||||||
return forward > 0 ? polyline.map(copyCoordinate) : [...polyline].reverse().map(copyCoordinate);
|
|
||||||
}
|
|
||||||
|
|
||||||
function stitchPolylines(polylines, maxGapMeters) {
|
|
||||||
if (!polylines.length) return null;
|
|
||||||
const result = [];
|
|
||||||
for (const polyline of polylines) {
|
|
||||||
if (!polyline?.length) return null;
|
|
||||||
if (result.length && haversineMeters(result.at(-1), polyline[0]) > maxGapMeters) return null;
|
|
||||||
appendCoordinates(result, polyline);
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
function projectedDistanceAlong(polyline, point) {
|
|
||||||
let traversed = 0;
|
|
||||||
let best = { distance: Infinity, along: 0, lateral: 0 };
|
|
||||||
for (let index = 1; index < polyline.length; index += 1) {
|
|
||||||
const start = polyline[index - 1];
|
|
||||||
const end = polyline[index];
|
|
||||||
const meters = metersAt((start[1] + end[1]) / 2);
|
|
||||||
const dx = (end[0] - start[0]) * meters.lon;
|
|
||||||
const dy = (end[1] - start[1]) * meters.lat;
|
|
||||||
const px = (point[0] - start[0]) * meters.lon;
|
|
||||||
const py = (point[1] - start[1]) * meters.lat;
|
|
||||||
const length = Math.hypot(dx, dy);
|
|
||||||
if (length < 0.001) continue;
|
|
||||||
const ratio = Math.max(0, Math.min(1, (px * dx + py * dy) / (length * length)));
|
|
||||||
const offsetX = px - dx * ratio;
|
|
||||||
const offsetY = py - dy * ratio;
|
|
||||||
const distance = Math.hypot(offsetX, offsetY);
|
|
||||||
if (distance < best.distance) {
|
|
||||||
const rightX = dy / length;
|
|
||||||
const rightY = -dx / length;
|
|
||||||
best = {
|
|
||||||
distance,
|
|
||||||
along: traversed + length * ratio,
|
|
||||||
lateral: offsetX * rightX + offsetY * rightY,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
traversed += length;
|
|
||||||
}
|
|
||||||
return best.along;
|
|
||||||
}
|
|
||||||
|
|
||||||
function lateralOffsetFrom(polyline, point) {
|
|
||||||
let best = null;
|
|
||||||
for (let index = 1; index < polyline.length; index += 1) {
|
|
||||||
const start = polyline[index - 1];
|
|
||||||
const end = polyline[index];
|
|
||||||
const meters = metersAt((start[1] + end[1]) / 2);
|
|
||||||
const dx = (end[0] - start[0]) * meters.lon;
|
|
||||||
const dy = (end[1] - start[1]) * meters.lat;
|
|
||||||
const px = (point[0] - start[0]) * meters.lon;
|
|
||||||
const py = (point[1] - start[1]) * meters.lat;
|
|
||||||
const length = Math.hypot(dx, dy);
|
|
||||||
if (length < 0.001) continue;
|
|
||||||
const ratio = Math.max(0, Math.min(1, (px * dx + py * dy) / (length * length)));
|
|
||||||
const offsetX = px - dx * ratio;
|
|
||||||
const offsetY = py - dy * ratio;
|
|
||||||
const distance = Math.hypot(offsetX, offsetY);
|
|
||||||
if (!best || distance < best.distance) {
|
|
||||||
best = { distance, lateral: offsetX * dy / length - offsetY * dx / length };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return best;
|
|
||||||
}
|
|
||||||
|
|
||||||
function polylineMidpoint(polyline) {
|
|
||||||
const target = polylineLength(polyline) / 2;
|
|
||||||
let traversed = 0;
|
|
||||||
for (let index = 1; index < polyline.length; index += 1) {
|
|
||||||
const length = haversineMeters(polyline[index - 1], polyline[index]);
|
|
||||||
if (traversed + length >= target) {
|
|
||||||
const ratio = length ? (target - traversed) / length : 0;
|
|
||||||
return [
|
|
||||||
polyline[index - 1][0] + (polyline[index][0] - polyline[index - 1][0]) * ratio,
|
|
||||||
polyline[index - 1][1] + (polyline[index][1] - polyline[index - 1][1]) * ratio,
|
|
||||||
];
|
|
||||||
}
|
|
||||||
traversed += length;
|
|
||||||
}
|
|
||||||
return polyline.length ? copyCoordinate(polyline.at(-1)) : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
function polylineLength(polyline) {
|
|
||||||
let total = 0;
|
|
||||||
for (let index = 1; index < (polyline?.length || 0); index += 1) {
|
|
||||||
total += haversineMeters(polyline[index - 1], polyline[index]);
|
|
||||||
}
|
|
||||||
return total;
|
|
||||||
}
|
|
||||||
|
|
||||||
function haversineMeters(a, b) {
|
|
||||||
const lat1 = degreesToRadians(a[1]);
|
|
||||||
const lat2 = degreesToRadians(b[1]);
|
|
||||||
const dLat = degreesToRadians(b[1] - a[1]);
|
|
||||||
const dLon = degreesToRadians(b[0] - a[0]);
|
|
||||||
const h = Math.sin(dLat / 2) ** 2 + Math.cos(lat1) * Math.cos(lat2) * Math.sin(dLon / 2) ** 2;
|
|
||||||
return 2 * EARTH_RADIUS_METERS * Math.asin(Math.min(1, Math.sqrt(h)));
|
|
||||||
}
|
|
||||||
|
|
||||||
function appendCoordinates(target, coordinates) {
|
|
||||||
for (const coordinate of coordinates) {
|
|
||||||
if (!sameCoordinate(target.at(-1), coordinate)) target.push(copyCoordinate(coordinate));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function validCoordinate(value) {
|
|
||||||
return Array.isArray(value) && value.length >= 2 && Number.isFinite(value[0]) && Number.isFinite(value[1]);
|
|
||||||
}
|
|
||||||
|
|
||||||
function sameCoordinate(a, b) {
|
|
||||||
return Boolean(a && b && a[0] === b[0] && a[1] === b[1]);
|
|
||||||
}
|
|
||||||
|
|
||||||
function copyCoordinate(coordinate) {
|
|
||||||
return [coordinate[0], coordinate[1]];
|
|
||||||
}
|
|
||||||
|
|
||||||
function metersAt(latitude) {
|
|
||||||
return { lon: 111320 * Math.cos(degreesToRadians(latitude)), lat: 111320 };
|
|
||||||
}
|
|
||||||
|
|
||||||
function degreesToRadians(value) {
|
|
||||||
return value * Math.PI / 180;
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
appendCoordinates,
|
|
||||||
haversineMeters,
|
|
||||||
laneCenterline,
|
|
||||||
lateralOffsetFrom,
|
|
||||||
orientPolyline,
|
|
||||||
polylineLength,
|
|
||||||
polylineMidpoint,
|
|
||||||
projectedDistanceAlong,
|
|
||||||
stitchPolylines,
|
|
||||||
};
|
|
||||||
@@ -19,7 +19,8 @@ const DEFAULT_SETTINGS = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
function buildNativeTrafficSimulation(area, options = {}) {
|
function buildNativeTrafficSimulation(area, options = {}) {
|
||||||
const root = area.outputs.nativeRoadDir;
|
const root = options.nativePackage?.rootDir;
|
||||||
|
if (!root) throw new Error("Native traffic simulation requires an imported native road package");
|
||||||
const compiledPath = path.join(root, "compiled.json");
|
const compiledPath = path.join(root, "compiled.json");
|
||||||
const signalPath = path.join(root, "traffic-signals.json");
|
const signalPath = path.join(root, "traffic-signals.json");
|
||||||
const connectorPath = path.join(root, "layers", "connectors.geojson");
|
const connectorPath = path.join(root, "layers", "connectors.geojson");
|
||||||
|
|||||||
@@ -0,0 +1,87 @@
|
|||||||
|
"use strict";
|
||||||
|
|
||||||
|
const crypto = require("crypto");
|
||||||
|
const fs = require("fs");
|
||||||
|
const path = require("path");
|
||||||
|
const { unzipSync } = require("fflate");
|
||||||
|
|
||||||
|
const CONTRACT = "native-road-package/v1.1";
|
||||||
|
const ROOT_FILES = ["manifest.json", "compiled.json", "diagnostics.json", "comparison.json", "traffic-signal-assemblies.json", "traffic-signals.json"];
|
||||||
|
|
||||||
|
function sha256(file) { return crypto.createHash("sha256").update(fs.readFileSync(file)).digest("hex"); }
|
||||||
|
|
||||||
|
function readCentralEntries(bytes) {
|
||||||
|
const entries = [];
|
||||||
|
for (let i = 0; i + 46 <= bytes.length; i += 1) {
|
||||||
|
if (bytes.readUInt32LE(i) !== 0x02014b50) continue;
|
||||||
|
const nameLength = bytes.readUInt16LE(i + 28);
|
||||||
|
const extraLength = bytes.readUInt16LE(i + 30);
|
||||||
|
const commentLength = bytes.readUInt16LE(i + 32);
|
||||||
|
const name = bytes.subarray(i + 46, i + 46 + nameLength).toString("utf8");
|
||||||
|
const externalAttrs = bytes.readUInt32LE(i + 38);
|
||||||
|
entries.push({ name, externalAttrs, directory: name.endsWith("/") });
|
||||||
|
i += 45 + nameLength + extraLength + commentLength;
|
||||||
|
}
|
||||||
|
if (!entries.length) throw new Error("ZIP central directory is missing");
|
||||||
|
return entries;
|
||||||
|
}
|
||||||
|
|
||||||
|
function validateName(name) {
|
||||||
|
if (!name || path.posix.isAbsolute(name) || name.split("/").includes("..") || name.includes("\\")) throw new Error(`Unsafe ZIP entry path: ${name}`);
|
||||||
|
if (name.startsWith("./") || (name.includes("/") && !name.startsWith("layers/")) || (name.startsWith("layers/") && name.split("/").length !== 2)) throw new Error(`Native road ZIP must be root-flat: ${name}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
function validateManifest(rootDir, areaId) {
|
||||||
|
let manifest;
|
||||||
|
try { manifest = JSON.parse(fs.readFileSync(path.join(rootDir, "manifest.json"), "utf8")); } catch (error) { throw new Error(`Invalid native road manifest: ${error.message}`); }
|
||||||
|
if (!manifest || manifest.contract !== CONTRACT) throw new Error(`Unsupported native road contract: ${manifest?.contract || "missing"}`);
|
||||||
|
if (manifest.areaId !== areaId) throw new Error(`Native road areaId mismatch: expected ${areaId}, got ${manifest.areaId}`);
|
||||||
|
if (!Array.isArray(manifest.layers) || !manifest.layers.length) throw new Error("Native road manifest layers are missing");
|
||||||
|
const declared = new Set();
|
||||||
|
for (const layer of manifest.layers) {
|
||||||
|
if (!layer || typeof layer.source !== "string" || layer.source !== path.posix.basename(layer.source) || declared.has(layer.source)) throw new Error("Invalid native road layer declaration");
|
||||||
|
if (!["surface", "marking", "semantic"].includes(layer.role)) throw new Error(`Invalid native road layer role: ${layer.role}`);
|
||||||
|
if (layer.role !== "semantic" && typeof layer.materialLayer !== "string") throw new Error(`Renderable layer ${layer.source} has no materialLayer`);
|
||||||
|
declared.add(layer.source);
|
||||||
|
}
|
||||||
|
const published = new Set(fs.readdirSync(path.join(rootDir, "layers")).filter((name) => name.endsWith(".geojson")).map((name) => name.slice(0, -8)));
|
||||||
|
if (declared.size !== published.size || [...declared].some((name) => !published.has(name))) throw new Error("Native road manifest/source mismatch");
|
||||||
|
return manifest;
|
||||||
|
}
|
||||||
|
|
||||||
|
function importNativeRoadPackage(area) {
|
||||||
|
const zipFile = area.nativeRoadPackage;
|
||||||
|
if (!zipFile || !fs.existsSync(zipFile) || !fs.statSync(zipFile).isFile()) throw new Error(`Native road ZIP not found: ${zipFile || "missing nativeRoadPackage"}`);
|
||||||
|
const bytes = fs.readFileSync(zipFile);
|
||||||
|
const hash = crypto.createHash("sha256").update(bytes).digest("hex");
|
||||||
|
const entries = readCentralEntries(bytes);
|
||||||
|
const names = new Set();
|
||||||
|
for (const entry of entries) {
|
||||||
|
validateName(entry.name);
|
||||||
|
if (names.has(entry.name)) throw new Error(`Duplicate ZIP entry: ${entry.name}`);
|
||||||
|
names.add(entry.name);
|
||||||
|
const unixMode = entry.externalAttrs >>> 16;
|
||||||
|
if ((unixMode & 0xf000) === 0xa000) throw new Error(`Symbolic links are not allowed: ${entry.name}`);
|
||||||
|
}
|
||||||
|
let files;
|
||||||
|
try { files = unzipSync(bytes); } catch (error) { throw new Error(`Invalid ZIP archive: ${error.message}`); }
|
||||||
|
const expected = new Set([...ROOT_FILES, ...[...names].filter((name) => name.startsWith("layers/") && name.endsWith(".geojson"))]);
|
||||||
|
for (const name of ROOT_FILES) if (!names.has(name)) throw new Error(`Missing native road ZIP entry: ${name}`);
|
||||||
|
for (const name of names) if (!expected.has(name) || (!name.startsWith("layers/") && !ROOT_FILES.includes(name))) throw new Error(`Unexpected native road ZIP entry: ${name}`);
|
||||||
|
const rootDir = path.join(area.outputs.pipelineDir, "native-road-import", hash);
|
||||||
|
if (!fs.existsSync(rootDir)) {
|
||||||
|
fs.mkdirSync(path.join(rootDir, "layers"), { recursive: true });
|
||||||
|
for (const [name, data] of Object.entries(files)) {
|
||||||
|
if (!names.has(name) || name.endsWith("/")) continue;
|
||||||
|
const destination = path.join(rootDir, name);
|
||||||
|
fs.mkdirSync(path.dirname(destination), { recursive: true });
|
||||||
|
fs.writeFileSync(destination, data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const manifest = validateManifest(rootDir, area.id);
|
||||||
|
const records = {};
|
||||||
|
for (const name of names) { const file = path.join(rootDir, name); if (fs.existsSync(file) && fs.statSync(file).isFile()) records[name] = { path: file, bytes: fs.statSync(file).size, sha256: sha256(file) }; }
|
||||||
|
return Object.freeze({ zipFile, zipRecord: { path: zipFile, bytes: bytes.length, sha256: hash }, rootDir, manifest, records });
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { CONTRACT, importNativeRoadPackage };
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -1,49 +0,0 @@
|
|||||||
"use strict";
|
|
||||||
|
|
||||||
const fs = require("fs");
|
|
||||||
const { parseOsm } = require("./osm");
|
|
||||||
const {
|
|
||||||
buildTrafficSignalFeatures,
|
|
||||||
buildTrafficSignalsFromFeatures,
|
|
||||||
validateTrafficSignalFeatures,
|
|
||||||
validateTrafficSignalSourceReferences,
|
|
||||||
} = require("./traffic-signals");
|
|
||||||
|
|
||||||
const SCHEMA = "native-traffic-signals/v1";
|
|
||||||
|
|
||||||
function loadOrGenerate(file, osmText, stopLines, intersections) {
|
|
||||||
if (fs.existsSync(file)) {
|
|
||||||
const document = JSON.parse(fs.readFileSync(file, "utf8"));
|
|
||||||
try {
|
|
||||||
return validateDocument(document, osmText);
|
|
||||||
} catch (error) {
|
|
||||||
// OSM edits can invalidate the stable identities in a document that was
|
|
||||||
// itself generated from OSM. User-authored documents must remain strict.
|
|
||||||
if (document?.provenance === "generated:osm-controls" && isStaleSourceReferenceError(error)) {
|
|
||||||
return generate(osmText, stopLines, intersections);
|
|
||||||
}
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return generate(osmText, stopLines, intersections);
|
|
||||||
}
|
|
||||||
|
|
||||||
function isStaleSourceReferenceError(error) {
|
|
||||||
return error instanceof Error && /^traffic signal feature \d+: (approach_id .* is not present on OSM control|control_id .* is not present in the current OSM)/.test(error.message);
|
|
||||||
}
|
|
||||||
|
|
||||||
function generate(osmText, stopLines, intersections) {
|
|
||||||
const controls = parseOsm(osmText).trafficSignalControls;
|
|
||||||
return { schema: SCHEMA, provenance: "generated:osm-controls", assemblies: buildTrafficSignalFeatures(stopLines, intersections, controls) };
|
|
||||||
}
|
|
||||||
|
|
||||||
function validateDocument(value, osmText) {
|
|
||||||
if (value?.schema !== SCHEMA) throw new Error(`Expected ${SCHEMA} signal document`);
|
|
||||||
const assemblies = validateTrafficSignalFeatures(value.assemblies);
|
|
||||||
if (osmText) validateTrafficSignalSourceReferences(assemblies, parseOsm(osmText).trafficSignalControls);
|
|
||||||
return { schema: SCHEMA, provenance: value.provenance || "native", assemblies };
|
|
||||||
}
|
|
||||||
|
|
||||||
function runtime(document) { return buildTrafficSignalsFromFeatures(document.assemblies); }
|
|
||||||
|
|
||||||
module.exports = { SCHEMA, generate, loadOrGenerate, validateDocument, runtime };
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
"use strict";
|
|
||||||
|
|
||||||
function parseOsm(xml) {
|
|
||||||
const boundsMatch = xml.match(/<bounds\b([^>]*)\/?\s*>/);
|
|
||||||
const boundsAttrs = boundsMatch ? xmlAttrs(boundsMatch[1]) : {};
|
|
||||||
const candidateBounds = {
|
|
||||||
minLon: Number(boundsAttrs.minlon), minLat: Number(boundsAttrs.minlat),
|
|
||||||
maxLon: Number(boundsAttrs.maxlon), maxLat: Number(boundsAttrs.maxlat),
|
|
||||||
};
|
|
||||||
const bounds = Object.values(candidateBounds).every(Number.isFinite) ? candidateBounds : null;
|
|
||||||
const nodes = new Map();
|
|
||||||
const trafficSignalControls = [];
|
|
||||||
const nodePattern = /<node\b([^>]*?)(?:\/>|>([\s\S]*?)<\/node>)/g;
|
|
||||||
for (const match of xml.matchAll(nodePattern)) {
|
|
||||||
const attrs = xmlAttrs(match[1]);
|
|
||||||
if (attrs.action === "delete" || !attrs.id || attrs.lon === undefined || attrs.lat === undefined) continue;
|
|
||||||
const coordinate = [Number(attrs.lon), Number(attrs.lat)];
|
|
||||||
if (!coordinate.every(Number.isFinite)) continue;
|
|
||||||
nodes.set(attrs.id, coordinate);
|
|
||||||
const tags = parseTags(match[2] || "");
|
|
||||||
if (tags.highway === "traffic_signals") {
|
|
||||||
trafficSignalControls.push({ id: attrs.id, longitude: coordinate[0], latitude: coordinate[1], tags });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const ways = [];
|
|
||||||
for (const match of xml.matchAll(/<way\b([^>]*)>([\s\S]*?)<\/way>/g)) {
|
|
||||||
const attrs = xmlAttrs(match[1]);
|
|
||||||
if (attrs.action === "delete") continue;
|
|
||||||
const body = match[2];
|
|
||||||
const refs = [];
|
|
||||||
for (const ndMatch of body.matchAll(/<nd\b([^>]*)\/?\s*>/g)) {
|
|
||||||
const ref = xmlAttrs(ndMatch[1]).ref;
|
|
||||||
if (ref && nodes.has(ref)) refs.push(ref);
|
|
||||||
}
|
|
||||||
if (refs.length >= 2) ways.push({ id: attrs.id || `way-${ways.length + 1}`, refs, tags: parseTags(body) });
|
|
||||||
}
|
|
||||||
for (const control of trafficSignalControls) {
|
|
||||||
const arms = [];
|
|
||||||
for (const way of ways) {
|
|
||||||
if (!isMotorRoad(way.tags)) continue;
|
|
||||||
for (let index = 0; index < way.refs.length; index += 1) {
|
|
||||||
if (way.refs[index] !== control.id) continue;
|
|
||||||
for (const neighborIndex of [index - 1, index + 1]) {
|
|
||||||
const neighbor = way.refs[neighborIndex];
|
|
||||||
if (!neighbor || !nodes.has(neighbor)) continue;
|
|
||||||
const neighborPoint = nodes.get(neighbor);
|
|
||||||
arms.push({
|
|
||||||
headingDegrees: headingBetween(control, neighborPoint),
|
|
||||||
wayId: String(way.id),
|
|
||||||
neighborNodeId: String(neighbor),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
control.arms = dedupeHeadings(arms);
|
|
||||||
control.junctionType = control.arms.length === 3 ? "T" : control.arms.length === 4 ? "cross" : "other";
|
|
||||||
}
|
|
||||||
return { bounds, nodes, ways, trafficSignalControls };
|
|
||||||
}
|
|
||||||
|
|
||||||
function isMotorRoad(tags) {
|
|
||||||
const highway = tags.highway || "";
|
|
||||||
return highway && tags.area !== "yes" && !new Set([
|
|
||||||
"footway", "path", "pedestrian", "steps", "cycleway", "service", "track",
|
|
||||||
"bridleway", "corridor", "elevator", "platform", "construction",
|
|
||||||
]).has(highway);
|
|
||||||
}
|
|
||||||
|
|
||||||
function headingBetween(from, to) {
|
|
||||||
const latitude = (from.latitude + to[1]) / 2 * Math.PI / 180;
|
|
||||||
return Math.atan2((to[0] - from.longitude) * Math.cos(latitude), to[1] - from.latitude) * 180 / Math.PI;
|
|
||||||
}
|
|
||||||
|
|
||||||
function dedupeHeadings(arms) {
|
|
||||||
const normalized = (value) => ((value % 360) + 360) % 360;
|
|
||||||
const distance = (a, b) => Math.abs(((a - b + 540) % 360) - 180);
|
|
||||||
const result = [];
|
|
||||||
for (const arm of arms) {
|
|
||||||
arm.headingDegrees = normalized(arm.headingDegrees);
|
|
||||||
if (!result.some((other) => distance(other.headingDegrees, arm.headingDegrees) <= 25)) result.push(arm);
|
|
||||||
}
|
|
||||||
return result.sort((a, b) => a.headingDegrees - b.headingDegrees);
|
|
||||||
}
|
|
||||||
|
|
||||||
function xmlAttrs(text) {
|
|
||||||
const attrs = {};
|
|
||||||
for (const match of text.matchAll(/([:\w-]+)\s*=\s*(?:"([^"]*)"|'([^']*)')/g)) {
|
|
||||||
attrs[match[1]] = match[2] !== undefined ? match[2] : match[3];
|
|
||||||
}
|
|
||||||
return attrs;
|
|
||||||
}
|
|
||||||
|
|
||||||
function parseTags(body) {
|
|
||||||
const tags = {};
|
|
||||||
for (const match of body.matchAll(/<tag\b([^>]*)\/?\s*>/g)) {
|
|
||||||
const tag = xmlAttrs(match[1]);
|
|
||||||
if (tag.k) tags[tag.k] = tag.v || "";
|
|
||||||
}
|
|
||||||
return tags;
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = { parseOsm };
|
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
"use strict";
|
||||||
|
|
||||||
|
const fs = require("fs");
|
||||||
|
const path = require("path");
|
||||||
|
const { spawnSync } = require("child_process");
|
||||||
|
const { toRoadCompilerInput } = require("./area-config");
|
||||||
|
|
||||||
|
function compilerCli() {
|
||||||
|
const packageFile = require.resolve("@osm-asset/road-compiler/package.json");
|
||||||
|
const packageRoot = path.dirname(packageFile);
|
||||||
|
const manifest = require(packageFile);
|
||||||
|
return path.join(packageRoot, typeof manifest.bin === "string" ? manifest.bin : manifest.bin["road-compiler"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
function writeInput(area) {
|
||||||
|
const input = toRoadCompilerInput(area);
|
||||||
|
fs.mkdirSync(area.outputs.pipelineDir, { recursive: true });
|
||||||
|
const file = path.join(area.outputs.pipelineDir, "road-compiler.input.json");
|
||||||
|
fs.writeFileSync(file, `${JSON.stringify(input, null, 2)}\n`);
|
||||||
|
return { file, input };
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseCompletionMarker(stdout, input) {
|
||||||
|
const lines = String(stdout).split(/\r?\n/).filter((line) => line.startsWith("NATIVE_ROAD_COMPILE_DONE "));
|
||||||
|
if (lines.length !== 1) throw new Error(`Expected exactly one NATIVE_ROAD_COMPILE_DONE marker, found ${lines.length}`);
|
||||||
|
let marker;
|
||||||
|
try { marker = JSON.parse(lines[0].slice("NATIVE_ROAD_COMPILE_DONE ".length)); }
|
||||||
|
catch (error) { throw new Error(`Invalid NATIVE_ROAD_COMPILE_DONE JSON: ${error.message}`); }
|
||||||
|
if (!marker || typeof marker !== "object") throw new Error("NATIVE_ROAD_COMPILE_DONE payload must be an object");
|
||||||
|
if (marker.areaId !== input.areaId) throw new Error(`NATIVE_ROAD_COMPILE_DONE areaId mismatch: expected ${input.areaId}, got ${marker.areaId}`);
|
||||||
|
if (path.resolve(marker.output || "") !== path.resolve(input.outDir)) throw new Error(`NATIVE_ROAD_COMPILE_DONE output mismatch: expected ${input.outDir}, got ${marker.output}`);
|
||||||
|
return marker;
|
||||||
|
}
|
||||||
|
|
||||||
|
function compileArea(area) {
|
||||||
|
const { file, input } = writeInput(area);
|
||||||
|
const result = spawnSync(process.execPath, [compilerCli(), "--input", file], { encoding: "utf8", stdio: ["ignore", "pipe", "inherit"] });
|
||||||
|
if (result.stdout) process.stdout.write(result.stdout);
|
||||||
|
if (result.error) throw result.error;
|
||||||
|
if (result.status !== 0) {
|
||||||
|
const signal = result.signal ? ` signal=${result.signal}` : "";
|
||||||
|
throw new Error(`Native road compiler failed with status=${result.status}${signal}`);
|
||||||
|
}
|
||||||
|
return parseCompletionMarker(result.stdout, input);
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { compileArea, compilerCli, parseCompletionMarker, writeInput };
|
||||||
@@ -1,240 +1,11 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
const crypto = require("crypto");
|
const { osm: { parseOsm }, trafficSignals } = require("@osm-asset/road-compiler");
|
||||||
const { parseOsm } = require("./osm");
|
|
||||||
|
|
||||||
const EARTH_RADIUS = 6371008.8;
|
|
||||||
const CURB_OFFSET_METERS = 5.2;
|
|
||||||
const MAST_REACH_METERS = 4.5;
|
|
||||||
const SIGNAL_LAYOUT = Object.freeze({
|
|
||||||
poleHeightMeters: 6.7, poleRadiusMeters: 0.13, armWidthMeters: 0.21,
|
|
||||||
mastHeightMeters: 6.25, headCenterHeightMeters: 6.25,
|
|
||||||
headWidthMeters: 0.68, headDepthMeters: 0.30, headBodyHeightMeters: 1.62,
|
|
||||||
lensRadiusMeters: 0.22, lensDepthMeters: 0.07, lensFaceOffsetMeters: 0.18,
|
|
||||||
lensVerticalOffsetsMeters: [0.49, -0.01, -0.51],
|
|
||||||
countdownLateralMeters: 1.15, countdownFaceOffsetMeters: 0.05,
|
|
||||||
countdownWidthMeters: 0.82, countdownDepthMeters: 0.14,
|
|
||||||
countdownHeightMeters: 0.56, countdownVerticalOffsetMeters: 0.0,
|
|
||||||
});
|
|
||||||
|
|
||||||
function buildTrafficSignalFeatures(stopLines, intersections, controls = []) {
|
|
||||||
const centers = (intersections.features || []).map((feature, index) => {
|
|
||||||
const point = polygonCenter(feature.geometry);
|
|
||||||
return { id: `intersection-${index + 1}`, point, radius: polygonRadius(feature.geometry, point) };
|
|
||||||
}).filter((entry) => entry.point);
|
|
||||||
const clusteredStops = new Map();
|
|
||||||
for (const feature of stopLines.features || []) {
|
|
||||||
const clusterId = feature.properties?.cluster_id;
|
|
||||||
const point = polygonCenter(feature.geometry);
|
|
||||||
if (!clusterId || !point) continue;
|
|
||||||
if (!clusteredStops.has(clusterId)) clusteredStops.set(clusterId, []);
|
|
||||||
clusteredStops.get(clusterId).push(point);
|
|
||||||
}
|
|
||||||
for (const [clusterId, points] of clusteredStops) {
|
|
||||||
if (points.length < 3) continue;
|
|
||||||
const point = points.reduce((sum, item) => [sum[0] + item[0] / points.length, sum[1] + item[1] / points.length], [0, 0]);
|
|
||||||
centers.push({ id: `cluster-${clusterId}`, clusterId, point, radius: Math.max(...points.map((item) => metersBetween(point, item))) });
|
|
||||||
}
|
|
||||||
const candidates = [];
|
|
||||||
for (const feature of stopLines.features || []) {
|
|
||||||
const center = polygonCenter(feature.geometry);
|
|
||||||
if (!center) continue;
|
|
||||||
const clusterId = feature.properties?.cluster_id;
|
|
||||||
const intersection = clusterId ? centers.find((entry) => entry.clusterId === clusterId) : nearestCenter(center, centers);
|
|
||||||
if (!intersection || metersBetween(center, intersection.point) > 32) continue;
|
|
||||||
const axis = roadAxis(feature.geometry, center, intersection.point);
|
|
||||||
if (!axis) continue;
|
|
||||||
const right = [axis[1], -axis[0]];
|
|
||||||
candidates.push({
|
|
||||||
intersectionId: intersection.id, center, axis,
|
|
||||||
point: intersection.clusterId
|
|
||||||
? moveMeters(center, right, CURB_OFFSET_METERS)
|
|
||||||
: moveMeters(moveMeters(intersection.point, axis, intersection.radius + 3.2), right, CURB_OFFSET_METERS),
|
|
||||||
headingDegrees: normalizeDegrees(Math.atan2(axis[0], axis[1]) * 180 / Math.PI),
|
|
||||||
matchHeadingDegrees: intersection.clusterId
|
|
||||||
? normalizeDegrees(Math.atan2(-axis[0], -axis[1]) * 180 / Math.PI)
|
|
||||||
: null,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
const features = [];
|
|
||||||
for (const control of controls) {
|
|
||||||
const controlPoint = [Number(control.longitude), Number(control.latitude)];
|
|
||||||
if (!controlPoint.every(Number.isFinite) || !Array.isArray(control.arms) || control.arms.length < 3) continue;
|
|
||||||
const intersection = nearestCenter(controlPoint, centers);
|
|
||||||
if (!intersection || metersBetween(controlPoint, intersection.point) > 32) continue;
|
|
||||||
const arms = matchOsmArms(candidates.filter((item) => item.intersectionId === intersection.id), controlPoint, control.arms);
|
|
||||||
const groups = phaseGroups(arms);
|
|
||||||
arms.forEach((candidate, index) => {
|
|
||||||
const fallbackArmId = `heading-${Math.round(normalizeDegrees(candidate.osmArm?.headingDegrees || 0) * 1000)}`;
|
|
||||||
const sourceWayId = String(candidate.osmArm?.wayId || "legacy");
|
|
||||||
const neighborNodeId = String(candidate.osmArm?.neighborNodeId || fallbackArmId);
|
|
||||||
const approachId = `${sourceWayId}:${neighborNodeId}`;
|
|
||||||
const signalUid = `osm-${String(control.id)}-${sourceWayId}-${neighborNodeId}`;
|
|
||||||
features.push({
|
|
||||||
type: "Feature",
|
|
||||||
geometry: { type: "Point", coordinates: candidate.point.slice() },
|
|
||||||
properties: {
|
|
||||||
signal_uid: signalUid, display_id: signalUid, control_id: String(control.id),
|
|
||||||
approach_id: approachId, source_way_id: sourceWayId,
|
|
||||||
// These are independent assembly controls. heading_deg remains a
|
|
||||||
// migration hint for older native documents only.
|
|
||||||
mast_heading_deg: normalizeDegrees(candidate.headingDegrees - 90),
|
|
||||||
face_heading_deg: normalizeDegrees(candidate.headingDegrees + 180),
|
|
||||||
phase_group: groups[index],
|
|
||||||
mast_reach_m: MAST_REACH_METERS,
|
|
||||||
stop_lon: candidate.center[0], stop_lat: candidate.center[1],
|
|
||||||
enabled: true, z_offset_m: 0,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return validateTrafficSignalFeatures({ type: "FeatureCollection", features });
|
|
||||||
}
|
|
||||||
|
|
||||||
function validateTrafficSignalFeatures(collection) {
|
|
||||||
if (collection?.type !== "FeatureCollection" || !Array.isArray(collection.features)) {
|
|
||||||
throw new Error("Traffic signal assemblies must be a FeatureCollection");
|
|
||||||
}
|
|
||||||
const uids = new Set();
|
|
||||||
const displayIds = new Set();
|
|
||||||
const features = collection.features.map((feature, index) => {
|
|
||||||
const label = `traffic signal feature ${index + 1}`;
|
|
||||||
if (feature?.geometry?.type !== "Point" || !Array.isArray(feature.geometry.coordinates) ||
|
|
||||||
feature.geometry.coordinates.length < 2 || !feature.geometry.coordinates.slice(0, 2).every(Number.isFinite)) {
|
|
||||||
throw new Error(`${label}: geometry must be a finite Point`);
|
|
||||||
}
|
|
||||||
const input = feature.properties || {};
|
|
||||||
const text = (key, required = true) => {
|
|
||||||
const value = input[key] == null ? "" : String(input[key]).trim();
|
|
||||||
if (required && !value) throw new Error(`${label}: missing ${key}`);
|
|
||||||
return value;
|
|
||||||
};
|
|
||||||
const number = (key, options = {}) => {
|
|
||||||
if (input[key] === null || input[key] === undefined || input[key] === "") {
|
|
||||||
throw new Error(`${label}: missing ${key}`);
|
|
||||||
}
|
|
||||||
const value = Number(input[key]);
|
|
||||||
if (!Number.isFinite(value) || (options.min != null && value < options.min) || (options.max != null && value > options.max)) {
|
|
||||||
throw new Error(`${label}: invalid ${key} '${input[key]}'`);
|
|
||||||
}
|
|
||||||
return value;
|
|
||||||
};
|
|
||||||
const signalUid = text("signal_uid");
|
|
||||||
if (!/^osm-[A-Za-z0-9_.:-]+$/.test(signalUid)) throw new Error(`${label}: invalid signal_uid '${signalUid}'`);
|
|
||||||
if (uids.has(signalUid)) throw new Error(`Duplicate signal_uid '${signalUid}'`);
|
|
||||||
uids.add(signalUid);
|
|
||||||
const displayId = text("display_id", false);
|
|
||||||
if (displayId && displayIds.has(displayId)) throw new Error(`Duplicate display_id '${displayId}'`);
|
|
||||||
if (displayId) displayIds.add(displayId);
|
|
||||||
const phaseGroup = number("phase_group", { min: 0, max: 1 });
|
|
||||||
if (!Number.isInteger(phaseGroup)) throw new Error(`${label}: phase_group must be 0 or 1`);
|
|
||||||
const enabled = normalizeBoolean(input.enabled, label);
|
|
||||||
const controlId = text("control_id");
|
|
||||||
const approachId = text("approach_id");
|
|
||||||
const sourceWayId = text("source_way_id");
|
|
||||||
if (!approachId.startsWith(`${sourceWayId}:`)) throw new Error(`${label}: approach_id does not match source_way_id`);
|
|
||||||
const expectedUid = `osm-${controlId}-${approachId.replace(":", "-")}`;
|
|
||||||
if (signalUid !== expectedUid) throw new Error(`${label}: signal_uid does not match source identity (expected '${expectedUid}')`);
|
|
||||||
const legacyHeading = input.heading_deg == null || input.heading_deg === "" ? null : normalizeDegrees(number("heading_deg"));
|
|
||||||
if (legacyHeading == null && (input.mast_heading_deg == null || input.mast_heading_deg === "")) {
|
|
||||||
throw new Error(`${label}: missing mast_heading_deg`);
|
|
||||||
}
|
|
||||||
if (legacyHeading == null && (input.face_heading_deg == null || input.face_heading_deg === "")) {
|
|
||||||
throw new Error(`${label}: missing face_heading_deg`);
|
|
||||||
}
|
|
||||||
const mastHeading = input.mast_heading_deg == null || input.mast_heading_deg === ""
|
|
||||||
? normalizeDegrees((legacyHeading == null ? 0 : legacyHeading) - 90)
|
|
||||||
: normalizeDegrees(number("mast_heading_deg"));
|
|
||||||
const faceHeading = input.face_heading_deg == null || input.face_heading_deg === ""
|
|
||||||
? normalizeDegrees((legacyHeading == null ? 0 : legacyHeading) + 180)
|
|
||||||
: normalizeDegrees(number("face_heading_deg"));
|
|
||||||
return {
|
|
||||||
type: "Feature",
|
|
||||||
geometry: { type: "Point", coordinates: feature.geometry.coordinates.slice(0, 2).map(Number) },
|
|
||||||
properties: {
|
|
||||||
...input, signal_uid: signalUid, display_id: displayId,
|
|
||||||
control_id: controlId, approach_id: approachId,
|
|
||||||
source_way_id: sourceWayId,
|
|
||||||
// Retain the legacy value only for migration compatibility. Runtime
|
|
||||||
// geometry is entirely defined by mast_heading_deg and face_heading_deg.
|
|
||||||
heading_deg: legacyHeading,
|
|
||||||
mast_heading_deg: mastHeading, face_heading_deg: faceHeading,
|
|
||||||
phase_group: phaseGroup, mast_reach_m: number("mast_reach_m", { min: 0.1, max: 30 }),
|
|
||||||
stop_lon: number("stop_lon", { min: -180, max: 180 }),
|
|
||||||
stop_lat: number("stop_lat", { min: -90, max: 90 }),
|
|
||||||
enabled, z_offset_m: number("z_offset_m", { min: -20, max: 100 }),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
});
|
|
||||||
return { type: "FeatureCollection", features };
|
|
||||||
}
|
|
||||||
|
|
||||||
function buildTrafficSignalsFromFeatures(collection) {
|
|
||||||
const normalized = validateTrafficSignalFeatures(collection);
|
|
||||||
const signals = normalized.features.filter((feature) => feature.properties.enabled).map((feature) => {
|
|
||||||
const p = feature.properties;
|
|
||||||
const point = feature.geometry.coordinates;
|
|
||||||
const mastAxis = headingVector(p.mast_heading_deg);
|
|
||||||
return {
|
|
||||||
id: p.signal_uid, signalUid: p.signal_uid, displayId: p.display_id,
|
|
||||||
nodeKey: signalNodeKey(p.signal_uid),
|
|
||||||
controlId: p.control_id, approachId: p.approach_id, sourceWayId: p.source_way_id,
|
|
||||||
phaseGroup: p.phase_group, longitude: point[0], latitude: point[1],
|
|
||||||
stopLongitude: p.stop_lon, stopLatitude: p.stop_lat,
|
|
||||||
// Existing Blender readers require headingDegrees. It is a compatibility
|
|
||||||
// alias only; the independent mast/face fields below define all geometry.
|
|
||||||
headingDegrees: p.heading_deg == null ? p.mast_heading_deg : p.heading_deg,
|
|
||||||
mastHeadingDegrees: p.mast_heading_deg,
|
|
||||||
faceHeadingDegrees: p.face_heading_deg, mastReachMeters: p.mast_reach_m,
|
|
||||||
zOffsetMeters: p.z_offset_m,
|
|
||||||
pose: buildSignalPose(point, mastAxis, p.face_heading_deg, p.mast_reach_m, p.z_offset_m),
|
|
||||||
};
|
|
||||||
});
|
|
||||||
return { version: 3, layout: SIGNAL_LAYOUT, signals };
|
|
||||||
}
|
|
||||||
|
|
||||||
function signalNodeKey(signalUid) {
|
|
||||||
return `ts_${crypto.createHash("sha256").update(signalUid).digest("hex").slice(0, 16)}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function reconcileTrafficSignalSourceReferences(collection, controls) {
|
|
||||||
const normalized = validateTrafficSignalFeatures(collection);
|
|
||||||
const approachesByControl = new Map((controls || []).map((control) => [
|
|
||||||
String(control.id),
|
|
||||||
new Set((control.arms || []).map((arm) => `${String(arm.wayId)}:${String(arm.neighborNodeId)}`)),
|
|
||||||
]));
|
|
||||||
const kept = [];
|
|
||||||
const dropped = [];
|
|
||||||
for (const [index, feature] of normalized.features.entries()) {
|
|
||||||
const { control_id: controlId, approach_id: approachId, signal_uid: signalUid } = feature.properties;
|
|
||||||
const approaches = approachesByControl.get(controlId);
|
|
||||||
if (!approaches) {
|
|
||||||
dropped.push({ index: index + 1, signalUid, controlId, approachId, reason: "missing-control", message: `control_id '${controlId}' is not present in the current OSM` });
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (!approaches.has(approachId)) {
|
|
||||||
dropped.push({ index: index + 1, signalUid, controlId, approachId, reason: "missing-approach", message: `approach_id '${approachId}' is not present on OSM control '${controlId}'` });
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
kept.push(feature);
|
|
||||||
}
|
|
||||||
return { collection: { ...normalized, features: kept }, dropped };
|
|
||||||
}
|
|
||||||
|
|
||||||
function validateTrafficSignalSourceReferences(collection, controls) {
|
|
||||||
const { collection: reconciled, dropped } = reconcileTrafficSignalSourceReferences(collection, controls);
|
|
||||||
if (dropped.length) throw new Error(`traffic signal feature ${dropped[0].index}: ${dropped[0].message}`);
|
|
||||||
return reconciled;
|
|
||||||
}
|
|
||||||
|
|
||||||
function buildTrafficSignals(stopLines, intersections, controls = []) {
|
|
||||||
return buildTrafficSignalsFromFeatures(buildTrafficSignalFeatures(stopLines, intersections, controls));
|
|
||||||
}
|
|
||||||
|
|
||||||
function readTrafficSignalFeatures(stopLinePath, intersectionPath, osmPath) {
|
function readTrafficSignalFeatures(stopLinePath, intersectionPath, osmPath) {
|
||||||
const controls = parseOsm(fs.readFileSync(osmPath, "utf8")).trafficSignalControls;
|
const controls = parseOsm(fs.readFileSync(osmPath, "utf8")).trafficSignalControls;
|
||||||
return buildTrafficSignalFeatures(
|
return trafficSignals.buildTrafficSignalFeatures(
|
||||||
JSON.parse(fs.readFileSync(stopLinePath, "utf8")),
|
JSON.parse(fs.readFileSync(stopLinePath, "utf8")),
|
||||||
JSON.parse(fs.readFileSync(intersectionPath, "utf8")), controls,
|
JSON.parse(fs.readFileSync(intersectionPath, "utf8")), controls,
|
||||||
);
|
);
|
||||||
@@ -244,87 +15,9 @@ function readTrafficSignals(editablePath, osmPath = null) {
|
|||||||
const collection = JSON.parse(fs.readFileSync(editablePath, "utf8"));
|
const collection = JSON.parse(fs.readFileSync(editablePath, "utf8"));
|
||||||
if (osmPath) {
|
if (osmPath) {
|
||||||
const controls = parseOsm(fs.readFileSync(osmPath, "utf8")).trafficSignalControls;
|
const controls = parseOsm(fs.readFileSync(osmPath, "utf8")).trafficSignalControls;
|
||||||
validateTrafficSignalSourceReferences(collection, controls);
|
trafficSignals.validateTrafficSignalSourceReferences(collection, controls);
|
||||||
}
|
}
|
||||||
return buildTrafficSignalsFromFeatures(collection);
|
return trafficSignals.buildTrafficSignalsFromFeatures(collection);
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeBoolean(value, label) {
|
module.exports = { ...trafficSignals, readTrafficSignalFeatures, readTrafficSignals };
|
||||||
if (value === true || value === 1 || value === "1" || String(value).toLowerCase() === "true" || String(value).toLowerCase() === "yes") return true;
|
|
||||||
if (value === false || value === 0 || value === "0" || String(value).toLowerCase() === "false" || String(value).toLowerCase() === "no") return false;
|
|
||||||
throw new Error(`${label}: invalid enabled '${value}'`);
|
|
||||||
}
|
|
||||||
|
|
||||||
function uniqueApproachArms(candidates, controlPoint) {
|
|
||||||
const sorted = candidates.map((candidate) => ({ ...candidate, armHeading: normalizeDegrees(headingBetween(controlPoint, candidate.center)), controlDistance: metersBetween(controlPoint, candidate.center) }))
|
|
||||||
.sort((a, b) => a.armHeading - b.armHeading || a.controlDistance - b.controlDistance);
|
|
||||||
const arms = [];
|
|
||||||
for (const candidate of sorted) if (!arms.some((arm) => angularDistance(arm.armHeading, candidate.armHeading) <= 25)) arms.push(candidate);
|
|
||||||
return arms;
|
|
||||||
}
|
|
||||||
|
|
||||||
function matchOsmArms(candidates, controlPoint, osmArms) {
|
|
||||||
const remaining = candidates.map((candidate) => ({ ...candidate, armHeading: candidate.matchHeadingDegrees ?? normalizeDegrees(headingBetween(controlPoint, candidate.center)) }));
|
|
||||||
if (!osmArms.length) return uniqueApproachArms(remaining, controlPoint);
|
|
||||||
return osmArms.map((osmArm) => {
|
|
||||||
let bestIndex = -1; let bestDistance = Infinity;
|
|
||||||
remaining.forEach((item, index) => {
|
|
||||||
const directedDistance = angularDistance(item.armHeading, osmArm.headingDegrees);
|
|
||||||
const distance = item.matchHeadingDegrees == null
|
|
||||||
? directedDistance
|
|
||||||
: Math.min(
|
|
||||||
angularDistance(item.matchHeadingDegrees, osmArm.headingDegrees),
|
|
||||||
angularDistance(item.matchHeadingDegrees + 180, osmArm.headingDegrees),
|
|
||||||
);
|
|
||||||
if (distance < bestDistance) { bestDistance = distance; bestIndex = index; }
|
|
||||||
});
|
|
||||||
const candidate = bestIndex >= 0 && bestDistance <= 45 ? remaining.splice(bestIndex, 1)[0] : fallbackCandidate(controlPoint, osmArm);
|
|
||||||
return { ...candidate, osmArm };
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function fallbackCandidate(controlPoint, osmArm) {
|
|
||||||
const outward = headingVector(osmArm.headingDegrees); const axis = [-outward[0], -outward[1]];
|
|
||||||
const center = moveMeters(controlPoint, outward, 8); const farSide = moveMeters(controlPoint, axis, 3.2);
|
|
||||||
return { center, axis, point: moveMeters(farSide, [axis[1], -axis[0]], CURB_OFFSET_METERS), armHeading: normalizeDegrees(osmArm.headingDegrees), headingDegrees: normalizeDegrees(Math.atan2(axis[0], axis[1]) * 180 / Math.PI), fallback: true };
|
|
||||||
}
|
|
||||||
|
|
||||||
function phaseGroups(arms) {
|
|
||||||
const groups = Array(arms.length).fill(1); if (arms.length < 2) return groups;
|
|
||||||
let main = [0, 1]; let best = -1;
|
|
||||||
for (let a = 0; a < arms.length; a += 1) for (let b = a + 1; b < arms.length; b += 1) { const opposition = angularDistance(arms[a].armHeading, arms[b].armHeading); if (opposition > best) { best = opposition; main = [a, b]; } }
|
|
||||||
groups[main[0]] = 0; groups[main[1]] = 0; return groups;
|
|
||||||
}
|
|
||||||
|
|
||||||
function buildSignalPose(pole, mastAxis, faceHeadingDegrees, mastReach, zOffset = 0) {
|
|
||||||
const face = headingVector(faceHeadingDegrees);
|
|
||||||
const head = moveMeters(pole, mastAxis, mastReach);
|
|
||||||
const position = (point, height) => ({ longitude: point[0], latitude: point[1], height: height + zOffset });
|
|
||||||
const lensPoint = moveMeters(head, face, SIGNAL_LAYOUT.lensFaceOffsetMeters);
|
|
||||||
const faceRight = [-face[1], face[0]];
|
|
||||||
const board = moveMeters(moveMeters(head, faceRight, SIGNAL_LAYOUT.countdownLateralMeters), face, SIGNAL_LAYOUT.countdownFaceOffsetMeters);
|
|
||||||
return { pole: position(pole, 0), arm: { from: position(pole, SIGNAL_LAYOUT.mastHeightMeters), to: position(head, SIGNAL_LAYOUT.mastHeightMeters) }, head: { ...position(head, SIGNAL_LAYOUT.headCenterHeightMeters), faceHeadingDegrees }, lenses: ["red", "yellow", "green"].map((state, index) => ({ state, ...position(lensPoint, SIGNAL_LAYOUT.headCenterHeightMeters + SIGNAL_LAYOUT.lensVerticalOffsetsMeters[index]) })), countdown: { ...position(board, SIGNAL_LAYOUT.mastHeightMeters), faceHeadingDegrees } };
|
|
||||||
}
|
|
||||||
|
|
||||||
function polygonCenter(geometry) { const ring = geometry?.type === "Polygon" ? geometry.coordinates?.[0] : null; if (!ring || ring.length < 4) return null; const points = ring.slice(0, -1); return [points.reduce((s, p) => s + p[0], 0) / points.length, points.reduce((s, p) => s + p[1], 0) / points.length]; }
|
|
||||||
function polygonRadius(geometry, center) { const ring = geometry?.type === "Polygon" ? geometry.coordinates?.[0] : null; return ring && center ? Math.max(...ring.slice(0, -1).map((point) => metersBetween(center, point)), 0) : 0; }
|
|
||||||
function roadAxis(geometry, center, target) { const ring = geometry?.coordinates?.[0]; if (!ring || ring.length < 3) return null; let longest; for (let i = 0; i < ring.length - 1; i += 1) { const dx = (ring[i + 1][0] - ring[i][0]) * Math.cos(center[1] * Math.PI / 180); const dy = ring[i + 1][1] - ring[i][1]; const length = Math.hypot(dx, dy); if (!longest || length > longest.length) longest = { dx, dy, length }; } if (!longest?.length) return null; let axis = [-longest.dy / longest.length, longest.dx / longest.length]; const toward = [(target[0] - center[0]) * Math.cos(center[1] * Math.PI / 180), target[1] - center[1]]; if (axis[0] * toward[0] + axis[1] * toward[1] < 0) axis = [-axis[0], -axis[1]]; return axis; }
|
|
||||||
function nearestCenter(point, centers) { return centers.map((entry) => ({ ...entry, distance: metersBetween(point, entry.point) })).sort((a, b) => a.distance - b.distance)[0] || null; }
|
|
||||||
function metersBetween(a, b) { const lat = (a[1] + b[1]) / 2 * Math.PI / 180; return Math.hypot((a[0] - b[0]) * Math.cos(lat), a[1] - b[1]) * Math.PI / 180 * EARTH_RADIUS; }
|
|
||||||
function moveMeters(point, vector, meters) { const scale = 180 / Math.PI / EARTH_RADIUS; return [point[0] + vector[0] * meters * scale / Math.cos(point[1] * Math.PI / 180), point[1] + vector[1] * meters * scale]; }
|
|
||||||
function headingBetween(from, to) { const latitude = (from[1] + to[1]) / 2 * Math.PI / 180; return Math.atan2((to[0] - from[0]) * Math.cos(latitude), to[1] - from[1]) * 180 / Math.PI; }
|
|
||||||
function headingVector(degrees) { const radians = degrees * Math.PI / 180; return [Math.sin(radians), Math.cos(radians)]; }
|
|
||||||
function normalizeDegrees(value) { return ((value % 360) + 360) % 360; }
|
|
||||||
function angularDistance(a, b) { return Math.abs(((a - b + 540) % 360) - 180); }
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
SIGNAL_LAYOUT,
|
|
||||||
signalNodeKey,
|
|
||||||
buildTrafficSignalFeatures,
|
|
||||||
validateTrafficSignalFeatures,
|
|
||||||
validateTrafficSignalSourceReferences,
|
|
||||||
buildTrafficSignalsFromFeatures,
|
|
||||||
buildTrafficSignals,
|
|
||||||
readTrafficSignalFeatures,
|
|
||||||
readTrafficSignals,
|
|
||||||
};
|
|
||||||
@@ -1,502 +0,0 @@
|
|||||||
"use strict";
|
|
||||||
|
|
||||||
const fs = require("fs");
|
|
||||||
const path = require("path");
|
|
||||||
const { laneCenterline } = require("./lane-geometry");
|
|
||||||
|
|
||||||
const ASSET_MANIFEST = path.resolve(__dirname, "..", "..", "assets", "lane-icons", "manifest.json");
|
|
||||||
const LANE_WIDTH_METERS = 3.2;
|
|
||||||
const PLACEMENT_DISTANCE_METERS = 9;
|
|
||||||
const SPATIAL_MATCH_MAX_DISTANCE_METERS = 18;
|
|
||||||
const SPATIAL_MATCH_MIN_ALIGNMENT = Math.cos(Math.PI / 6);
|
|
||||||
|
|
||||||
// Existing osm2streets lane arrows are approximately 1.4 m across. Keep the
|
|
||||||
// 25-unit upstream icon at the same on-road scale rather than at screen scale.
|
|
||||||
const SVG_METERS_PER_UNIT = 0.10;
|
|
||||||
|
|
||||||
function loadManifest(file = ASSET_MANIFEST) {
|
|
||||||
const manifest = JSON.parse(fs.readFileSync(file, "utf8"));
|
|
||||||
if (!Array.isArray(manifest.assets)) throw new Error("turn-lane asset manifest has no assets array");
|
|
||||||
return manifest;
|
|
||||||
}
|
|
||||||
|
|
||||||
function supportedAssets(manifest = loadManifest()) {
|
|
||||||
return new Map(manifest.assets
|
|
||||||
.filter((asset) => asset.supported === true && asset.tested === true)
|
|
||||||
.map((asset) => [asset.id, asset]));
|
|
||||||
}
|
|
||||||
|
|
||||||
function buildCustomTurnLaneArrows(osm, options = {}) {
|
|
||||||
const enabled = options.enabled === true;
|
|
||||||
const diagnostics = [];
|
|
||||||
if (!enabled) return { features: [], diagnostics: [{ reason: "disabled" }] };
|
|
||||||
const assets = supportedAssets(options.manifest);
|
|
||||||
const endpointRoadCounts = roadCountsByNode(osm);
|
|
||||||
const networkIntersectionNodes = new Set((options.network?.intersections || [])
|
|
||||||
.flatMap(([, intersection]) => intersection.osm_ids || []).map(Number));
|
|
||||||
const features = [];
|
|
||||||
const ways = [...osm.ways.values()].sort((a, b) => a.id - b.id);
|
|
||||||
for (const way of ways) {
|
|
||||||
for (const direction of ["forward", "backward"]) {
|
|
||||||
const tag = way.tags[`turn:lanes:${direction}`];
|
|
||||||
if (!tag) continue;
|
|
||||||
const laneCount = directionalLaneCount(way, direction);
|
|
||||||
if (!laneCount) {
|
|
||||||
diagnostics.push(skip(way, direction, "missing_lane_count"));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
const endpoint = endpointGeometry(osm, way, direction, endpointRoadCounts, networkIntersectionNodes);
|
|
||||||
if (!endpoint) {
|
|
||||||
diagnostics.push(skip(way, direction, "indeterminate_intersection_endpoint"));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
const maneuvers = String(tag).split("|").map((value) => normalizeManeuver(value));
|
|
||||||
for (let laneIndex = 0; laneIndex < maneuvers.length; laneIndex += 1) {
|
|
||||||
const maneuver = maneuvers[laneIndex];
|
|
||||||
const asset = assets.get(maneuver);
|
|
||||||
if (!asset) {
|
|
||||||
diagnostics.push(skip(way, direction, "unsupported_or_untested_maneuver", { lane_index: laneIndex, maneuver }));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (laneIndex >= laneCount) {
|
|
||||||
diagnostics.push(skip(way, direction, "lane_index_exceeds_lane_count", { lane_index: laneIndex, maneuver }));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
const resolvedPlacement = lanePlacement(way, direction, laneIndex, endpoint, options.lanePolygons, options.crosswalkStripes, options.stopLines);
|
|
||||||
if (resolvedPlacement?.blocked) {
|
|
||||||
diagnostics.push(skip(way, direction, "no_safe_turn_arrow_position", { lane_index: laneIndex, maneuver }));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
const placement = resolvedPlacement || fallbackLanePlacement(endpoint, direction, laneIndex, options.crosswalkStripes, options.stopLines);
|
|
||||||
if (!placement) {
|
|
||||||
diagnostics.push(skip(way, direction, "no_safe_turn_arrow_position", { lane_index: laneIndex, maneuver }));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
const parts = templateFor(asset.id, options.manifest);
|
|
||||||
for (let partIndex = 0; partIndex < parts.length; partIndex += 1) {
|
|
||||||
features.push(makeFeature(way, direction, laneIndex, maneuver, asset, partIndex, parts[partIndex], placement.center, placement));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return { features, diagnostics };
|
|
||||||
}
|
|
||||||
|
|
||||||
function normalizeManeuver(value) {
|
|
||||||
const parts = String(value || "").split(";").map((part) => part.trim()).filter(Boolean).sort();
|
|
||||||
const supported = new Map([
|
|
||||||
["through", "through"], ["left", "left"], ["right", "right"],
|
|
||||||
["left;through", "through;left"], ["right;through", "through;right"],
|
|
||||||
["left;right;through", "through;left;right"],
|
|
||||||
]);
|
|
||||||
return supported.get(parts.join(";")) || parts.join(";");
|
|
||||||
}
|
|
||||||
|
|
||||||
function directionalLaneCount(way, direction) {
|
|
||||||
const specific = Number(way.tags[`lanes:${direction}`]);
|
|
||||||
if (Number.isInteger(specific) && specific > 0) return specific;
|
|
||||||
const total = Number(way.tags.lanes);
|
|
||||||
if (Number.isInteger(total) && total > 0 && total % 2 === 0 && !isOneway(way)) return total / 2;
|
|
||||||
if (Number.isInteger(total) && total > 0 && isOneway(way)) return total;
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
function roadCountsByNode(osm) {
|
|
||||||
const out = new Map();
|
|
||||||
for (const way of osm.ways.values()) {
|
|
||||||
if (!way.tags.highway || way.tags.highway === "service") continue;
|
|
||||||
for (const ref of new Set(way.refs)) out.set(ref, (out.get(ref) || 0) + 1);
|
|
||||||
}
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
|
|
||||||
function endpointGeometry(osm, way, direction, roadCounts, networkIntersectionNodes) {
|
|
||||||
const forward = direction === "forward";
|
|
||||||
const endpointIndex = forward ? way.refs.length - 1 : 0;
|
|
||||||
const neighborIndex = forward ? endpointIndex - 1 : 1;
|
|
||||||
const node = osm.nodes.get(way.refs[endpointIndex]);
|
|
||||||
const neighbor = osm.nodes.get(way.refs[neighborIndex]);
|
|
||||||
if (!node || !neighbor) return null;
|
|
||||||
const networkSaysIntersection = networkIntersectionNodes && networkIntersectionNodes.size > 0 && networkIntersectionNodes.has(node.id);
|
|
||||||
if (!networkSaysIntersection && (roadCounts.get(node.id) || 0) < 3) return null;
|
|
||||||
const meters = metersForLat(node.lat);
|
|
||||||
// For both directions, point from the adjacent road node to the endpoint.
|
|
||||||
// At a forward endpoint this is the OSM-way direction; at a backward
|
|
||||||
// endpoint it is the reverse OSM-way direction, i.e. the actual travel
|
|
||||||
// direction used by turn:lanes:backward.
|
|
||||||
const raw = [node.lon - neighbor.lon, node.lat - neighbor.lat];
|
|
||||||
const axis = normalizeMetersVector(raw, meters);
|
|
||||||
if (!axis) return null;
|
|
||||||
return { node, axis, right: [axis[1], -axis[0]], meters };
|
|
||||||
}
|
|
||||||
|
|
||||||
function laneCenter(endpoint, direction, laneIndex, meters) {
|
|
||||||
const lateral = (laneIndex + 0.5) * LANE_WIDTH_METERS;
|
|
||||||
// The local axis always follows travel, so moving back from either endpoint
|
|
||||||
// places the marking on its approach lane before the intersection.
|
|
||||||
return addMeters([endpoint.node.lon, endpoint.node.lat], endpoint.axis, -PLACEMENT_DISTANCE_METERS, endpoint.right, lateral, meters);
|
|
||||||
}
|
|
||||||
|
|
||||||
function fallbackLanePlacement(endpoint, direction, laneIndex, crosswalkStripes, stopLines) {
|
|
||||||
const lateral = (laneIndex + 0.5) * LANE_WIDTH_METERS;
|
|
||||||
for (const distance of [PLACEMENT_DISTANCE_METERS, 12, 15, 18, 21, 24, 27, 30, 33, 36, 39, 42]) {
|
|
||||||
const center = addMeters([endpoint.node.lon, endpoint.node.lat], endpoint.axis, -distance, endpoint.right, lateral, endpoint.meters);
|
|
||||||
if (!nearIntersectionMarking(center, endpoint.axis, crosswalkStripes, stopLines, endpoint.meters)) {
|
|
||||||
return { center, axis: endpoint.axis, right: endpoint.right, meters: endpoint.meters, placementDistance: distance, placementSource: "osm_way_fallback" };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
function lanePlacement(way, direction, laneIndex, endpoint, lanePolygons, crosswalkStripes, stopLines) {
|
|
||||||
if (!Array.isArray(lanePolygons)) return null;
|
|
||||||
const expectedDirection = direction === "forward" ? "Fwd" : "Back";
|
|
||||||
const directionalCandidates = lanePolygons.filter((feature) =>
|
|
||||||
feature.properties?.type === "Driving" &&
|
|
||||||
feature.properties.direction === expectedDirection
|
|
||||||
);
|
|
||||||
let candidates = directionalCandidates.filter((feature) =>
|
|
||||||
(feature.properties.osm_way_ids || []).map(Number).includes(way.id)
|
|
||||||
);
|
|
||||||
let placementSource = "driving_lane_centerline";
|
|
||||||
let spatialAnchors = null;
|
|
||||||
if (!candidates.length) {
|
|
||||||
const ranked = directionalCandidates
|
|
||||||
.map((feature) => ({ feature, anchor: spatialLaneAnchor(feature, endpoint) }))
|
|
||||||
.filter(({ anchor }) => anchor)
|
|
||||||
.filter(({ anchor }) => anchor.alignment >= SPATIAL_MATCH_MIN_ALIGNMENT && anchor.distance <= SPATIAL_MATCH_MAX_DISTANCE_METERS)
|
|
||||||
.sort((a, b) => a.anchor.distance - b.anchor.distance || a.anchor.lateral - b.anchor.lateral || Number(a.feature.properties.index) - Number(b.feature.properties.index));
|
|
||||||
if (ranked.length) {
|
|
||||||
// JOSM may split a tagged OSM way into temporary negative IDs. Those IDs
|
|
||||||
// are absent from osm2streets' rendered polygons, so associate the full
|
|
||||||
// physical approach by endpoint proximity and road-axis alignment.
|
|
||||||
candidates = ranked.map(({ feature }) => feature);
|
|
||||||
placementSource = "spatial_driving_lane_centerline";
|
|
||||||
spatialAnchors = new Map(ranked.map(({ feature, anchor }) => [feature, anchor]));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
candidates.sort((a, b) => {
|
|
||||||
const lateralA = spatialAnchors?.get(a)?.lateral;
|
|
||||||
const lateralB = spatialAnchors?.get(b)?.lateral;
|
|
||||||
if (Number.isFinite(lateralA) && Number.isFinite(lateralB) && lateralA !== lateralB) return lateralA - lateralB;
|
|
||||||
return Number(a.properties.index) - Number(b.properties.index);
|
|
||||||
});
|
|
||||||
const lane = candidates[laneIndex];
|
|
||||||
const spatialAnchor = spatialAnchors?.get(lane);
|
|
||||||
if (spatialAnchor) {
|
|
||||||
const sampled = placementDistances().map((distance) => ({
|
|
||||||
center: sampleCenterlineAwayFromEndpoint(spatialAnchor, distance, endpoint.meters),
|
|
||||||
distance,
|
|
||||||
})).find(({ center }) => center && !nearIntersectionMarking(center, spatialAnchor.axis, crosswalkStripes, stopLines, endpoint.meters));
|
|
||||||
if (!sampled) return { blocked: true };
|
|
||||||
return { center: sampled.center, axis: spatialAnchor.axis, right: [spatialAnchor.axis[1], -spatialAnchor.axis[0]], meters: endpoint.meters, placementDistance: sampled.distance, placementSource };
|
|
||||||
}
|
|
||||||
const centerline = laneCenterline(lane);
|
|
||||||
if (!centerline) return null;
|
|
||||||
const startsAtEndpoint = direction === "backward";
|
|
||||||
const ordered = startsAtEndpoint ? centerline : [...centerline].reverse();
|
|
||||||
const sampled = [PLACEMENT_DISTANCE_METERS, 12, 15, 18, 21, 24, 27, 30, 33, 36, 39, 42]
|
|
||||||
.map((distance) => ({ center: samplePolyline(ordered, distance, endpoint.meters), distance }))
|
|
||||||
.find(({ center }) => center && !nearIntersectionMarking(center, axisForLane(ordered, endpoint.meters), crosswalkStripes, stopLines, endpoint.meters));
|
|
||||||
if (!sampled) return { blocked: true };
|
|
||||||
const axis = axisForLane(ordered, endpoint.meters);
|
|
||||||
if (!axis) return null;
|
|
||||||
return { center: sampled.center, axis, right: [axis[1], -axis[0]], meters: endpoint.meters, placementDistance: sampled.distance, placementSource };
|
|
||||||
}
|
|
||||||
|
|
||||||
function spatialLaneAnchor(lane, endpoint) {
|
|
||||||
const centerline = laneCenterline(lane);
|
|
||||||
if (!centerline) return null;
|
|
||||||
let best = null;
|
|
||||||
for (let index = 0; index < centerline.length - 1; index += 1) {
|
|
||||||
const start = centerline[index];
|
|
||||||
const end = centerline[index + 1];
|
|
||||||
const point = closestPointOnSegment([endpoint.node.lon, endpoint.node.lat], start, end, endpoint.meters);
|
|
||||||
const distance = Math.hypot((point[0] - endpoint.node.lon) * endpoint.meters.lon, (point[1] - endpoint.node.lat) * endpoint.meters.lat);
|
|
||||||
const tangent = normalizeMetersVector(subtractPoint(end, start), endpoint.meters);
|
|
||||||
if (!tangent || (best && distance >= best.distance)) continue;
|
|
||||||
const dot = tangent[0] * endpoint.axis[0] + tangent[1] * endpoint.axis[1];
|
|
||||||
const axis = dot >= 0 ? tangent : [-tangent[0], -tangent[1]];
|
|
||||||
const offset = subtractPoint(point, [endpoint.node.lon, endpoint.node.lat]);
|
|
||||||
best = {
|
|
||||||
point,
|
|
||||||
distance,
|
|
||||||
axis,
|
|
||||||
alignment: Math.abs(dot),
|
|
||||||
lateral: offset[0] * endpoint.right[0] * endpoint.meters.lon + offset[1] * endpoint.right[1] * endpoint.meters.lat,
|
|
||||||
centerline,
|
|
||||||
segmentIndex: index,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
return best;
|
|
||||||
}
|
|
||||||
|
|
||||||
function placementDistances() {
|
|
||||||
return [PLACEMENT_DISTANCE_METERS, 12, 15, 18, 21, 24, 27, 30, 33, 36, 39, 42];
|
|
||||||
}
|
|
||||||
|
|
||||||
function sampleCenterlineAwayFromEndpoint(anchor, distanceMeters, meters) {
|
|
||||||
const { centerline, segmentIndex } = anchor;
|
|
||||||
const start = centerline[segmentIndex];
|
|
||||||
const end = centerline[segmentIndex + 1];
|
|
||||||
const tangent = normalizeMetersVector(subtractPoint(end, start), meters);
|
|
||||||
if (!tangent) return null;
|
|
||||||
// Walk away from the junction along the rendered centerline. This preserves
|
|
||||||
// curved or split lane geometry instead of approximating it with a tangent.
|
|
||||||
const towardEnd = tangent[0] * anchor.axis[0] + tangent[1] * anchor.axis[1] < 0;
|
|
||||||
const points = [anchor.point];
|
|
||||||
if (towardEnd) {
|
|
||||||
for (let index = segmentIndex + 1; index < centerline.length; index += 1) points.push(centerline[index]);
|
|
||||||
} else {
|
|
||||||
for (let index = segmentIndex; index >= 0; index -= 1) points.push(centerline[index]);
|
|
||||||
}
|
|
||||||
return samplePolyline(points, distanceMeters, meters);
|
|
||||||
}
|
|
||||||
|
|
||||||
function closestPointOnSegment(point, start, end, meters) {
|
|
||||||
const dx = (end[0] - start[0]) * meters.lon;
|
|
||||||
const dy = (end[1] - start[1]) * meters.lat;
|
|
||||||
const px = (point[0] - start[0]) * meters.lon;
|
|
||||||
const py = (point[1] - start[1]) * meters.lat;
|
|
||||||
const lengthSquared = dx * dx + dy * dy;
|
|
||||||
const ratio = lengthSquared ? Math.max(0, Math.min(1, (px * dx + py * dy) / lengthSquared)) : 0;
|
|
||||||
return [start[0] + ratio * (end[0] - start[0]), start[1] + ratio * (end[1] - start[1])];
|
|
||||||
}
|
|
||||||
|
|
||||||
function axisForLane(ordered, meters) {
|
|
||||||
return normalizeMetersVector(subtractPoint(ordered[0], ordered[1]), meters);
|
|
||||||
}
|
|
||||||
|
|
||||||
function nearIntersectionMarking(center, axis, stripes, stopLines, meters) {
|
|
||||||
if (!axis) return true;
|
|
||||||
const right = [axis[1], -axis[0]];
|
|
||||||
const samples = [];
|
|
||||||
for (const forward of [-0.2, 0.5, 1.2, 1.9, 2.2]) {
|
|
||||||
for (const lateral of [-1.6, -0.8, 0, 0.8, 1.6]) {
|
|
||||||
samples.push(addMeters(center, axis, forward, right, lateral, meters));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return [...(stripes || []), ...(stopLines || [])].some((feature) => samples.some((point) => nearFeature(point, feature, meters)));
|
|
||||||
}
|
|
||||||
|
|
||||||
function nearFeature(point, feature, meters) {
|
|
||||||
const ring = feature.geometry?.type === "Polygon" ? feature.geometry.coordinates?.[0] : null;
|
|
||||||
if (!ring?.length) return false;
|
|
||||||
const xs = ring.map((coordinate) => coordinate[0]);
|
|
||||||
const ys = ring.map((coordinate) => coordinate[1]);
|
|
||||||
const clearance = 0.7;
|
|
||||||
const dx = Math.max((Math.min(...xs) - point[0]) * meters.lon, 0, (point[0] - Math.max(...xs)) * meters.lon);
|
|
||||||
const dy = Math.max((Math.min(...ys) - point[1]) * meters.lat, 0, (point[1] - Math.max(...ys)) * meters.lat);
|
|
||||||
return Math.hypot(dx, dy) < clearance;
|
|
||||||
}
|
|
||||||
|
|
||||||
function subtractPoint([lon, lat], [otherLon, otherLat]) {
|
|
||||||
return [lon - otherLon, lat - otherLat];
|
|
||||||
}
|
|
||||||
|
|
||||||
function samplePolyline(points, distanceMeters, meters) {
|
|
||||||
let remaining = distanceMeters;
|
|
||||||
for (let index = 0; index < points.length - 1; index += 1) {
|
|
||||||
const start = points[index];
|
|
||||||
const end = points[index + 1];
|
|
||||||
const vector = normalizeMetersVector(subtractPoint(end, start), meters);
|
|
||||||
const length = Math.hypot((end[0] - start[0]) * meters.lon, (end[1] - start[1]) * meters.lat);
|
|
||||||
if (!vector || !length) continue;
|
|
||||||
if (remaining <= length) return addMeters(start, vector, remaining, [0, 0], 0, meters);
|
|
||||||
remaining -= length;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
function makeFeature(way, direction, laneIndex, maneuver, asset, partIndex, template, center, endpoint) {
|
|
||||||
const ring = template.map(([rightMeters, forwardMeters]) => addMeters(center, endpoint.axis, forwardMeters, endpoint.right, rightMeters, endpoint.meters));
|
|
||||||
return {
|
|
||||||
type: "Feature",
|
|
||||||
properties: {
|
|
||||||
type: "lane arrow",
|
|
||||||
source: "osm_turn_lanes",
|
|
||||||
osm_way_id: way.id,
|
|
||||||
direction,
|
|
||||||
lane_index: laneIndex,
|
|
||||||
maneuver,
|
|
||||||
source_asset: asset.id,
|
|
||||||
source_asset_path: asset.source,
|
|
||||||
arrow_part: partIndex,
|
|
||||||
// SVG strokes and fills are expanded separately for GeoJSON validity.
|
|
||||||
// This stable key lets the QGIS normalizer restore one rendered arrow.
|
|
||||||
custom_arrow_id: `${way.id}:${direction}:${laneIndex}:${maneuver}`,
|
|
||||||
placement_distance_meters: endpoint.placementDistance ?? PLACEMENT_DISTANCE_METERS,
|
|
||||||
placement_source: endpoint.placementSource ?? "osm_way_fallback",
|
|
||||||
},
|
|
||||||
geometry: { type: "Polygon", coordinates: [ring] },
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function skip(way, direction, reason, extra = {}) {
|
|
||||||
return { source: "osm_turn_lanes", osm_way_id: way.id, direction, reason, ...extra };
|
|
||||||
}
|
|
||||||
|
|
||||||
function isOneway(way) {
|
|
||||||
return ["yes", "true", "1"].includes(String(way.tags.oneway || "").toLowerCase());
|
|
||||||
}
|
|
||||||
|
|
||||||
function metersForLat(lat) {
|
|
||||||
return { lon: 111320 * Math.cos((lat * Math.PI) / 180), lat: 110540 };
|
|
||||||
}
|
|
||||||
|
|
||||||
function normalizeMetersVector([dxLon, dyLat], meters) {
|
|
||||||
const x = dxLon * meters.lon;
|
|
||||||
const y = dyLat * meters.lat;
|
|
||||||
const length = Math.hypot(x, y);
|
|
||||||
return length ? [x / length, y / length] : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
function addMeters(center, axis, axisDistance, right, rightDistance, meters) {
|
|
||||||
return [
|
|
||||||
center[0] + (axis[0] * axisDistance + right[0] * rightDistance) / meters.lon,
|
|
||||||
center[1] + (axis[1] * axisDistance + right[1] * rightDistance) / meters.lat,
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
function arrowRingsAt(maneuver, center, axis, manifest = loadManifest()) {
|
|
||||||
const normalized = normalizeManeuver(maneuver);
|
|
||||||
if (!supportedAssets(manifest).has(normalized) || !Array.isArray(center) || !Array.isArray(axis)) return [];
|
|
||||||
const meters = metersForLat(center[1]);
|
|
||||||
const length = Math.hypot(axis[0], axis[1]);
|
|
||||||
if (!Number.isFinite(length) || length < 0.001) return [];
|
|
||||||
const forward = [axis[0] / length, axis[1] / length];
|
|
||||||
const right = [forward[1], -forward[0]];
|
|
||||||
return templateFor(normalized, manifest).map((template) => template.map(([rightMeters, forwardMeters]) =>
|
|
||||||
addMeters(center, forward, forwardMeters, right, rightMeters, meters)));
|
|
||||||
}
|
|
||||||
|
|
||||||
function templateFor(assetId, manifest = loadManifest()) {
|
|
||||||
const asset = supportedAssets(manifest).get(assetId);
|
|
||||||
if (!asset) throw new Error(`Unsupported or untested turn-lane asset: ${assetId}`);
|
|
||||||
return angularTemplate(assetId);
|
|
||||||
}
|
|
||||||
|
|
||||||
function angularTemplate(assetId) {
|
|
||||||
const shaftWidth = 0.30;
|
|
||||||
const shaftHalf = shaftWidth / 2;
|
|
||||||
const straightBase = 1.18;
|
|
||||||
const straightTip = 1.92;
|
|
||||||
const rectangle = (minX, minY, maxX, maxY) => [
|
|
||||||
[minX, minY], [maxX, minY], [maxX, maxY], [minX, maxY], [minX, minY],
|
|
||||||
];
|
|
||||||
const throughHead = () => [[0, straightTip], [-0.42, straightBase], [-shaftHalf, straightBase], [-shaftHalf, 0], [shaftHalf, 0], [shaftHalf, straightBase], [0.42, straightBase], [0, straightTip]];
|
|
||||||
const diagonalShaft = (side) => {
|
|
||||||
const start = [0, 0.56];
|
|
||||||
const end = [side * 0.72, 0.96];
|
|
||||||
const length = Math.hypot(end[0] - start[0], end[1] - start[1]);
|
|
||||||
const normal = [-(end[1] - start[1]) / length * shaftHalf, (end[0] - start[0]) / length * shaftHalf];
|
|
||||||
return [[start[0] + normal[0], start[1] + normal[1]], [end[0] + normal[0], end[1] + normal[1]], [end[0] - normal[0], end[1] - normal[1]], [start[0] - normal[0], start[1] - normal[1]], [start[0] + normal[0], start[1] + normal[1]]];
|
|
||||||
};
|
|
||||||
const diagonalHead = (side) => {
|
|
||||||
const base = [side * 0.60, 0.89];
|
|
||||||
const tip = [side * 1.22, 1.24];
|
|
||||||
const length = Math.hypot(tip[0] - base[0], tip[1] - base[1]);
|
|
||||||
const normal = [-(tip[1] - base[1]) / length * 0.36, (tip[0] - base[0]) / length * 0.36];
|
|
||||||
return [tip, [base[0] + normal[0], base[1] + normal[1]], [base[0] - normal[0], base[1] - normal[1]], tip];
|
|
||||||
};
|
|
||||||
const turnStem = (side) => {
|
|
||||||
const cutMidpoint = 0.73;
|
|
||||||
const cutRise = side * 0.084;
|
|
||||||
return [
|
|
||||||
[-shaftHalf, 0], [shaftHalf, 0],
|
|
||||||
[shaftHalf, cutMidpoint + cutRise], [-shaftHalf, cutMidpoint - cutRise],
|
|
||||||
[-shaftHalf, 0],
|
|
||||||
];
|
|
||||||
};
|
|
||||||
if (assetId === "through") return [throughHead()];
|
|
||||||
if (assetId === "right") return [turnStem(1), diagonalShaft(1), diagonalHead(1)];
|
|
||||||
if (assetId === "left") return [turnStem(-1), diagonalShaft(-1), diagonalHead(-1)];
|
|
||||||
if (assetId === "through;right") return [throughHead(), diagonalShaft(1), diagonalHead(1)];
|
|
||||||
if (assetId === "through;left") return [throughHead(), diagonalShaft(-1), diagonalHead(-1)];
|
|
||||||
if (assetId === "through;left;right") return [throughHead(), diagonalShaft(-1), diagonalHead(-1), diagonalShaft(1), diagonalHead(1)];
|
|
||||||
throw new Error(`No angular turn-lane template: ${assetId}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
function sourceSvgTemplateFor(asset, assetId) {
|
|
||||||
const source = fs.readFileSync(path.resolve(__dirname, "..", "..", "assets", "lane-icons", asset.source), "utf8");
|
|
||||||
const mirrorX = asset.mirror_x === true;
|
|
||||||
const anchorX = Number(asset.anchor_x);
|
|
||||||
if (!Number.isFinite(anchorX)) throw new Error(`turn-lane asset has invalid anchor_x: ${assetId}`);
|
|
||||||
const shapes = [];
|
|
||||||
for (const match of source.matchAll(/<line\b([^>]*)\/>|<path\b([^>]*)\/>/g)) {
|
|
||||||
const attrs = parseSvgAttrs(match[1] || match[2]);
|
|
||||||
const strokeWidth = Number(attrs["stroke-width"] || 0);
|
|
||||||
if (match[1]) {
|
|
||||||
shapes.push(strokePolygon([[Number(attrs.x1), Number(attrs.y1)], [Number(attrs.x2), Number(attrs.y2)]], strokeWidth));
|
|
||||||
} else {
|
|
||||||
const points = parseSvgPath(attrs.d || "");
|
|
||||||
if (attrs.fill !== "none") shapes.push(points);
|
|
||||||
if (strokeWidth > 0) shapes.push(strokePolygon(points, strokeWidth));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return shapes.filter((ring) => ring.length >= 4).map((ring) => ring.map(([x, y]) => [
|
|
||||||
(mirrorX ? anchorX - x : x - anchorX) * SVG_METERS_PER_UNIT,
|
|
||||||
(23 - y) * SVG_METERS_PER_UNIT,
|
|
||||||
]));
|
|
||||||
}
|
|
||||||
|
|
||||||
function parseSvgAttrs(text) {
|
|
||||||
const attrs = {};
|
|
||||||
for (const match of text.matchAll(/([\w:-]+)=(['"])(.*?)\2/g)) attrs[match[1]] = match[3];
|
|
||||||
return attrs;
|
|
||||||
}
|
|
||||||
|
|
||||||
function parseSvgPath(value) {
|
|
||||||
const tokens = value.match(/[a-zA-Z]|[-+]?(?:\d*\.\d+|\d+\.?)(?:[eE][-+]?\d+)?/g) || [];
|
|
||||||
let index = 0;
|
|
||||||
let command = "";
|
|
||||||
let point = [0, 0];
|
|
||||||
let start = null;
|
|
||||||
const points = [];
|
|
||||||
const number = () => Number(tokens[index++]);
|
|
||||||
const lineTo = (x, y) => { point = [x, y]; points.push(point); };
|
|
||||||
while (index < tokens.length) {
|
|
||||||
if (/^[a-zA-Z]$/.test(tokens[index])) command = tokens[index++];
|
|
||||||
const relative = command === command.toLowerCase();
|
|
||||||
const op = command.toUpperCase();
|
|
||||||
if (op === "Z") { if (start) points.push(start); command = ""; continue; }
|
|
||||||
if (op === "M" || op === "L") {
|
|
||||||
const x = number(); const y = number();
|
|
||||||
const next = relative ? [point[0] + x, point[1] + y] : [x, y];
|
|
||||||
if (op === "M" && !start) { start = next; point = next; points.push(point); command = relative ? "l" : "L"; } else lineTo(...next);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (op === "H") { lineTo(relative ? point[0] + number() : number(), point[1]); continue; }
|
|
||||||
if (op === "V") { lineTo(point[0], relative ? point[1] + number() : number()); continue; }
|
|
||||||
if (op === "C") {
|
|
||||||
const values = [number(), number(), number(), number(), number(), number()];
|
|
||||||
const controls = relative ? values.map((n, i) => n + point[i % 2]) : values;
|
|
||||||
const origin = point;
|
|
||||||
for (let step = 1; step <= 8; step += 1) {
|
|
||||||
const t = step / 8; const u = 1 - t;
|
|
||||||
lineTo(u ** 3 * origin[0] + 3 * u ** 2 * t * controls[0] + 3 * u * t ** 2 * controls[2] + t ** 3 * controls[4], u ** 3 * origin[1] + 3 * u ** 2 * t * controls[1] + 3 * u * t ** 2 * controls[3] + t ** 3 * controls[5]);
|
|
||||||
}
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (op === "A") { number(); number(); number(); number(); number(); const x = number(); const y = number(); lineTo(relative ? point[0] + x : x, relative ? point[1] + y : y); continue; }
|
|
||||||
throw new Error(`Unsupported SVG path command: ${command}`);
|
|
||||||
}
|
|
||||||
return points;
|
|
||||||
}
|
|
||||||
|
|
||||||
function strokePolygon(points, width) {
|
|
||||||
if (points.length < 2) return [];
|
|
||||||
const half = width / 2;
|
|
||||||
const left = []; const right = [];
|
|
||||||
for (let index = 0; index < points.length; index += 1) {
|
|
||||||
const prev = points[Math.max(0, index - 1)];
|
|
||||||
const next = points[Math.min(points.length - 1, index + 1)];
|
|
||||||
const dx = next[0] - prev[0]; const dy = next[1] - prev[1]; const length = Math.hypot(dx, dy) || 1;
|
|
||||||
const nx = -dy / length * half; const ny = dx / length * half;
|
|
||||||
left.push([points[index][0] + nx, points[index][1] + ny]);
|
|
||||||
right.unshift([points[index][0] - nx, points[index][1] - ny]);
|
|
||||||
}
|
|
||||||
return [...left, ...right, left[0]];
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = { arrowRingsAt, buildCustomTurnLaneArrows, loadManifest, normalizeManeuver, supportedAssets, templateFor };
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
const { parseOsm } = require("./osm");
|
const { osm: { parseOsm }, laneGeometry: {
|
||||||
const {
|
|
||||||
appendCoordinates,
|
appendCoordinates,
|
||||||
haversineMeters,
|
haversineMeters,
|
||||||
laneCenterline,
|
laneCenterline,
|
||||||
@@ -10,7 +9,7 @@ const {
|
|||||||
orientPolyline,
|
orientPolyline,
|
||||||
polylineLength,
|
polylineLength,
|
||||||
polylineMidpoint,
|
polylineMidpoint,
|
||||||
} = require("./lane-geometry");
|
} } = require("@osm-asset/road-compiler");
|
||||||
|
|
||||||
const MAX_ROUTES = 5;
|
const MAX_ROUTES = 5;
|
||||||
const MAX_PATH_EDGES = 7;
|
const MAX_PATH_EDGES = 7;
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ const path = require("path");
|
|||||||
const os = require("os");
|
const os = require("os");
|
||||||
const { execFileSync } = require("child_process");
|
const { execFileSync } = require("child_process");
|
||||||
const { qgisPaths } = require("./lib/tool-paths");
|
const { qgisPaths } = require("./lib/tool-paths");
|
||||||
const { parseOsm } = require("./lib/osm");
|
const { osm: { parseOsm } } = require("@osm-asset/road-compiler");
|
||||||
const {
|
const {
|
||||||
validateTrafficSignalSourceReferences,
|
validateTrafficSignalSourceReferences,
|
||||||
} = require("./lib/traffic-signals");
|
} = require("./lib/traffic-signals");
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
const path = require("path");
|
const path = require("path");
|
||||||
const { templateFor } = require("./lib/turn-lane-arrows");
|
const { turnLaneArrows: { templateFor } } = require("@osm-asset/road-compiler");
|
||||||
|
|
||||||
const output = path.resolve(process.argv[2] || path.join("outputs", "turn-lane-arrow-samples.svg"));
|
const output = path.resolve(process.argv[2] || path.join("outputs", "turn-lane-arrow-samples.svg"));
|
||||||
const DISPLAY_SCALE = 60;
|
const DISPLAY_SCALE = 60;
|
||||||
|
|||||||
@@ -0,0 +1,154 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
const crypto = require("crypto");
|
||||||
|
const fs = require("fs");
|
||||||
|
const path = require("path");
|
||||||
|
const { readAreaConfig } = require("./lib/area-config");
|
||||||
|
const { importNativeRoadPackage } = require("./lib/native-road-package");
|
||||||
|
|
||||||
|
const repoRoot = path.resolve(__dirname, "..");
|
||||||
|
|
||||||
|
function parseArgs(argv) {
|
||||||
|
const result = {};
|
||||||
|
for (let index = 0; index < argv.length; index += 1) {
|
||||||
|
if (!argv[index].startsWith("--")) continue;
|
||||||
|
const key = argv[index].slice(2).replace(/-([a-z])/g, (_, letter) => letter.toUpperCase());
|
||||||
|
result[key] = argv[index + 1] && !argv[index + 1].startsWith("--") ? argv[++index] : true;
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
function usage() {
|
||||||
|
return "Usage: node scripts/road-parity.js --config <area-config> (--snapshot <out.json> | --compare <baseline.json>)";
|
||||||
|
}
|
||||||
|
|
||||||
|
function hash(value) {
|
||||||
|
return crypto.createHash("sha256").update(value).digest("hex");
|
||||||
|
}
|
||||||
|
|
||||||
|
function stable(value) {
|
||||||
|
if (Array.isArray(value)) return value.map(stable);
|
||||||
|
if (!value || typeof value !== "object") return normalizeString(value);
|
||||||
|
return Object.fromEntries(Object.keys(value).sort().map((key) => [key, stable(value[key])]));
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizeString(value) {
|
||||||
|
if (typeof value !== "string") return value;
|
||||||
|
const normalized = value.replace(/([\\/])native-road-[^\\/]+/g, "$1<staging>");
|
||||||
|
if (!path.isAbsolute(normalized)) return normalized;
|
||||||
|
const relative = path.relative(repoRoot, normalized);
|
||||||
|
return relative && !relative.startsWith("..") && !path.isAbsolute(relative)
|
||||||
|
? `<repo>/${relative.split(path.sep).join("/")}`
|
||||||
|
: `<external>/${path.basename(normalized)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function encoded(value) {
|
||||||
|
return JSON.stringify(stable(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
function featureKey(feature) {
|
||||||
|
const nativeId = feature?.properties?.native_id ?? feature?.properties?.nativeId ?? feature?.id;
|
||||||
|
if (nativeId !== undefined && nativeId !== null) return `id:${nativeId}`;
|
||||||
|
return `geometry:${encoded(feature?.geometry ?? null)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function geoJsonRecord(value, bytes) {
|
||||||
|
if (value?.type !== "FeatureCollection" || !Array.isArray(value.features)) return null;
|
||||||
|
const normalized = { ...value, features: value.features.map(stable) };
|
||||||
|
const ordered = encoded(normalized);
|
||||||
|
const content = encoded({ ...normalized, features: [...normalized.features].sort((left, right) => featureKey(left).localeCompare(featureKey(right))) });
|
||||||
|
return { contentHash: hash(content), orderHash: hash(ordered), features: value.features.length, bytes };
|
||||||
|
}
|
||||||
|
|
||||||
|
function jsonRecord(text, bytes) {
|
||||||
|
const value = JSON.parse(text);
|
||||||
|
return geoJsonRecord(value, bytes) || { contentHash: hash(encoded(value)), bytes };
|
||||||
|
}
|
||||||
|
|
||||||
|
function filesBelow(directory) {
|
||||||
|
const result = [];
|
||||||
|
for (const entry of fs.readdirSync(directory, { withFileTypes: true })) {
|
||||||
|
const full = path.join(directory, entry.name);
|
||||||
|
if (entry.isDirectory()) result.push(...filesBelow(full));
|
||||||
|
else if (entry.isFile()) result.push(full);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
function snapshot(configPath) {
|
||||||
|
const area = readAreaConfig(configPath, { repoRoot });
|
||||||
|
const nativePackage = importNativeRoadPackage(area);
|
||||||
|
const nativeRoadDir = nativePackage.rootDir;
|
||||||
|
const files = {};
|
||||||
|
for (const file of filesBelow(nativeRoadDir).sort()) {
|
||||||
|
const relative = path.relative(nativeRoadDir, file).split(path.sep).join("/");
|
||||||
|
const text = fs.readFileSync(file, "utf8");
|
||||||
|
files[relative] = jsonRecord(text, Buffer.byteLength(text));
|
||||||
|
}
|
||||||
|
if (fs.existsSync(area.outputs.nativeTrafficSignals)) {
|
||||||
|
const text = fs.readFileSync(area.outputs.nativeTrafficSignals, "utf8");
|
||||||
|
files["../native-traffic-signals.json"] = jsonRecord(text, Buffer.byteLength(text));
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
contract: "native-road-package/v1",
|
||||||
|
areaId: area.id,
|
||||||
|
files: Object.fromEntries(Object.keys(files).sort().map((file) => [file, files[file]])),
|
||||||
|
volatileExcluded: ["absolute paths -> <repo> or <external>", "native-road-* staging directory -> <staging>"],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function compare(actual, baseline) {
|
||||||
|
const differences = [];
|
||||||
|
if (actual.contract !== baseline.contract) differences.push(`contract: expected ${baseline.contract}, got ${actual.contract}`);
|
||||||
|
if (actual.areaId !== baseline.areaId) differences.push(`areaId: expected ${baseline.areaId}, got ${actual.areaId}`);
|
||||||
|
const names = new Set([...Object.keys(baseline.files || {}), ...Object.keys(actual.files || {})]);
|
||||||
|
for (const name of [...names].sort()) {
|
||||||
|
const expected = baseline.files?.[name];
|
||||||
|
const received = actual.files?.[name];
|
||||||
|
if (!expected) { differences.push(`${name}: unexpected file`); continue; }
|
||||||
|
if (!received) { differences.push(`${name}: missing file`); continue; }
|
||||||
|
for (const field of ["contentHash", "orderHash", "features", "bytes"]) {
|
||||||
|
if ((expected[field] ?? null) !== (received[field] ?? null)) {
|
||||||
|
differences.push(`${name}: ${field} expected ${expected[field] ?? "<none>"}, got ${received[field] ?? "<none>"}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return differences;
|
||||||
|
}
|
||||||
|
|
||||||
|
function writeJson(file, value) {
|
||||||
|
fs.mkdirSync(path.dirname(file), { recursive: true });
|
||||||
|
fs.writeFileSync(file, `${JSON.stringify(value, null, 2)}\n`);
|
||||||
|
}
|
||||||
|
|
||||||
|
function main() {
|
||||||
|
const args = parseArgs(process.argv.slice(2));
|
||||||
|
if (!args.config || Boolean(args.snapshot) === Boolean(args.compare)) throw new Error(usage());
|
||||||
|
const actual = snapshot(path.resolve(args.config));
|
||||||
|
if (args.snapshot) {
|
||||||
|
const output = path.resolve(args.snapshot);
|
||||||
|
writeJson(output, actual);
|
||||||
|
console.log(`ROAD_PARITY_SNAPSHOT ${JSON.stringify({ areaId: actual.areaId, output, files: Object.keys(actual.files).length })}`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const baseline = JSON.parse(fs.readFileSync(path.resolve(args.compare), "utf8"));
|
||||||
|
const differences = compare(actual, baseline);
|
||||||
|
if (differences.length) {
|
||||||
|
for (const difference of differences) console.error(`ROAD_PARITY_DIFF ${difference}`);
|
||||||
|
process.exitCode = 1;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
console.log(`ROAD_PARITY_OK ${JSON.stringify({ areaId: actual.areaId, baseline: path.resolve(args.compare), files: Object.keys(actual.files).length })}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (require.main === module) {
|
||||||
|
try {
|
||||||
|
main();
|
||||||
|
} catch (error) {
|
||||||
|
console.error(error.message);
|
||||||
|
process.exitCode = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { compare, snapshot };
|
||||||
+21
-160
@@ -1,173 +1,34 @@
|
|||||||
#!/usr/bin/env node
|
#!/usr/bin/env node
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const fs = require("fs");
|
|
||||||
const http = require("http");
|
|
||||||
const path = require("path");
|
|
||||||
const { execFileSync } = require("child_process");
|
const { execFileSync } = require("child_process");
|
||||||
|
const path = require("path");
|
||||||
const { readAreaConfig } = require("./lib/area-config");
|
const { readAreaConfig } = require("./lib/area-config");
|
||||||
const { loadOverrides, validateOverrides, writeJsonAtomic } = require("./lib/native-road");
|
const { parseArgs } = require("./compile-native-roads");
|
||||||
const { generate, validateDocument, runtime } = require("./lib/native-traffic-signals");
|
const { startWorkbench } = require("@osm-asset/road-compiler/workbench/server");
|
||||||
const { compileArea, parseArgs } = require("./compile-native-roads");
|
|
||||||
const { convertGeoJson } = require("./lib/gaode-junction-reference");
|
|
||||||
|
|
||||||
const repoRoot = path.resolve(__dirname, "..");
|
const repoRoot = path.resolve(__dirname, "..");
|
||||||
|
const args = parseArgs(process.argv.slice(2));
|
||||||
|
const configPath = path.resolve(args.config || path.join(repoRoot, "config", "areas", "nantaizi-lake-innovation-valley.json"));
|
||||||
|
const area = readAreaConfig(configPath, { repoRoot });
|
||||||
|
const port = Number(args.port || 8787);
|
||||||
|
|
||||||
function main() {
|
if (args.noCompile !== "true") compileFresh();
|
||||||
const args = parseArgs(process.argv.slice(2));
|
startWorkbench({
|
||||||
const configPath = path.resolve(args.config || path.join(repoRoot, "config", "areas", "nantaizi-lake-innovation-valley.json"));
|
area,
|
||||||
if (args.noCompile !== "true") compileArea(configPath);
|
configPath,
|
||||||
const area = readAreaConfig(configPath, { repoRoot });
|
repoRoot,
|
||||||
const junctionReference = args.junctionReference ? readJunctionReference(path.resolve(args.junctionReference)) : null;
|
readAreaConfig,
|
||||||
// `--debug` surfaces advisory compiler findings that have no geometry layer of
|
port,
|
||||||
// their own — currently the complex-junction candidates. Off by default so the
|
debug: args.debug === "true",
|
||||||
// normal editing view stays uncluttered.
|
junctionReference: args.junctionReference ? path.resolve(args.junctionReference) : null,
|
||||||
const debug = args.debug === "true";
|
compileFresh,
|
||||||
const port = Number(args.port || 8787);
|
});
|
||||||
if (!Number.isInteger(port) || port < 1024 || port > 65535) throw new Error("--port must be an integer in [1024, 65535].");
|
|
||||||
const server = http.createServer((request, response) => handle(request, response, area, configPath, junctionReference, debug));
|
|
||||||
server.on("error", (error) => {
|
|
||||||
console.error(`Road Workbench failed to listen: ${error.message}`);
|
|
||||||
process.exitCode = 1;
|
|
||||||
});
|
|
||||||
server.listen(port, "127.0.0.1", () => console.log(`Road Workbench: http://127.0.0.1:${port}/${debug ? " (debug: 复杂路口候选已开启)" : ""}`));
|
|
||||||
}
|
|
||||||
|
|
||||||
function handle(request, response, area, configPath, junctionReference, debug = false) {
|
function compileFresh() {
|
||||||
const url = new URL(request.url, "http://127.0.0.1");
|
|
||||||
if (request.method === "GET" && url.pathname === "/") return sendFile(response, path.join(repoRoot, "scripts", "workbench", "index.html"), "text/html; charset=utf-8");
|
|
||||||
if (request.method === "GET" && url.pathname === "/app.js") return sendFile(response, path.join(repoRoot, "scripts", "workbench", "app.js"), "text/javascript; charset=utf-8");
|
|
||||||
if (request.method === "GET" && url.pathname === "/app.css") return sendFile(response, path.join(repoRoot, "scripts", "workbench", "app.css"), "text/css; charset=utf-8");
|
|
||||||
if (request.method === "GET" && url.pathname.startsWith("/vendor/")) return sendVendorFile(response, url.pathname);
|
|
||||||
if (request.method === "GET" && url.pathname === "/api/state") return sendJson(response, 200, state(area, junctionReference, debug));
|
|
||||||
if (request.method === "POST" && url.pathname === "/api/traffic-signals") return readBody(request).then((body) => {
|
|
||||||
const document = validateDocument(body, fs.readFileSync(area.input, "utf8"));
|
|
||||||
writeJsonAtomic(area.outputs.nativeTrafficSignals, document);
|
|
||||||
sendJson(response, 200, { ok: true, trafficSignals: document, runtime: runtime(document) });
|
|
||||||
}).catch((error) => sendJson(response, 400, { ok: false, error: error.message }));
|
|
||||||
if (request.method === "POST" && url.pathname === "/api/traffic-signals/generate") return Promise.resolve().then(() => {
|
|
||||||
const compiled = readCompiled(area);
|
|
||||||
const generated = generate(fs.readFileSync(area.input, "utf8"), readLayer(path.join(area.outputs.nativeRoadDir, "layers", "vehicle_stop_lines.geojson")), readLayer(path.join(area.outputs.nativeRoadDir, "layers", "intersection_surface.geojson")));
|
|
||||||
const current = validateDocument(readJson(area.outputs.nativeTrafficSignals), fs.readFileSync(area.input, "utf8"));
|
|
||||||
const present = new Set(current.assemblies.features.map((feature) => feature.properties.signal_uid));
|
|
||||||
current.assemblies.features.push(...generated.assemblies.features.filter((feature) => !present.has(feature.properties.signal_uid)));
|
|
||||||
writeJsonAtomic(area.outputs.nativeTrafficSignals, current);
|
|
||||||
sendJson(response, 200, { ok: true, trafficSignals: current, runtime: runtime(current), generated: generated.assemblies.features.length, compiled: Boolean(compiled) });
|
|
||||||
}).catch((error) => sendJson(response, 400, { ok: false, error: error.message }));
|
|
||||||
if (request.method === "POST" && url.pathname === "/api/overrides") return readBody(request).then((body) => {
|
|
||||||
const compiled = readCompiled(area);
|
|
||||||
const overrides = validateOverrides(body, { roads: compiled.model.roads, endpoints: compiled.model.endpoints });
|
|
||||||
writeJsonAtomic(area.outputs.nativeRoadOverrides, overrides);
|
|
||||||
sendJson(response, 200, { ok: true, overrides });
|
|
||||||
}).catch((error) => sendJson(response, 400, { ok: false, error: error.message }));
|
|
||||||
if (request.method === "POST" && url.pathname === "/api/junction-clusters") return readBody(request).then((body) => {
|
|
||||||
if (!debug) throw new Error("该接口仅在 --debug 模式下可用。");
|
|
||||||
const added = addJunctionCluster(configPath, body, readCompiled(area));
|
|
||||||
compileFresh(configPath);
|
|
||||||
const refreshed = readAreaConfig(configPath, { repoRoot });
|
|
||||||
sendJson(response, 200, { ok: true, added, ...state(refreshed, junctionReference, debug) });
|
|
||||||
}).catch((error) => sendJson(response, 400, { ok: false, error: error.message }));
|
|
||||||
if (request.method === "POST" && url.pathname === "/api/compile") return Promise.resolve().then(() => {
|
|
||||||
compileFresh(configPath);
|
|
||||||
sendJson(response, 200, state(area, junctionReference));
|
|
||||||
}).catch((error) => sendJson(response, 500, { ok: false, error: error.message }));
|
|
||||||
sendJson(response, 404, { error: "Not found" });
|
|
||||||
}
|
|
||||||
|
|
||||||
function state(area, junctionReference = null, debug = false) {
|
|
||||||
const nativeDir = area.outputs.nativeRoadDir;
|
|
||||||
const osm2streetsRoadSurface = path.join(area.outputs.geojsonDir, "road_surface.geojson");
|
|
||||||
const trafficSignals = fs.existsSync(area.outputs.nativeTrafficSignals)
|
|
||||||
? validateDocument(readJson(area.outputs.nativeTrafficSignals), fs.readFileSync(area.input, "utf8"))
|
|
||||||
: { schema: "native-traffic-signals/v1", provenance: "empty", assemblies: { type: "FeatureCollection", features: [] } };
|
|
||||||
const trafficRuntime = runtime(trafficSignals);
|
|
||||||
const compiled = readCompiled(area);
|
|
||||||
return { areaId: area.id, debug: debug ? { junctionCandidates: junctionCandidates(compiled) } : null, compiled, overrides: loadOverrides(area.outputs.nativeRoadOverrides), trafficSignals, trafficRuntime, comparison: readJson(path.join(nativeDir, "comparison.json")), junctionReference, layers: { nativeRoadSurface: readLayer(path.join(nativeDir, "layers", "road_surface.geojson")), edgeLines: readLayer(path.join(nativeDir, "layers", "edge_lines.geojson")), nativeSidewalkSurface: readLayer(path.join(nativeDir, "layers", "sidewalk_surface.geojson")), nativeIntersectionSurface: readLayer(path.join(nativeDir, "layers", "intersection_surface.geojson")), laneCenterlines: readLayer(path.join(nativeDir, "layers", "lane_centerlines.geojson")), laneSeparators: readLayer(path.join(nativeDir, "layers", "lane_separators.geojson")), centerLines: readLayer(path.join(nativeDir, "layers", "center_lines.geojson")), directionArrows: readLayer(path.join(nativeDir, "layers", "direction_arrows.geojson")), turnArrows: readLayer(path.join(nativeDir, "layers", "turn_arrows.geojson")), crosswalks: readLayer(path.join(nativeDir, "layers", "crosswalks.geojson")), vehicleStopLines: readLayer(path.join(nativeDir, "layers", "vehicle_stop_lines.geojson")), connectors: readLayer(path.join(nativeDir, "layers", "connectors.geojson")), osm2streetsRoadSurface: fs.existsSync(osm2streetsRoadSurface) ? readLayer(osm2streetsRoadSurface) : null } };
|
|
||||||
}
|
|
||||||
// The compiler reports candidates as advisory diagnostics. Lift them into their
|
|
||||||
// own payload with a stable index so the map can label them "#1, #2, ..." and
|
|
||||||
// the inspector can offer a ready-to-paste cluster配置.
|
|
||||||
// Append one detected cluster to the hand-authored area config. The candidate
|
|
||||||
// must still be present in the latest compile, so a stale browser tab cannot
|
|
||||||
// write a cluster that no longer exists. The edited config is validated by the
|
|
||||||
// real loader before it replaces the file: an invalid write would break every
|
|
||||||
// later command, and the file is git-tracked so a bad accept stays revertible.
|
|
||||||
function addJunctionCluster(configPath, body, compiled) {
|
|
||||||
const index = Number(body?.index);
|
|
||||||
if (!Number.isInteger(index)) throw new Error("请求缺少候选编号 index。");
|
|
||||||
const candidate = junctionCandidates(compiled).find((item) => item.index === index);
|
|
||||||
if (!candidate) throw new Error(`候选 #${index} 不在最新一次编译结果里,请刷新页面后重试。`);
|
|
||||||
const raw = readJson(configPath);
|
|
||||||
const templates = raw.nativeRoad?.junctionTemplates;
|
|
||||||
if (!templates) throw new Error("区域配置缺少 nativeRoad.junctionTemplates,请先手工建立该节点。");
|
|
||||||
const clusters = Array.isArray(templates.clusters) ? templates.clusters : [];
|
|
||||||
const taken = new Set(clusters.flatMap((cluster) => (cluster.nodeIds || []).map(String)));
|
|
||||||
const clash = candidate.nodeIds.filter((nodeId) => taken.has(String(nodeId)));
|
|
||||||
if (clash.length) throw new Error(`节点 ${clash.join("、")} 已属于其他复杂路口配置。`);
|
|
||||||
const id = uniqueClusterId(`cluster-${candidate.nodeIds[0]}`, new Set(clusters.map((cluster) => cluster.id)));
|
|
||||||
const cluster = {
|
|
||||||
id,
|
|
||||||
template: candidate.template,
|
|
||||||
coreRadiusMeters: candidate.coreRadiusMeters,
|
|
||||||
cornerRadiusMeters: 12,
|
|
||||||
outerRadiusExtraMeters: 18,
|
|
||||||
nodeIds: candidate.nodeIds.map(String),
|
|
||||||
};
|
|
||||||
const next = { ...raw, nativeRoad: { ...raw.nativeRoad, junctionTemplates: { ...templates, enabled: true, clusters: [...clusters, cluster] } } };
|
|
||||||
const staging = `${configPath}.candidate-${process.pid}.json`;
|
|
||||||
fs.writeFileSync(staging, `${JSON.stringify(next, null, 2)}\n`);
|
|
||||||
try {
|
try {
|
||||||
readAreaConfig(staging, { repoRoot });
|
return execFileSync(process.execPath, [path.join(repoRoot, "scripts", "compile-native-roads.js"), "--config", configPath], { cwd: repoRoot, encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
fs.unlinkSync(staging);
|
throw new Error(`Native road compilation failed: ${String(error.stderr || error.stdout || error.message).trim()}`);
|
||||||
throw new Error(`写入后的配置无法通过校验,已放弃:${error.message}`);
|
|
||||||
}
|
|
||||||
fs.unlinkSync(staging);
|
|
||||||
writeJsonAtomic(configPath, next);
|
|
||||||
return cluster;
|
|
||||||
}
|
|
||||||
function uniqueClusterId(base, taken) {
|
|
||||||
if (!taken.has(base)) return base;
|
|
||||||
for (let suffix = 2; suffix < 100; suffix += 1) if (!taken.has(`${base}-${suffix}`)) return `${base}-${suffix}`;
|
|
||||||
throw new Error("无法生成唯一的 cluster id。");
|
|
||||||
}
|
|
||||||
|
|
||||||
function junctionCandidates(compiled) {
|
|
||||||
return (compiled?.diagnostics || [])
|
|
||||||
.filter((item) => item.rule === "complex-junction-candidate" && item.suggestedCluster)
|
|
||||||
.sort((first, second) => second.suggestedCluster.nodeCount - first.suggestedCluster.nodeCount || first.suggestedCluster.diameterMeters - second.suggestedCluster.diameterMeters)
|
|
||||||
.map((item, index) => ({ index: index + 1, id: item.id, message: item.message, coordinate: item.geometry?.coordinates || null, ...item.suggestedCluster }));
|
|
||||||
}
|
|
||||||
|
|
||||||
function compileFresh(configPath) {
|
|
||||||
try {
|
|
||||||
return execFileSync(process.execPath, [path.join(repoRoot, "scripts", "compile-native-roads.js"), "--config", configPath], {
|
|
||||||
cwd: repoRoot,
|
|
||||||
encoding: "utf8",
|
|
||||||
stdio: ["ignore", "pipe", "pipe"],
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
const detail = String(error.stderr || error.stdout || error.message || "native compilation failed").trim();
|
|
||||||
throw new Error(`Native road compilation failed: ${detail}`);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function readJunctionReference(file) {
|
|
||||||
if (!fs.existsSync(file)) throw new Error(`Junction reference not found: ${file}`);
|
|
||||||
const converted = convertGeoJson(JSON.parse(fs.readFileSync(file, "utf8")));
|
|
||||||
return { source: file, coordinateSystem: "GCJ-02", converted };
|
|
||||||
}
|
|
||||||
function readCompiled(area) { return readJson(path.join(area.outputs.nativeRoadDir, "compiled.json")); }
|
|
||||||
function readJson(file) { return JSON.parse(fs.readFileSync(file, "utf8")); }
|
|
||||||
function readLayer(file) { return fs.existsSync(file) ? readJson(file) : { type: "FeatureCollection", features: [] }; }
|
|
||||||
function readBody(request) { return new Promise((resolve, reject) => { let body = ""; request.setEncoding("utf8"); request.on("data", (part) => { body += part; if (body.length > 1024 * 1024) request.destroy(); }); request.on("end", () => { try { resolve(JSON.parse(body)); } catch (_) { reject(new Error("Request body must be JSON.")); } }); request.on("error", reject); }); }
|
|
||||||
function sendFile(response, file, type) { response.writeHead(200, { "Content-Type": type, "Cache-Control": "no-store" }); fs.createReadStream(file).pipe(response); }
|
|
||||||
function sendVendorFile(response, pathname) {
|
|
||||||
const match = /^\/vendor\/(ol|rbush|quickselect)\/(.+)$/.exec(pathname);
|
|
||||||
if (!match) return sendJson(response, 404, { error: "Not found" });
|
|
||||||
const root = path.join(repoRoot, "node_modules", match[1]);
|
|
||||||
const file = path.resolve(root, match[2]);
|
|
||||||
if (!file.startsWith(`${root}${path.sep}`) || !fs.existsSync(file) || !fs.statSync(file).isFile()) return sendJson(response, 404, { error: "Not found" });
|
|
||||||
return sendFile(response, file, file.endsWith(".css") ? "text/css; charset=utf-8" : "text/javascript; charset=utf-8");
|
|
||||||
}
|
|
||||||
function sendJson(response, status, value) { response.writeHead(status, { "Content-Type": "application/json; charset=utf-8", "Cache-Control": "no-store" }); response.end(`${JSON.stringify(value)}\n`); }
|
|
||||||
if (require.main === module) main();
|
|
||||||
Loaded 100 of 115 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user