#702 Enhance branch layout for SHMetro 2020&2024 style#775
Open
Unnamed2964 wants to merge 7 commits intorailmapgen:mainfrom
Open
#702 Enhance branch layout for SHMetro 2020&2024 style#775Unnamed2964 wants to merge 7 commits intorailmapgen:mainfrom
Unnamed2964 wants to merge 7 commits intorailmapgen:mainfrom
Conversation
Contributor
Author
|
疏忽大意了...我发现支线朝右的情况有问题，需要修复一下 |
Contributor
Author
|
现在修好了 
|
Contributor
Author
|
由于修改了数据格式（添加了两个字段），所以可能需要算作一个新的版本号 |
Member
|
抱歉我还需要一些时间才能来审阅这一和并请求 :( |
Contributor
Author
|
理解的 |
Unnamed2964
force-pushed
the
fix/shmetro-2020-branch-drawing
branch
from
de239f9 to
bb2f1b6
Compare
Contributor
Author
- getStnState: promote parallel branch stations to state=1 when their forward junction is ahead of current station - drawLine: guard against empty linePassStns array - _linePath: gate main-path terminal caps on stnStates===1 to prevent coloring caps at current station - _linePath: unify bifurcate section (remove redundant direction branches) - coline-shmetro: fix _linePath call signature after stnStates param insert - Add unit tests for getStnState and drawLine
Unnamed2964
force-pushed
the
fix/shmetro-2020-branch-drawing
branch
from
5136faa to
d59dd4f
Compare
Contributor
Author
|
混进去了一些和本pr无关的提交，rebase分开了 |
Unnamed2964
changed the title
Unnamed2964
force-pushed
the
fix/shmetro-2020-branch-drawing
branch
from
2e50cbb to
7673099
Compare
Contributor
Author
|
匹配上海地铁11号线站台屏蔽门上方线路图（下图为本人拍摄），添加了45度支线，以及站点较少分支的第一个站点是否和站点较多分支的第一个站点对齐作为选项 |
Contributor
Author
|
…nch_info Consolidate two separate top-level RMGParam fields into a single generic branch_info object, following the same pattern as loop_info: - spacing_pct (was: top-level branchSpacingPct) - distance_factor (was: shmetro2020_info.branch_distance_factor) - first_station_offset (was: shmetro2020_info.branch_first_station_offset) - bend_type (was: shmetro2020_info.branch_bend_type) - align_endpoints (was: shmetro2020_info.branch_align_endpoints) The field name no longer encodes a specific style, making the layout controls reusable for future styles beyond SHMetro 2020. Migration in param-updater-utils reads the legacy branchSpacingPct value and writes it into branch_info.spacing_pct, then deletes the old key.
Contributor
Author
|
嗯，重命名和合并了一下分支相关的字段结构 |
Contributor
Author
|
关于45度支线，之后我有空考虑一下设为只适用于上海地铁2024版 |
Contributor
Author
|
可能空心“列车前进方向”也只适用于2020版，有空我找一下资料对比 |
…(UI hides 45° unless sh2024; runtime falls back to rightangle)
Unnamed2964
changed the title
Contributor
Author
|
现在把45度支线设为了只适用于sh2024 |
…w colored for others
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Partly resolve #702.
本 PR 对上海地铁 2020 样式（sh2020）的分支线绘制逻辑进行了优化，新增两个可调参数：
此外还将方向箭头改为空心样式，在共线模式下使用黑色描边。
其他说明
本功能代码主要由 Claude Opus 4.5 辅助生成。
代码有经过人工审查。
如下图所示（本人拍摄），虽然 2020 版线路图处理分岔的一种情况是 #702 中所示的，但也的确存在从分岔点开始立刻分岔的画法，所以应该给予用户可调节参数。
