From 60013fa9ad442645e5f7499737761bf994361083 Mon Sep 17 00:00:00 2001 From: OpenAI Codex Date: Wed, 1 Apr 2026 10:37:19 +0800 Subject: [PATCH] Restore 20nm final detail symbols --- STEP_RECORD.md | 17 +- navsea_minimize_release_tiles.py | 2 + navsea_tile_builder.py | 4 + src/pbf/navsea-compare-karatsu-20nm.html | 6 +- ...le.navsea-delivery-karatsu-20nm-final.json | 223 +++++++++++++++++- 5 files changed, 241 insertions(+), 11 deletions(-) diff --git a/STEP_RECORD.md b/STEP_RECORD.md index cf4d873..b244d2c 100644 --- a/STEP_RECORD.md +++ b/STEP_RECORD.md @@ -12,13 +12,13 @@ Remote: `ssh://git@nas:2222/tei/pbf.git` 当前页面版本体系： -- `HTML: compare-r11-20260401-0115` +- `HTML: compare-r12-20260401-0248` 当前页面支持 2 个 profile，但仍是同一张 HTML： 1. 唐津 20 海里 - - `Style: karatsu-final-style-r1-20260401-0115 (style.navsea-delivery-karatsu-20nm-final.json)` - - `PBF: karatsu-final-pbf-20nm-20260401-0115 (pbf-delivery-karatsu-20nm-final)` + - `Style: karatsu-final-style-r2-20260401-0248 (style.navsea-delivery-karatsu-20nm-final.json)` + - `PBF: karatsu-final-pbf-20nm-20260401-0248 (pbf-delivery-karatsu-20nm-final)` 2. 九州 - `Style: kyushu-style-r1-20260331-2205 (style.navsea-delivery-kyushu.json)` @@ -83,9 +83,10 @@ Remote: `ssh://git@nas:2222/tei/pbf.git` - 脚本： - [`navsea_minimize_release_tiles.py`](/root/sourceserver/pbf/navsea_minimize_release_tiles.py) -当前 final candidate 只保留 `18` 个字段： +当前 final candidate 只保留 `20` 个字段： - `canonical_object_type` +- `class_code` - `chart_fill_pattern` - `chart_fill_style` - `chart_icon_image` @@ -98,6 +99,7 @@ Remote: `ssh://git@nas:2222/tei/pbf.git` - `chart_text_color` - `chart_text_style` - `depth_value_m` +- `display_code` - `least_depth_m` - `light_color_code` - `light_sector_mode` @@ -113,13 +115,16 @@ Remote: `ssh://git@nas:2222/tei/pbf.git` - 原始 `20nm delivery` 大小: - `29,527,981` bytes - final candidate 大小: - - `23,988,432` bytes + - `24,470,260` bytes - 压缩幅度约: - - `18.8%` + - `17.1%` 当前判断： - 这版已经满足“字段显著裁剪” +- 为了恢复危险物和灯标/浮标细节，重新带回了： + - `class_code` + - `display_code` - 但当前 AOI 图像审计仍显示大差异 - 所以它目前只能算 `final release candidate` - 还不能直接认定为稳定最终版 diff --git a/navsea_minimize_release_tiles.py b/navsea_minimize_release_tiles.py index b629dd6..0512d8f 100644 --- a/navsea_minimize_release_tiles.py +++ b/navsea_minimize_release_tiles.py @@ -10,6 +10,7 @@ from mapbox_vector_tile.Mapbox import vector_tile_pb2 FINAL_RELEASE_PROPERTY_ALLOWLIST = frozenset( { "canonical_object_type", + "class_code", "chart_fill_pattern", "chart_fill_style", "chart_icon_image", @@ -22,6 +23,7 @@ FINAL_RELEASE_PROPERTY_ALLOWLIST = frozenset( "chart_text_color", "chart_text_style", "depth_value_m", + "display_code", "least_depth_m", "light_color_code", "light_sector_mode", diff --git a/navsea_tile_builder.py b/navsea_tile_builder.py index 84db77b..5a2a3d8 100644 --- a/navsea_tile_builder.py +++ b/navsea_tile_builder.py @@ -55,6 +55,7 @@ LIGHT_COLOR_REMARK_MAP = { FINAL_RELEASE_PROPERTY_ALLOWLIST = frozenset( { "canonical_object_type", + "class_code", "chart_fill_pattern", "chart_fill_style", "chart_icon_image", @@ -67,6 +68,7 @@ FINAL_RELEASE_PROPERTY_ALLOWLIST = frozenset( "chart_text_color", "chart_text_style", "depth_value_m", + "display_code", "least_depth_m", "light_color_code", "light_sector_mode", @@ -880,6 +882,8 @@ class NavSeaTileBuilder: if not self.strip_legacy_japanese_delivery: normalized[key] = value + if self.release_minimal and rule.field_name_std in {"class_code", "display_code"}: + normalized[rule.field_name_std] = value if rule.keep_in_delivery: normalized[rule.field_name_std] = value diff --git a/src/pbf/navsea-compare-karatsu-20nm.html b/src/pbf/navsea-compare-karatsu-20nm.html index 050a560..646fa50 100644 --- a/src/pbf/navsea-compare-karatsu-20nm.html +++ b/src/pbf/navsea-compare-karatsu-20nm.html @@ -314,7 +314,7 @@