From e83ae3b2a2ca9a2ab2c9f801a9ffa3895e0eb476 Mon Sep 17 00:00:00 2001
From: OpenAI Codex <codex@local>
Date: Tue, 31 Mar 2026 20:46:09 +0800
Subject: [PATCH] Restore red green light markers on 20nm compare

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

diff --git a/STEP_RECORD.md b/STEP_RECORD.md
index 43eb1e9..51f5d43 100644
--- a/STEP_RECORD.md
+++ b/STEP_RECORD.md
@@ -46,7 +46,7 @@ Remote: `ssh://git@nas:2222/tei/pbf.git`
 - 对比页必须保持左右联动和点击拾取功能可用
 - 对比页每次可见修改都必须 bump 版本号，并显示在“重新加载”按钮附近
 - 当前固定对比页版本号：
-  - `20nm-r6-20260331-2039`
+  - `20nm-r7-20260331-2044`
 - 这个版本号同时作为 style / tile reload 的 cache-busting 基准
 
 ## Detail PBF JP Field Inventory
@@ -311,6 +311,13 @@ Remote: `ssh://git@nas:2222/tei/pbf.git`
       - 灯塔/小灯/大量点图标明显恢复
     - 本轮用于机器复核的截图：
       - `/tmp/navsea-compare-r6.png`
+  - `r7` 版本修正：
+    - 用户确认“不要灯塔外圈，但红绿标识仍要保留”
+    - 因此前一轮把 `nav-light-flare` 和 `nav-light-arc` 一起关闭属于误伤
+    - 当前策略改为：
+      - 恢复 `nav-light-flare`
+      - 继续关闭 `nav-light-arc`
+    - 即保留红绿小标识，不恢复灯塔环/扇形
 
 线上已同步：
 
diff --git a/src/pbf/navsea-compare-karatsu-20nm.html b/src/pbf/navsea-compare-karatsu-20nm.html
index e3453a5..a928bca 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-r6-20260331-2039";
+    const COMPARE_VERSION = "20nm-r7-20260331-2044";
     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 c5cb3fa..29a9d3d 100644
--- a/src/pbf/style.navsea-delivery-karatsu-10nm.json
+++ b/src/pbf/style.navsea-delivery-karatsu-10nm.json
@@ -1324,8 +1324,9 @@
       "source": "navsea_delivery",
       "source-layer": "navigation_marks",
       "layout": {
-        "visibility": "none",
         "icon-allow-overlap": true,
+        "icon-ignore-placement": true,
+        "icon-size": 1.0,
         "icon-image": [
           "match",
           [