From e6dd4bdbe85a00d7965124af05b799d49b5fd872 Mon Sep 17 00:00:00 2001
From: OpenAI Codex <codex@local>
Date: Tue, 31 Mar 2026 20:40:55 +0800
Subject: [PATCH] Fix delivery sprite source for 20nm compare

---
 STEP_RECORD.md                                |  13 +-
 src/pbf/navsea-compare-karatsu-20nm.html      |   2 +-
 .../style.navsea-delivery-karatsu-10nm.json   | 174 +++++++++++++++++-
 3 files changed, 184 insertions(+), 5 deletions(-)

diff --git a/STEP_RECORD.md b/STEP_RECORD.md
index 4de7b62..43eb1e9 100644
--- a/STEP_RECORD.md
+++ b/STEP_RECORD.md
@@ -46,7 +46,7 @@ Remote: `ssh://git@nas:2222/tei/pbf.git`
 - 对比页必须保持左右联动和点击拾取功能可用
 - 对比页每次可见修改都必须 bump 版本号，并显示在“重新加载”按钮附近
 - 当前固定对比页版本号：
-  - `20nm-r4-20260331-1722`
+  - `20nm-r6-20260331-2039`
 - 这个版本号同时作为 style / tile reload 的 cache-busting 基准
 
 ## Detail PBF JP Field Inventory
@@ -300,6 +300,17 @@ Remote: `ssh://git@nas:2222/tei/pbf.git`
     - 即不再显示灯塔外侧的环/扇形
     - `nav-marks / anchor-hazard-points / hazard-points` 增加 `icon-ignore-placement`
     - 目的：优先保证灯塔、小灯和碍航点符号本体出图
+  - `r6` 版本关键修复：
+    - render-based 对比确认：右侧大面积 icon 缺失不是肉眼误判
+    - 根因定位为 delivery style 的 sprite 与左侧原始版不一致
+    - 左侧线上原始样式使用：
+      - `https://tile.mapple-on.jp/newpec-symbols-20251001/sprite`
+    - 右侧 delivery style 原先使用本地：
+      - `http://192.168.200.184/newpec/sprite/sprite?v=111`
+    - 将 delivery style 的 sprite 切到与左侧同一套后，`r6` 渲染截图已确认：
+      - 灯塔/小灯/大量点图标明显恢复
+    - 本轮用于机器复核的截图：
+      - `/tmp/navsea-compare-r6.png`
 
 线上已同步：
 
diff --git a/src/pbf/navsea-compare-karatsu-20nm.html b/src/pbf/navsea-compare-karatsu-20nm.html
index 4be1a69..e3453a5 100644
--- a/src/pbf/navsea-compare-karatsu-20nm.html
+++ b/src/pbf/navsea-compare-karatsu-20nm.html
@@ -305,7 +305,7 @@
 
   <script src="https://unpkg.com/maplibre-gl@4.7.1/dist/maplibre-gl.js"></script>
   <script>
-    const COMPARE_VERSION = "20nm-r4-20260331-1722";
+    const COMPARE_VERSION = "20nm-r6-20260331-2039";
     const ORIGINAL_STYLE_URL = "./style.json";
     const DELIVERY_STYLE_URL = "./domain/style.navsea-delivery-karatsu-10nm.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";
