Upload folder using huggingface_hub

README.md

@@ -11,7 +11,7 @@ license: mit
 
 # SetVL Node Graph Viewer
 
-只读浏览 SetVL-480K 全库的 node graph：**12,250 个场景、119,996 个节点、108,374 条边**。
+只读浏览 SetVL-480K 全库的 node graph：**12,250 个场景、119,996 个节点、120,363 条边**（策略 `merged_policy_0915`）。
 
 界面与本地的标注复核台一致——三栏布局、J/K 键盘导航、卫星图/电子地图切换、
 邻接矩阵、街景放大。区别是**去掉了全部写入**：没有判定按钮，后端也没有对应接口。
@@ -19,17 +19,21 @@ license: mit
 ## 怎么看
 
 - **左栏**：全库场景浏览。可按城市、scene_id、最少节点数筛选，
-  也可只看含孤儿 / 含高花费边 / 路网碎片化的场景。`J`/`K` 上下，`[`/`]` 翻页。
-- **中栏**：卫星底图上叠出图结构。节点按所属走廊着色，红圈是孤儿；
-  边按来源着色——<span style="color:#68c8c0">青=走廊链</span>、
-  <span style="color:#f1a43c">橙=路口边</span>、
-  <span style="color:#b8a2e0">紫=桥接边</span>，白色加粗虚线=高花费边。
+  也可只看含孤儿节点 / 含带标记的边的场景，或按 §1-§4 的边类筛。
+  `J`/`K` 上下，`[`/`]` 翻页。
+- **中栏**：卫星底图上叠出图结构。节点按所属走廊着色，红圈是孤儿（§6）；
+  边按 §1-§4 的四类着色——
+  <span style="color:#6ba8e8">蓝 = §1 同走廊相邻</span>、
+  <span style="color:#68c8a0">绿 = §2 路网可达</span>、
+  <span style="color:#f1a43c">橙 = §3 短直连</span>、
+  <span style="color:#e8646b">红 = §4 分量合并</span>。
   `B` 切换电子地图，`E` 切换沿路走线/直线。
 - **右栏**：选中节点或边的完整属性与自动判定信号。
-- **街景朝向**：每个 pano 有 4 张街景，图下方一排按钮按罗盘顺时针列出
-  （`NE 40°`、`SE 130°`…），点一下换朝向。`H` 键下一个、`Shift`+`H` 上一个；
-  选中一条边时两侧会同步翻，方便对同朝向比较。
+- **街景**：每个 pano 的 4 个朝向**同时显示**在一个 2×2 方格里，各自标出
+  方位（`NE 40°`、`SE 130°`…，按正北起顺时针排）。不用点任何按钮就能看全一个
+  路口。鼠标悬在某张图上，中栏地图里对应的那支箭头会同步放大；反过来悬在
+  箭头上也会点亮那张图。点图放大，`H` 键依次放大看。
 
 图片存在配套的私有 Dataset 里，由 CDN 按需分发。
 
-建图规则见 `GRAPH_RULES.md`（在源仓库里，**不随本 Space 一起上传**）。
+建图规则见 `merged_policy_0915.md`（在源仓库里，**不随本 Space 一起上传**）。

app.py

@@ -119,21 +119,18 @@ def effective(nodes: List[Dict], edges: List[Dict]) -> None:
         o = n["is_orphan_human"]
         n["is_orphan"] = int(o) if o is not None else (n["is_orphan_auto"] or 0)
         n["corridor_overridden"] = n["corridor_id_human"] is not None
-        n["triage_signals"] = _loads(n["triage_signals_auto"]) or []
+        n["corridor_ids"] = _loads(n["corridor_ids_auto"]) or []
     for e in edges:
-        e["origin"] = e["origin_human"] or e["origin_auto"] or "bridge"
+        e["origin"] = e["origin_human"] or e["origin_auto"] or "manual"
         rc = e["road_connected_human"]
         e["road_connected"] = int(rc) if rc is not None else (e["road_connected_auto"] or 0)
-        hc = e["high_cost_human"]
-        e["high_cost"] = int(hc) if hc is not None else (e["high_cost_auto"] or 0)
-        e["cost_class"] = e["cost_class_auto"]
         e["verdict"] = e["edge_verdict_human"]
         e["in_graph"] = e["edge_verdict_human"] != "reject"
         e["is_manual"] = e["origin_human"] == "manual" or e["origin_auto"] is None
         e["origin_overridden"] = e["origin_human"] is not None
         e["road_path"] = _loads(e["road_path_auto"])
         e["evidence"] = _loads(e["evidence_auto"])
-        e["triage_signals"] = _loads(e["triage_signals_auto"]) or []
+        e["notes"] = _loads(e["notes_auto"]) or []
         e["review_status"] = e["review_status_human"] or "unreviewed"
 
 
