tei/pbf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore 20nm final detail symbols

Browse Source
This commit is contained in:
OpenAI Codex
2026-04-01 10:37:19 +08:00
parent 36f3a2f2f4
commit 60013fa9ad
5 changed files with 241 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
STEP_RECORD.md
View File

@@ -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： 当前页面支持 2 个 profile，但仍是同一张 HTML：
1. 唐津 20 海里 1. 唐津 20 海里
- `Style: karatsu-final-style-r1-20260401-0115 (style.navsea-delivery-karatsu-20nm-final.json)` - `Style: karatsu-final-style-r2-20260401-0248 (style.navsea-delivery-karatsu-20nm-final.json)`
- `PBF: karatsu-final-pbf-20nm-20260401-0115 (pbf-delivery-karatsu-20nm-final)` - `PBF: karatsu-final-pbf-20nm-20260401-0248 (pbf-delivery-karatsu-20nm-final)`
2. 九州 2. 九州
- `Style: kyushu-style-r1-20260331-2205 (style.navsea-delivery-kyushu.json)` - `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) - [`navsea_minimize_release_tiles.py`](/root/sourceserver/pbf/navsea_minimize_release_tiles.py)
当前 final candidate 只保留 `18` 个字段： 当前 final candidate 只保留 `20` 个字段：
- `canonical_object_type` - `canonical_object_type`
- `class_code`
- `chart_fill_pattern` - `chart_fill_pattern`
- `chart_fill_style` - `chart_fill_style`
- `chart_icon_image` - `chart_icon_image`
@@ -98,6 +99,7 @@ Remote: `ssh://git@nas:2222/tei/pbf.git`
- `chart_text_color` - `chart_text_color`
- `chart_text_style` - `chart_text_style`
- `depth_value_m` - `depth_value_m`
- `display_code`
- `least_depth_m` - `least_depth_m`
- `light_color_code` - `light_color_code`
- `light_sector_mode` - `light_sector_mode`
@@ -113,13 +115,16 @@ Remote: `ssh://git@nas:2222/tei/pbf.git`
- 原始 `20nm delivery` 大小: - 原始 `20nm delivery` 大小:
- `29,527,981` bytes - `29,527,981` bytes
- final candidate 大小: - final candidate 大小:
- `23,988,432` bytes - `24,470,260` bytes
- 压缩幅度约: - 压缩幅度约:
- `18.8%` - `17.1%`
当前判断： 当前判断：
- 这版已经满足“字段显著裁剪” - 这版已经满足“字段显著裁剪”
- 为了恢复危险物和灯标/浮标细节，重新带回了：
- `class_code`
- `display_code`
- 但当前 AOI 图像审计仍显示大差异 - 但当前 AOI 图像审计仍显示大差异
- 所以它目前只能算 `final release candidate` - 所以它目前只能算 `final release candidate`
- 还不能直接认定为稳定最终版 - 还不能直接认定为稳定最终版

2
navsea_minimize_release_tiles.py
View File