diff --git a/src/pbf/style.navsea-delivery-karatsu-10nm.json b/src/pbf/style.navsea-delivery-karatsu-10nm.json
index 6495147..c5cb3fa 100644
--- a/src/pbf/style.navsea-delivery-karatsu-10nm.json
+++ b/src/pbf/style.navsea-delivery-karatsu-10nm.json
@@ -1,7 +1,7 @@
 {
   "version": 8,
   "name": "NavSea Delivery Karatsu 10nm",
-  "sprite": "http://192.168.200.184/newpec/sprite/sprite?v=111",
+  "sprite": "https://tile.mapple-on.jp/newpec-symbols-20251001/sprite",
   "glyphs": "http://192.168.200.184/newpec/fonts/{fontstack}/{range}.pbf",
   "sources": {
     "mapple": {
@@ -1263,7 +1263,60 @@
           ],
           ""
         ]
-      }
+      },
+      "filter": [
+        "all",
+        [
+          "!=",
+          [
+            "get",
+            "chart_symbol_code"
+          ],
+          "obstruction"
+        ],
+        [
+          "!=",
+          [
+            "get",
+            "chart_symbol_code"
+          ],
+          "hazard_mark"
+        ],
+        [
+          "!=",
+          [
+            "get",
+            "chart_symbol_code"
+          ],
+          "fish_reef"
+        ]
+      ]
+    },
+    {
+      "id": "anchor-hazard-points-428",
+      "type": "symbol",
+      "source": "navsea_delivery",
+      "source-layer": "anchor_caution_hazard_point",
+      "layout": {
+        "icon-allow-overlap": true,
+        "icon-ignore-placement": true,
+        "icon-size": 1.08,
+        "icon-image": "symbol-daytime-428"
+      },
+      "filter": [
+        "match",
+        [
+          "get",
+          "chart_symbol_code"
+        ],
+        "obstruction",
+        true,
+        "hazard_mark",
+        true,
+        "fish_reef",
+        true,
+        false
+      ]
     },
     {
       "id": "nav-light-flare",
@@ -1382,6 +1435,86 @@
         ]
       ]
     },
+    {
+      "id": "nav-marks-harbor-lighthouses",
+      "type": "symbol",
+      "source": "navsea_delivery",
+      "source-layer": "navigation_marks",
+      "layout": {
+        "icon-allow-overlap": true,
+        "icon-ignore-placement": true,
+        "icon-size": 1.08,
+        "icon-image": "symbol-daytime-301"
+      },
+      "filter": [
+        "==",
+        [
+          "get",
+          "canonical_object_type"
+        ],
+        "港湾灯台"
+      ]
+    },
+    {
+      "id": "nav-marks-breakwater-lighthouses",
+      "type": "symbol",
+      "source": "navsea_delivery",
+      "source-layer": "navigation_marks",
+      "layout": {
+        "icon-allow-overlap": true,
+        "icon-ignore-placement": true,
+        "icon-size": 1.08,
+        "icon-image": "symbol-daytime-302"
+      },
+      "filter": [
+        "==",
+        [
+          "get",
+          "canonical_object_type"
+        ],
+        "防波堤灯台"
+      ]
+    },
+    {
+      "id": "nav-marks-small-lights",
+      "type": "symbol",
+      "source": "navsea_delivery",
+      "source-layer": "navigation_marks",
+      "layout": {
+        "icon-allow-overlap": true,
+        "icon-ignore-placement": true,
+        "icon-size": 1.08,
+        "icon-image": "symbol-daytime-303"
+      },
+      "filter": [
+        "==",
+        [
+          "get",
+          "canonical_object_type"
+        ],
+        "灯 (Lt)"
+      ]
+    },
+    {
+      "id": "nav-marks-light-beacons",
+      "type": "symbol",
+      "source": "navsea_delivery",
+      "source-layer": "navigation_marks",
+      "layout": {
+        "icon-allow-overlap": true,
+        "icon-ignore-placement": true,
+        "icon-size": 1.08,
+        "icon-image": "symbol-daytime-310"
+      },
+      "filter": [
+        "==",
+        [
+          "get",
+          "canonical_object_type"
+        ],
+        "灯標"
+      ]
+    },
     {
       "id": "nav-marks",
       "type": "symbol",
@@ -1438,7 +1571,42 @@
             ""
           ]
         ]
-      }
+      },
+      "filter": [
+        "all",
+        [
+          "!=",
+          [
+            "get",
+            "canonical_object_type"
+          ],
+          "港湾灯台"
+        ],
+        [
+          "!=",
+          [
+            "get",
+            "canonical_object_type"
+          ],
+          "防波堤灯台"
+        ],
+        [
+          "!=",
+          [
+            "get",
+            "canonical_object_type"
+          ],
+          "灯 (Lt)"
+        ],
+        [
+          "!=",
+          [
+            "get",
+            "canonical_object_type"
+          ],
+          "灯標"
+        ]
+      ]
     },
     {
       "id": "facility-points",