@@ -178,9 +175,11 @@ def stats_payload() -> Dict[str, Any]:
         "edges": q("SELECT COUNT(*) FROM edge"),
         "total_items": q("SELECT COUNT(*) FROM node") + q("SELECT COUNT(*) FROM edge"),
         "origins": origins,
-        "high_cost": q("SELECT COUNT(*) FROM edge WHERE high_cost_auto=1"),
+        "noted_edges": q("SELECT COUNT(*) FROM edge WHERE notes_auto IS NOT NULL "
+                         "AND notes_auto <> '[]'"),
         "orphans": q("SELECT COUNT(*) FROM node WHERE is_orphan_auto=1"),
-        "fragmented": q("SELECT COUNT(*) FROM scene WHERE net_fragmented_auto=1"),
+        "policy": q("SELECT graph_version FROM scene WHERE graph_version IS NOT NULL "
+                    "LIMIT 1") or "",
     }
 
 
@@ -191,7 +190,7 @@ def stats() -> JSONResponse:
 
 @api.get("/api/scenes")
 def scenes(city: str = "", min_nodes: Optional[int] = None,
-           orphan: str = "", high_cost: str = "", fragmented: str = "",
+           orphan: str = "", noted: str = "", origin: str = "",
            q: str = "", order: str = "scene_id",
            limit: int = 60, offset: int = 0) -> JSONResponse:
     where, args = [], []