@@ -10,6 +10,7 @@ from mapbox_vector_tile.Mapbox import vector_tile_pb2
FINAL_RELEASE_PROPERTY_ALLOWLIST = frozenset( FINAL_RELEASE_PROPERTY_ALLOWLIST = frozenset(
{ {
"canonical_object_type", "canonical_object_type",
"class_code",
"chart_fill_pattern", "chart_fill_pattern",
"chart_fill_style", "chart_fill_style",
"chart_icon_image", "chart_icon_image",
@@ -22,6 +23,7 @@ FINAL_RELEASE_PROPERTY_ALLOWLIST = frozenset(
"chart_text_color", "chart_text_color",
"chart_text_style", "chart_text_style",
"depth_value_m", "depth_value_m",
"display_code",
"least_depth_m", "least_depth_m",
"light_color_code", "light_color_code",
"light_sector_mode", "light_sector_mode",

4
navsea_tile_builder.py
View File

@@ -55,6 +55,7 @@ LIGHT_COLOR_REMARK_MAP = {
FINAL_RELEASE_PROPERTY_ALLOWLIST = frozenset( FINAL_RELEASE_PROPERTY_ALLOWLIST = frozenset(
{ {
"canonical_object_type", "canonical_object_type",
"class_code",
"chart_fill_pattern", "chart_fill_pattern",
"chart_fill_style", "chart_fill_style",
"chart_icon_image", "chart_icon_image",
@@ -67,6 +68,7 @@ FINAL_RELEASE_PROPERTY_ALLOWLIST = frozenset(
"chart_text_color", "chart_text_color",
"chart_text_style", "chart_text_style",
"depth_value_m", "depth_value_m",
"display_code",
"least_depth_m", "least_depth_m",
"light_color_code", "light_color_code",
"light_sector_mode", "light_sector_mode",
@@ -880,6 +882,8 @@ class NavSeaTileBuilder:
if not self.strip_legacy_japanese_delivery: if not self.strip_legacy_japanese_delivery:
normalized[key] = value 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: if rule.keep_in_delivery:
normalized[rule.field_name_std] = value normalized[rule.field_name_std] = value

6
src/pbf/navsea-compare-karatsu-20nm.html
View File

@@ -314,7 +314,7 @@
<script src="https://unpkg.com/maplibre-gl@4.7.1/dist/maplibre-gl.js"></script> <script src="https://unpkg.com/maplibre-gl@4.7.1/dist/maplibre-gl.js"></script>
<script> <script>
const HTML_VERSION = "compare-r11-20260401-0115"; const HTML_VERSION = "compare-r12-20260401-0248";
const ORIGINAL_STYLE_URL = "./style.json"; const ORIGINAL_STYLE_URL = "./style.json";
const ORIGINAL_TILE_URL = "http://192.168.200.184/newpec/exported_auto/tile.mapple-on.jp__newpec-mvt-20260106__z___x___y_.pbf/tiles/{z}/{x}/{y}.pbf"; const ORIGINAL_TILE_URL = "http://192.168.200.184/newpec/exported_auto/tile.mapple-on.jp__newpec-mvt-20260106__z___x___y_.pbf/tiles/{z}/{x}/{y}.pbf";
const PROFILES = { const PROFILES = {
@@ -325,8 +325,8 @@
deliveryPaneLabel: "最终 release style + 唐津 20 海里 final PBF", deliveryPaneLabel: "最终 release style + 唐津 20 海里 final PBF",
deliveryStyleUrl: "./domain/style.navsea-delivery-karatsu-20nm-final.json", deliveryStyleUrl: "./domain/style.navsea-delivery-karatsu-20nm-final.json",
deliveryTileUrl: "http://192.168.200.184/pbf-delivery-karatsu-20nm-final/{z}/{x}/{y}.pbf", deliveryTileUrl: "http://192.168.200.184/pbf-delivery-karatsu-20nm-final/{z}/{x}/{y}.pbf",
deliveryStyleVersion: "karatsu-final-style-r1-20260401-0115", deliveryStyleVersion: "karatsu-final-style-r2-20260401-0248",
deliveryPbfVersion: "karatsu-final-pbf-20nm-20260401-0115", deliveryPbfVersion: "karatsu-final-pbf-20nm-20260401-0248",
deliveryStyleFile: "style.navsea-delivery-karatsu-20nm-final.json", deliveryStyleFile: "style.navsea-delivery-karatsu-20nm-final.json",
deliveryPbfName: "pbf-delivery-karatsu-20nm-final", deliveryPbfName: "pbf-delivery-karatsu-20nm-final",
initialView: { initialView: {

223
src/pbf/style.navsea-delivery-karatsu-20nm-final.json
View File

@@ -1301,7 +1301,80 @@
"icon-allow-overlap": true, "icon-allow-overlap": true,
"icon-ignore-placement": true, "icon-ignore-placement": true,
"icon-size": 1.08, "icon-size": 1.08,
"icon-image": "symbol-daytime-428" "icon-image": [
"case",
[
"has",
"class_code"
],
[
"match",
[
"get",
"class_code"
],
401,
"symbol-daytime-401",
402,
"symbol-daytime-401",
403,
"symbol-daytime-401",
404,
"symbol-daytime-404",
405,
"symbol-daytime-405",
409,
"symbol-daytime-409",
410,
"symbol-daytime-410",
412,
"symbol-daytime-412",
413,
"symbol-daytime-413",
415,
"symbol-daytime-413",
420,
"symbol-daytime-420",
421,
"symbol-daytime-421",
422,
"symbol-daytime-422",
424,
"symbol-daytime-424",
425,
"symbol-daytime-425",
427,
"symbol-daytime-427",
428,
"symbol-daytime-428",
429,
"symbol-daytime-429",
431,
"symbol-daytime-431",
432,
"symbol-daytime-432",
433,
"symbol-daytime-433",
434,
"symbol-daytime-434",
[
"coalesce",
[
"get",
"chart_icon_image"
],
"symbol-daytime-428"
]
],
[
"coalesce",
[
"get",
"chart_icon_image"
],
"symbol-daytime-428"
]
]
}, },
"filter": [ "filter": [
"match", "match",
@@ -1505,7 +1578,54 @@
"icon-allow-overlap": true, "icon-allow-overlap": true,
"icon-ignore-placement": true, "icon-ignore-placement": true,
"icon-size": 1.08, "icon-size": 1.08,
"icon-image": "symbol-daytime-310" "icon-image": [
"case",
[
"has",
"display_code"
],
[
"match",
[
"get",
"display_code"
],
"31100002",
"symbol-daytime-310",
"31100004",
"symbol-daytime-310",
"31135001",
"symbol-daytime-311350",
"31135102",
"symbol-daytime-311351",
"31135400",
"symbol-daytime-311354",
"31135404",
"symbol-daytime-311354",
"31135504",
"symbol-daytime-311355",
"31135604",
"symbol-daytime-311356",
"31135701",
"symbol-daytime-311357",
"31135704",
"symbol-daytime-311357",
"31135800",
"symbol-daytime-311358",
"31135804",
"symbol-daytime-311358",
"31135900",
"symbol-daytime-311359",
"31135904",
"symbol-daytime-311359",
"31136003",
"symbol-daytime-311360",
"31136004",
"symbol-daytime-311360",
"symbol-daytime-310"
],
"symbol-daytime-310"
]
}, },
"filter": [ "filter": [
"==", "==",
@@ -1527,6 +1647,105 @@
"icon-size": 1.08, "icon-size": 1.08,
"icon-image": [ "icon-image": [
"case", "case",
[
"has",
"display_code"
],
[
"match",
[
"get",
"display_code"
],
"31200001",
"symbol-daytime-327",
"31200003",
"symbol-daytime-327",
"31235001",
"symbol-daytime-312350",
"31235004",
"symbol-daytime-312350",
"31235102",
"symbol-daytime-312351",
"31235404",
"symbol-daytime-312354",
"31235504",
"symbol-daytime-312355",
"31235604",
"symbol-daytime-312356",
"31235704",
"symbol-daytime-312357",
"31235804",
"symbol-daytime-312358",
"31235904",
"symbol-daytime-312359",
"31236003",
"symbol-daytime-312360",
"31236004",
"symbol-daytime-312360",
"31236302",
"symbol-daytime-313362",
"31236303",
"symbol-daytime-313362",
"31300000",
"symbol-daytime-327",
"31300001",
"symbol-daytime-327",
"31300002",
"symbol-daytime-327",
"31300003",
"symbol-daytime-327",
"31300004",
"symbol-daytime-327",
"31300010",
"symbol-daytime-327",
"31336300",
"symbol-daytime-313362",
"32300000",
"symbol-daytime-323",
"32300001",
"symbol-daytime-323",
"32300002",
"symbol-daytime-323",
"32300003",
"symbol-daytime-323",
"32300004",
"symbol-daytime-323",
"32500000",
"symbol-daytime-325",
"32500001",
"symbol-daytime-325",
"32500002",
"symbol-daytime-325",
"32500003",
"symbol-daytime-325",
"32500004",
"symbol-daytime-325",
"32700000",
"symbol-daytime-327",
"32700001",
"symbol-daytime-327",
"32700002",
"symbol-daytime-327",
"32700003",
"symbol-daytime-327",
"32700004",
"symbol-daytime-327",
"32800001",
"symbol-daytime-327",
"32800002",
"symbol-daytime-327",
"32800003",
"symbol-daytime-327",
[
"coalesce",
[
"get",
"chart_icon_image"
],
""
]
],
[ [
"==", "==",
[ [