@@ -207,11 +206,13 @@ def scenes(city: str = "", min_nodes: Optional[int] = None,
     if orphan in ("1", "true"):
         where.append("EXISTS (SELECT 1 FROM node n WHERE n.scene_id=s.scene_id "
                      "AND n.is_orphan_auto=1)")
-    if high_cost in ("1", "true"):
+    if noted in ("1", "true"):
         where.append("EXISTS (SELECT 1 FROM edge e WHERE e.scene_id=s.scene_id "
-                     "AND e.high_cost_auto=1)")
-    if fragmented in ("1", "true"):
-        where.append("s.net_fragmented_auto = 1")
+                     "AND e.notes_auto IS NOT NULL AND e.notes_auto <> '[]')")
+    if origin:
+        where.append("EXISTS (SELECT 1 FROM edge e WHERE e.scene_id=s.scene_id "
+                     "AND e.origin_auto = ?)")
+        args.append(origin)
     clause = (" WHERE " + " AND ".join(where)) if where else ""
     order_sql = {"scene_id": "s.scene_id",
                  "nodes_desc": "s.node_count DESC, s.scene_id",
@@ -219,12 +220,13 @@ def scenes(city: str = "", min_nodes: Optional[int] = None,
     limit = max(1, min(int(limit), 200))
     rows = con().execute(
         "SELECT s.scene_id, s.city, s.node_count, s.satellite_path, "
-        "s.net_fragmented_auto, "
+        "s.graph_version, s.utm_zone_auto, "
         "(SELECT COUNT(*) FROM edge e WHERE e.scene_id=s.scene_id) AS edge_count, "
         "(SELECT COUNT(*) FROM node n WHERE n.scene_id=s.scene_id AND n.is_orphan_auto=1) "
         " AS orphan_count, "
-        "(SELECT COUNT(*) FROM edge e WHERE e.scene_id=s.scene_id AND e.high_cost_auto=1) "
-        " AS high_cost_count, 0 AS revision_count "
+        "(SELECT COUNT(*) FROM edge e WHERE e.scene_id=s.scene_id "
+        " AND e.notes_auto IS NOT NULL AND e.notes_auto <> '[]') AS noted_count, "
+        "0 AS revision_count "
         f"FROM scene s{clause} ORDER BY {order_sql} LIMIT ? OFFSET ?",
         args + [limit, max(0, int(offset))])
     total = con().execute(f"SELECT COUNT(*) FROM scene s{clause}", args).fetchone()[0]
@@ -233,43 +235,54 @@ def scenes(city: str = "", min_nodes: Optional[int] = None,
 
 
 @api.get("/api/queue")
-def queue(city: str = "", signal: str = "", kind: str = "",
-          tier: str = "", include_reviewed: str = "",
+def queue(city: str = "", note: str = "", kind: str = "",
           limit: int = 60, offset: int = 0) -> JSONResponse:
-    """「带信号的」列表。只读版没有复核队列，这里按信号码筛条目供排查。"""
+    """「带标记的」列表。
+
+    merged_policy_0915 没有分诊分层和置信度分数，所以这里不再按分数排序。
+    列出的是策略本身认为值得看一眼的：§6 的孤儿节点，和带非阻断标记的边
+    （§0 跨水/穿建筑、§4 绕远、无道路通路）。
+    """
     parts, args = [], []
     limit = max(1, min(int(limit), 200))
     for tbl in ("node", "edge"):
         if kind and kind != tbl:
             continue
         key = "t.label" if tbl == "node" else "t.source_label || '-' || t.target_label"
-        cond = ["t.triage_signals_auto IS NOT NULL", "t.triage_signals_auto != '[]'"]
         sub: List[Any] = []
+        if tbl == "node":
+            if note and note != "orphan":
+                continue
+            cond = ["t.is_orphan_auto = 1"]
+            reason = ("json_array(json_object('code','orphan','snap_m',"
+                      "t.snap_distance_m_auto))")
+        else:
+            if note == "orphan":
+                continue
+            cond = ["t.notes_auto IS NOT NULL", "t.notes_auto <> '[]'"]
+            reason = "t.notes_auto"
+            if note:
+                cond.append("EXISTS (SELECT 1 FROM json_each(t.notes_auto) je "
+                            "WHERE json_extract(je.value,'$.code') = ?)")
+                sub.append(note)
         if city:
             cond.append("s.city = ?")
             sub.append(city)
-        if signal:
-            cond.append("EXISTS (SELECT 1 FROM json_each(t.triage_signals_auto) je "
-                        "WHERE json_extract(je.value,'$.code') = ?)")
-            sub.append(signal)
         parts.append(
             f"SELECT '{tbl}' AS kind, t.scene_id AS scene_id, s.city AS city, "
-            f"{key} AS item_key, COALESCE(t.triage_tier_auto,0) AS tier, "
-            "t.confidence_auto AS confidence, "
-            "(t.confidence_auto IS NULL) AS conf_null, "
-            "t.triage_signals_auto AS signals, 'unreviewed' AS review_status "
+            f"{key} AS item_key, {reason} AS notes_json, "
+            "'unreviewed' AS review_status "
             f"FROM {tbl} t JOIN scene s ON s.scene_id=t.scene_id "
             "WHERE " + " AND ".join(cond))
         args += sub
     if not parts:
         return JSONResponse({"items": [], "limit": limit, "offset": offset})
     sql = (" UNION ALL ".join(parts) +
-           " ORDER BY conf_null ASC, confidence ASC, scene_id, item_key LIMIT ? OFFSET ?")
+           " ORDER BY scene_id, kind, item_key LIMIT ? OFFSET ?")
     items = []
     for r in con().execute(sql, args + [limit, max(0, int(offset))]):
         d = dict(r)
-        d.pop("conf_null", None)
-        d["signals"] = _loads(d.pop("signals")) or []
+        d["notes"] = _loads(d.pop("notes_json")) or []
         items.append(d)
     return JSONResponse({"items": items, "limit": limit, "offset": offset})
 

graph.sqlite

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58a07b075f692f69317cc1956f4eff308e6ca3c112d711c38cbb32f6b195f721
-size 153534464
+oid sha256:fcdb5ac705bc00a356350061d77c881fd4ee3436710aaeaa2d2989afc2377460
+size 166027264

web/app.js

@@ -23,6 +23,22 @@
  */
 var EDIT = null;
 
+/* merged_policy_0915 §1-§4 的四类边。策略正文用蓝/绿/橙/红称呼它们，
+   这里的键就是 origin_auto 的取值。 */
+var EDGE_COLOR = {
+  corridor: 'var(--e-corridor)',            // 蓝 §1 同走廊相邻
+  road_route: 'var(--e-road)',              // 绿 §2 路网可达
+  short_link: 'var(--e-short)',             // 橙 §3 短直连
+  component_merge: 'var(--e-merge)',        // 红 §4 分量合并
+};
+var EDGE_LABEL = {
+  corridor: '§1 同走廊相邻',
+  road_route: '§2 路网可达',
+  short_link: '§3 短直连',
+  component_merge: '§4 分量合并',
+  manual: '人工新增',
+};
+
 var S = {
   mode: 'scenes',              // 'scenes' 浏览全库 | 'queue' 复核队列
   queue: [], filtered: [], selected: null,   // {kind, scene_id, key:[...]}
@@ -92,9 +108,8 @@ function corridorColor(cid) {
 function queueQuery() {
   var q = new URLSearchParams();
   if ($('cityFilter').value) q.set('city', $('cityFilter').value);
-  if ($('tierFilter').value) q.set('tier', $('tierFilter').value);
   if ($('kindFilter').value) q.set('kind', $('kindFilter').value);
-  if ($('signalFilter').value) q.set('signal', $('signalFilter').value);
+  if ($('signalFilter').value) q.set('note', $('signalFilter').value);
   if ($('showReviewedSel').value) q.set('include_reviewed', '1');
   q.set('limit', String(S.limit));
   q.set('offset', String(S.offset));
@@ -108,8 +123,8 @@ function sceneQuery() {
   if ((v = $('minNodes').value)) q.set('min_nodes', v);
   if ((v = $('editedFilter').value)) q.set('edited', v);
   if ($('fOrphan').checked) q.set('orphan', '1');
-  if ($('fHighCost').checked) q.set('high_cost', '1');
-  if ($('fFragmented').checked) q.set('fragmented', '1');
+  if ($('fNoted').checked) q.set('noted', '1');
+  if ($('originFilter').value) q.set('origin', $('originFilter').value);
   if ((v = $('searchInput').value.trim())) q.set('q', v);
   q.set('limit', String(S.limit));
   q.set('offset', String(S.offset));
@@ -139,8 +154,7 @@ function renderScenes() {
     var badges = '';
     if (sc.revision_count) badges += '<span class="badge edited">改过 ' + sc.revision_count + '</span>';
     if (sc.orphan_count) badges += '<span class="badge orphan">孤儿 ' + sc.orphan_count + '</span>';
-    if (sc.high_cost_count) badges += '<span class="badge cost">$$ ' + sc.high_cost_count + '</span>';
-    if (sc.net_fragmented_auto) badges += '<span class="badge frag">S1</span>';
+    if (sc.noted_count) badges += '<span class="badge cost">标记 ' + sc.noted_count + '</span>';
     // 三行压成两行：城市并进第一行（原来单独占一行只为显示一个词），
     // 没有徽章时整条 meta 行不渲染，而不是留一个占位的破折号。
     var name = sc.scene_id.split(':')[1] || sc.scene_id;
@@ -191,11 +205,10 @@ var FILTERS = [
   { id: 'minNodes',        label: '最少节点', mode: 'scenes', type: 'value' },
   { id: 'editedFilter',    label: '状态',     mode: 'scenes', type: 'select' },
   { id: 'fOrphan',         label: '含孤儿',   mode: 'scenes', type: 'check' },
-  { id: 'fHighCost',       label: '含高花费边', mode: 'scenes', type: 'check' },
-  { id: 'fFragmented',     label: '路网碎片化', mode: 'scenes', type: 'check' },
+  { id: 'fNoted',          label: '含带标记的边', mode: 'scenes', type: 'check' },
+  { id: 'originFilter',    label: '含某类边', mode: 'scenes', type: 'select' },
   { id: 'kindFilter',      label: 'Kind',    mode: 'queue',  type: 'select' },
-  { id: 'tierFilter',      label: 'Tier',    mode: 'queue',  type: 'select' },
-  { id: 'signalFilter',    label: 'Signal',  mode: 'queue',  type: 'select' },
+  { id: 'signalFilter',    label: '标记',    mode: 'queue',  type: 'select' },
   { id: 'showReviewedSel', label: '已复核',   mode: 'queue',  type: 'select' },
 ];
 
@@ -260,16 +273,17 @@ function applySearch() {
   });
   renderList();
 }
-function signalHtml(sigs) {
-  if (!sigs || !sigs.length) return '<b>信号缺失</b>';
-  return sigs.map(function (s) {
-    var extra = Object.keys(s).filter(function (k) { return k !== 'code' && k !== 'queued'; })
+function noteHtml(notes) {
+  /* 队列项必须自带「为什么被列出来」。策略里没有分数，所以直接列标记码。 */
+  return (notes || []).map(function (n) {
+    var extra = Object.keys(n).filter(function (k) { return k !== 'code'; })
       .map(function (k) {
-        var v = s[k];
-        return k + '=' + (typeof v === 'number' ? (+v).toFixed(2) : JSON.stringify(v));
+        var v = n[k];
+        return typeof v === 'number' ? (+v).toFixed(1) : String(v);
       }).join(' ');
-    return '<span class="sig-code">' + esc(s.code) + '</span>' + (extra ? ' ' + esc(extra) : '');
-  }).join(' · ');
+    return '<span class="sig-code">' + esc(n.code) + '</span>' +
+      (extra ? '<span>' + esc(extra) + '</span>' : '');
+  }).join('') || '<span>—</span>';
 }
 function itemId(i) { return i.kind + '|' + i.scene_id + '|' + i.item_key; }
 /* 左栏渲染的统一入口。
@@ -313,10 +327,9 @@ function renderQueue() {
       + (i.review_status === 'needs_adjudication' ? ' adjudication' : '');
     b.innerHTML =
       '<div class="queue-top"><strong>' + (i.kind === 'node' ? '●' : '─') + ' ' +
-        esc(i.item_key) + '</strong><span>' +
-        (i.confidence == null ? '—' : (+i.confidence).toFixed(3)) + '</span></div>' +
-      '<div class="queue-meta"><span class="tier-pill tier-' + i.tier + '">T' + i.tier + '</span>' +
-        signalHtml(i.signals) + '</div>' +
+        esc(i.item_key) + '</strong><span>' + (i.kind === 'node' ? '节点' : '边') +
+        '</span></div>' +
+      '<div class="queue-meta">' + noteHtml(i.notes) + '</div>' +
       '<div class="queue-scene">' + esc(i.scene_id) + '</div>';
     b.onclick = function () { selectItem(i); };
     list.appendChild(b);
@@ -568,10 +581,9 @@ function drawGraph() {
   var geo = S.scene.edges.map(function (e) {
     var a = pos[e.source_label], b = pos[e.target_label];
     if (!a || !b) return null;
-    // 高花费边一律画直线：它的 road_path 已在建图阶段丢弃（绕出几十倍的
-    // 折线画在图上只会误导），真实路网距离仍在 road_distance_m 里。
-    var costly = !!e.high_cost;
-    if (!costly && S.edgeMode === 'road' && e.road_path && e.road_path.length > 1) {
+    // §5：橙边（短直连）和红边（分量合并）按定义就是直线，没有 road_path。
+    var costly = e.origin === 'component_merge';
+    if (S.edgeMode === 'road' && e.road_path && e.road_path.length > 1) {
       // 折线两端落在吸附点上，不在节点上——补两段短接头，否则边看着是断的
       return { e: e, costly: costly, road: true,
                pts: [a].concat(e.road_path.map(function (q) { return proj(q[0], q[1]); })).concat([b]) };
@@ -583,8 +595,7 @@ function drawGraph() {
   geo.forEach(function (g, ei) {
     if (!g) return;
     var e = g.e;
-    var colour = { corridor_chain: 'var(--chain)', intersection: 'var(--intersection)' }[e.origin]
-      || 'var(--bridge)';
+    var colour = EDGE_COLOR[e.origin] || 'var(--muted)';
     var isSel = sel && sel.kind === 'edge'
       && sel.key[1] === e.source_label && sel.key[2] === e.target_label;
     var dead = !e.in_graph;
@@ -744,15 +755,16 @@ function drawAdjacency() {
   var idx = {};
   labels.forEach(function (l, i) { idx[l] = i; });
   var cell = {};
-  var counts = { corridor_chain: 0, intersection: 0, bridge: 0 };
+  var counts = { corridor: 0, road_route: 0, short_link: 0, component_merge: 0 };
   S.scene.edges.forEach(function (e) {
     cell[e.source_label + '|' + e.target_label] = e;
     cell[e.target_label + '|' + e.source_label] = e;
     if (counts[e.origin_auto] != null) counts[e.origin_auto]++;
   });
-  $('gChain').textContent = counts.corridor_chain;
-  $('gInter').textContent = counts.intersection;
-  $('gBridge').textContent = counts.bridge;
+  $('gCorridor').textContent = counts.corridor;
+  $('gRoad').textContent = counts.road_route;
+  $('gShort').textContent = counts.short_link;
+  $('gMerge').textContent = counts.component_merge;
 
   var sel = S.selected;
   var html = '<tr><th></th>' + labels.map(function (l) { return '<th>' + l + '</th>'; }).join('') + '</tr>';
@@ -768,7 +780,7 @@ function drawAdjacency() {
       }
       var isSel = sel && sel.kind === 'edge'
         && sel.key[1] === e.source_label && sel.key[2] === e.target_label;
-      var cls = 'edge e-' + (e.origin || 'bridge') + (isSel ? ' sel' : '') +
+      var cls = 'edge e-' + (e.origin || 'manual') + (isSel ? ' sel' : '') +
         (e.in_graph ? '' : ' rejected');
       html += '<td class="' + cls + '" data-e="' + e.source_label + '-' +
         e.target_label + '">' + (e.in_graph ? '·' : '×') + '</td>';
@@ -799,15 +811,14 @@ function drawAdjacency() {
     var isSel = sel && sel.kind === 'edge'
       && sel.key[1] === e.source_label && sel.key[2] === e.target_label;
     d.className = 'edge-row' + (isSel ? ' sel' : '');
-    var colour = { corridor_chain: 'var(--chain)', intersection: 'var(--intersection)' }[e.origin]
-      || 'var(--bridge)';
+    var colour = EDGE_COLOR[e.origin] || 'var(--muted)';
     if (!e.in_graph) d.classList.add('rejected');
     d.innerHTML = '<i style="background:' + colour + '"></i>' +
       esc(e.source_label) + '–' + esc(e.target_label) +
       (e.is_manual ? ' <span style="color:var(--cyan)">M</span>' : '') +
       (e.in_graph ? '' : ' <span style="color:var(--no)">已拒</span>') +
-      (e.high_cost ? ' <span class="cost-tag" title="' + esc(e.cost_class || '') +
-        '">$$</span>' : '') +
+      ((e.notes && e.notes.length) ? ' <span class="cost-tag" title="' +
+        esc(e.notes.map(function (n) { return n.code; }).join(', ')) + '">!</span>' : '') +
       '<span class="len">' + (e.euclid_distance_m == null ? '—' : (+e.euclid_distance_m).toFixed(0) + ' m') + '</span>';
     d.onclick = function () { pickEdge(e); };
     listEl.appendChild(d);
@@ -965,43 +976,44 @@ function renderInspector() {
   var isNode = S.selected.kind === 'node';
   $('decisionTitle').textContent = isNode ? '节点属���' : '边属性';
   $('itemId').textContent = isNode ? row.label : (row.source_label + '→' + row.target_label);
-  var conf = row.confidence_auto;
   var html = '';
 
+  // merged_policy_0915 没有置信度分数，也没有分诊分层。
+  // 这里展示的是策略真正产出的东西：非阻断标记。
   html += '<section class="signal-block"><div class="block-title">' +
-    '<span>自动判定信号</span></div>';
-  var sigs = row.triage_signals || [];
-  html += sigs.length ? sigs.map(function (sg) {
+    '<span>' + (isNode ? '节点标记' : '边的标记（非阻断）') + '</span></div>';
+  var marks = isNode
+    ? (row.is_orphan ? [{ code: 'orphan', snap_m: row.snap_distance_m_auto }] : [])
+    : (row.notes || []);
+  html += marks.length ? marks.map(function (sg) {
     var extra = Object.keys(sg).filter(function (k) { return k !== 'code'; })
       .map(function (k) {
         var v = sg[k];
         return k + '=' + (typeof v === 'number' ? (+v).toFixed(3) : JSON.stringify(v));
       }).join('  ');
     return '<div class="signal-row"><b>' + esc(sg.code) + '</b><em>' + esc(extra) + '</em></div>';
-  }).join('') : '<div class="signal-row"><em>无信号（高置信）</em></div>';
-  html += '<div class="conf-meter"><span style="width:' +
-    Math.round((conf == null ? 0 : conf) * 100) + '%"></span></div>';
-  html += '<div style="margin-top:5px;color:var(--faint);font:600 9px var(--mono)">CONFIDENCE ' +
-    (conf == null ? '—' : (+conf).toFixed(4)) + '</div></section>';
+  }).join('') : '<div class="signal-row"><em>无标记</em></div>';
+  html += '</section>';
 
   if (isNode) {
     html += kv([
       ['panoid', row.panoid],
       ['lat / lon', row.lat.toFixed(6) + ', ' + row.lon.toFixed(6)],
-      ['走廊', row.corridor_name || '—'],
-      ['走廊来源', row.corridor_source_auto],
+      ['走廊（最近）', row.corridor_name || '—'],
+      ['所属走廊数', (row.corridor_ids || []).length],
+      ['到走廊垂距 m', row.corridor_offset_m_auto],
       ['吸附距离 m', row.snap_distance_m_auto],
-      ['孤儿', row.is_orphan ? '是' : '否'],
+      ['孤儿 §6', row.is_orphan ? '是' : '否'],
       ['人工覆盖', row.corridor_overridden ? '走廊已改' : '—'],
     ]).replace('<dl', '<dl style="padding:11px 14px"');
   } else {
     html += kv([
-      ['来源', row.origin],
-      ['欧氏距离 m', row.euclid_distance_m_auto],
-      ['路网距离 m', row.road_distance_m_auto],
+      ['类别', EDGE_LABEL[row.origin] || row.origin],
+      ['直线距离 m', row.euclid_distance_m_auto],
+      ['沿路距离 m', row.road_route_m_auto],
+      ['走线长度 m', row.path_length_m_auto],
       ['绕路比', row.detour_ratio_auto],
       ['有道路可通', row.road_connected ? '是' : '否'],
-      ['高花费边', row.high_cost ? ('是 · ' + (row.cost_class || '')) : '否'],
       ['走线点数', row.road_path ? row.road_path.length : '—'],
       ['证据', row.evidence ? JSON.stringify(row.evidence) : '—'],
       ['人工裁定', row.verdict || '—'],
@@ -1087,16 +1099,18 @@ function refreshStats() {
     $('statItems').textContent = st.nodes.toLocaleString() + ' 节点';
     $('statQueue').textContent = st.edges.toLocaleString() + ' 边';
     var o = st.origins || {};
-    var chain = o.corridor_chain || 0, inter = o.intersection || 0, bridge = o.bridge || 0;
-    var tot = chain + inter + bridge || 1;
-    $('countChain').textContent = chain.toLocaleString();
-    $('countInter').textContent = inter.toLocaleString();
-    $('countBridge').textContent = bridge.toLocaleString();
-    $('countCost').textContent = (st.high_cost || 0).toLocaleString();
-    $('progressLabel').textContent =
-      '走廊链 ' + Math.round(chain / tot * 100) + '%';
-    // 进度条在这里表示「边有多少来自真实道路走廊」，而不是复核进度
-    $('progressBar').style.width = (chain / tot * 100) + '%';
+    var cor = o.corridor || 0, road = o.road_route || 0;
+    var short_ = o.short_link || 0, merge = o.component_merge || 0;
+    var tot = cor + road + short_ + merge || 1;
+    $('countCorridor').textContent = cor.toLocaleString();
+    $('countRoad').textContent = road.toLocaleString();
+    $('countShort').textContent = short_.toLocaleString();
+    $('countMerge').textContent = merge.toLocaleString();
+    // 进度条表示「边有多少来自道路本身」（§1 蓝 + §2 绿），
+    // 剩下的是路网表达不了、靠 §3/§4 补上的。
+    var fromRoad = (cor + road) / tot * 100;
+    $('progressLabel').textContent = '沿路 ' + Math.round(fromRoad) + '%';
+    $('progressBar').style.width = fromRoad + '%';
   }).catch(function () {});
 }
 
@@ -1113,8 +1127,8 @@ function boot() {
   }).then(function () { setMode('scenes'); });
 
   ['cityFilter', 'orderFilter', 'minNodes', 'editedFilter',
-   'fOrphan', 'fHighCost', 'fFragmented',
-   'tierFilter', 'kindFilter', 'signalFilter', 'showReviewedSel'].forEach(function (id) {
+   'fOrphan', 'fNoted', 'originFilter',
+   'kindFilter', 'signalFilter', 'showReviewedSel'].forEach(function (id) {
     var el = $(id);
     if (el) el.onchange = function () { S.offset = 0; syncFilterChrome(); loadList(); };
   });

web/index.html

@@ -23,11 +23,11 @@
     <i aria-hidden="true"></i>
     <b id="statQueue">—</b><span>边</span>
     <i aria-hidden="true"></i>
-    <span class="readout-origins" id="originBreakdown" title="边按来源构成">
-      <em class="o-chain"><b id="countChain">—</b>走廊链</em>
-      <em class="o-inter"><b id="countInter">—</b>路口</em>
-      <em class="o-bridge"><b id="countBridge">—</b>桥接</em>
-      <em class="o-cost"><b id="countCost">—</b>高花费</em>
+    <span class="readout-origins" id="originBreakdown" title="边按 §1-§4 分类">
+      <em class="o-corridor"><b id="countCorridor">—</b>同走廊</em>
+      <em class="o-road"><b id="countRoad">—</b>路网可达</em>
+      <em class="o-short"><b id="countShort">—</b>短直连</em>
+      <em class="o-merge"><b id="countMerge">—</b>分量合并</em>
     </span>
   </div>
 
@@ -96,9 +96,19 @@
             </label>
           </div>
           <div class="chip-row" id="sceneChips">
-            <label class="chip"><input id="fOrphan" type="checkbox"><span>含孤儿</span></label>
-            <label class="chip"><input id="fHighCost" type="checkbox"><span>含高花费边</span></label>
-            <label class="chip"><input id="fFragmented" type="checkbox"><span>路网碎片化</span></label>
+            <label class="chip"><input id="fOrphan" type="checkbox"><span>含孤儿节点</span></label>
+            <label class="chip"><input id="fNoted" type="checkbox"><span>含带标记的边</span></label>
+          </div>
+          <div class="filter-row">
+            <label class="ctl"><span>含某类边</span>
+              <select id="originFilter">
+                <option value="">全部</option>
+                <option value="corridor">§1 同走廊</option>
+                <option value="road_route">§2 路网可达</option>
+                <option value="short_link">§3 短直连</option>
+                <option value="component_merge">§4 分量合并</option>
+              </select>
+            </label>
           </div>
         </div>
 
@@ -112,27 +122,17 @@
                 <option value="edge">只看边</option>
               </select>
             </label>
-            <label class="ctl"><span>Tier</span>
-              <select id="tierFilter">
-                <option value="">全部</option>
-                <option value="1">Tier 1 必须</option>
-                <option value="2">Tier 2 优先</option>
-                <option value="3">Tier 3 抽查</option>
-              </select>
-            </label>
+
           </div>
           <div class="filter-row">
-            <label class="ctl"><span>Signal</span>
+            <label class="ctl"><span>标记</span>
               <select id="signalFilter">
-                <option value="">全部信号</option>
-                <option value="A1">A1 孤儿</option>
-                <option value="A2">A2 吸附偏远</option>
-                <option value="A3">A3 无路名</option>
-                <option value="A4">A4 归属歧义</option>
-                <option value="E1">E1 无道路通路</option>
-                <option value="E2">E2 绕路超限</option>
-                <option value="E3">E3 绕路偏大</option>
-                <option value="E4">E4 选边并列</option>
+                <option value="">全部标记</option>
+                <option value="orphan">§6 孤儿节点</option>
+                <option value="water_crossed">§0 跨水</option>
+                <option value="building_crossed">§0 穿建筑</option>
+                <option value="no_road_path">无道路通路</option>
+                <option value="long_detour">§4 红边绕远</option>
               </select>
             </label>
             <label class="ctl"><span>已复核</span>
@@ -202,10 +202,10 @@
         </div>
         <div class="image-caption">
           <span class="legend">
-            <span><i class="lg-chain"></i>走廊链</span>
-            <span><i class="lg-inter"></i>路口边</span>
-            <span><i class="lg-bridge"></i>桥接边</span>
-            <span><i class="lg-road" style="border-top:3px dashed var(--paper);background:none"></i>高花费边</span>
+            <span><i class="lg-corridor"></i>§1 同走廊</span>
+            <span><i class="lg-road"></i>§2 路网可达</span>
+            <span><i class="lg-short"></i>§3 短直连</span>
+            <span><i class="lg-merge"></i>§4 分量合并</span>
             <span><i class="lg-orphan"></i>孤儿</span>
           </span>
         </div>
@@ -247,9 +247,10 @@
           <h3 id="graphTitle">节点邻接矩阵</h3>
         </div>
         <div class="graph-counts">
-          <span><b id="gChain">—</b> chain</span>
-          <span><b id="gInter">—</b> inter</span>
-          <span><b id="gBridge">—</b> bridge</span>
+          <span><b id="gCorridor">—</b> 同走廊</span>
+          <span><b id="gRoad">—</b> 路网</span>
+          <span><b id="gShort">—</b> 直连</span>
+          <span><b id="gMerge">—</b> 合并</span>
         </div>
       </div>
       <p class="graph-rule">每一格是一条无向边，颜色对应它的来源。点击格子或右侧列表可直接检查该条边。</p>

web/styles.css

@@ -29,6 +29,12 @@
   --chain: #68c8c0;
   --intersection: #f1a43c;
   --bridge: #b8a2e0;
+  /* merged_policy_0915 §1-§4 的四色。策略正文就是用蓝/绿/橙/红称呼它们的，
+     配色按那个来，不再沿用旧策略的「走廊链/路口/桥接」三色。 */
+  --e-corridor: #6ba8e8;          /* 蓝 §1 同走廊相邻 */
+  --e-road: #68c8a0;              /* 绿 §2 路网可达 */
+  --e-short: #f1a43c;             /* 橙 §3 短直连 */
+  --e-merge: #e8646b;             /* 红 §4 分量合并 */
   --road: #70c79b;
   --radius: 4px;
   --shadow: 0 24px 70px rgba(0, 0, 0, .28);
@@ -97,8 +103,8 @@ button { color: inherit; }
 .readout-origins { display: flex; gap: 10px; min-width: 0; overflow: hidden; }
 .readout-origins em { font-style: normal; display: flex; align-items: baseline; gap: 3px; color: var(--faint); letter-spacing: .06em; }
 .readout-origins b { font: 650 11px var(--mono); }
-.o-chain b { color: var(--chain); } .o-inter b { color: var(--intersection); }
-.o-bridge b { color: var(--bridge); } .o-cost b { color: var(--paper); }
+.o-corridor b { color: var(--e-corridor); } .o-road b { color: var(--e-road); }
+.o-short b { color: var(--e-short); } .o-merge b { color: var(--e-merge); }
 
 .origin-meter { flex: 1 1 auto; min-width: 50px; height: 2px; background: var(--line-soft); }
 .origin-meter span { display: block; height: 100%; width: 0; background: linear-gradient(90deg, var(--signal), #ffd38b); transition: width .45s ease; }
@@ -307,8 +313,8 @@ kbd {
 .legend { display: flex; gap: 9px; }
 .legend i { display: inline-block; width: 12px; height: 2px; margin-right: 3px; vertical-align: middle; }
 .legend span { color: var(--faint); font: 600 8px var(--mono); white-space: nowrap; }
-.lg-chain { background: var(--chain); } .lg-inter { background: var(--intersection); }
-.lg-bridge { background: var(--bridge); } .lg-road { background: var(--road); }
+.lg-corridor { background: var(--e-corridor); } .lg-road { background: var(--e-road); }
+.lg-short { background: var(--e-short); } .lg-merge { background: var(--e-merge); }
 .lg-orphan { width: 7px !important; height: 7px !important; border-radius: 50%; background: var(--anchor); }
 
 .image-stage { display: block; width: 100%; padding: 0; border: 0; background: #0b0e0d; position: relative; overflow: hidden; }
@@ -415,9 +421,11 @@ kbd {
   width: 21px; height: 21px; text-align: center; border: 1px solid var(--line-soft); color: var(--faint);
 }
 .adjacency-table td.edge { cursor: pointer; }
-.adjacency-table td.e-chain { background: rgba(104,200,192,.3); color: var(--paper); }
-.adjacency-table td.e-intersection { background: rgba(241,164,60,.3); color: var(--paper); }
-.adjacency-table td.e-bridge { background: rgba(184,162,224,.3); color: var(--paper); }
+/* 旧策略的 e-chain 已随规则作废 */
+.adjacency-table td.e-corridor { background: rgba(107,168,232,.32); color: var(--paper); }
+.adjacency-table td.e-road_route { background: rgba(104,200,160,.32); color: var(--paper); }
+.adjacency-table td.e-short_link { background: rgba(241,164,60,.32); color: var(--paper); }
+.adjacency-table td.e-component_merge { background: rgba(232,100,107,.32); color: var(--paper); }
 .adjacency-table td.diag { background: var(--line-soft); }
 .adjacency-table td.addable { cursor: cell; color: #3d4a45; }
 .adjacency-table td.addable:hover { background: rgba(104,200,192,.18); color: var(--cyan); }