aviation-chart 2.0.29 → 2.0.31

package/dist/nav-sdk.esm.js

@@ -1332,15 +1332,15 @@ const AMM_COLOR_LIGHT = {
   /** 机场边界（淡暖灰垫底，在纯白底上显现轮廓） */
   airport: '#e2e8f0',
   /** 跑道面（中深灰，作为白底上的绝对重心） */
-  runway: '#94a3b8',
+  runway: 'hsl(0, 0%, 33%)',
   /** 机坪面（中浅灰，与白底拉开清晰明度差） */
-  apron: '#cbd5e1',
+  apron: 'hsl(0, 0%, 60%)',
   /** 滑行道面（带微弱色调差的浅灰，与机坪剥离） */
-  taxiway: '#e2e8f0',
+  taxiway: 'hsl(240, 5%, 60%)',
   /** 滑行道中心线（深琥珀金，白底上极清晰） */
-  taxiwayLine: '#f59e0b',
+  taxiwayLine: '#ffff00',
   /** 等待位（深砖红/铁锈红，高辨识度） */
-  holding: '#b91c1c',
+  holding: 'hsl(0, 100%, 50%)',
   /** 机位点（深翡翠绿） */
   stand: '#1e293b',
   /** 跑道标记（涂装面） */
@@ -1348,7 +1348,7 @@ const AMM_COLOR_LIGHT = {
   /** 跑道中心线 */
   runwayCenterline: '#ffffff',
   /** 停机位引导线（深绿色） */
-  standLine: '#64748b',
+  standLine: '#010101',
   /** 跑道入口点（深琥珀色） */
   threshold: '#c2410c',
   /** 限制区域（深红） */
@@ -1357,9 +1357,9 @@ const AMM_COLOR_LIGHT = {
   hotspot: '#ea580c',
 };
 
-function buildAMMLayersLight(sourceId = 'amm') {
-  const C = AMM_COLOR_LIGHT;
-  return [
+function buildAMMLayersLight(sourceId = 'amm', colors = AMM_COLOR_LIGHT) {
+  const C = colors;
+  const layers = [
     // ── 机场边界轮廓（z11+）
     {
       id: 'amm-airport-fill',
@@ -1392,8 +1392,9 @@ function buildAMMLayersLight(sourceId = 'amm') {
       'source-layer': 'amm-runway',
       minzoom: 11,
       paint: {
+        "fill-antialias": true,
         'fill-color': C.runway,
-        'fill-opacity': 0.9,
+        'fill-opacity': 1,
       },
     },
     {
@@ -1417,20 +1418,39 @@ function buildAMMLayersLight(sourceId = 'amm') {
       'source-layer': 'amm-apron',
       minzoom: 11,
       paint: {
+        "fill-antialias": true,
         'fill-color': C.apron,
-        'fill-opacity': 0.6, // 提高透明度浓度
+        'fill-opacity': 1, // 提高透明度浓度
       },
     },
     {
-      id: 'amm-apron-stroke',
-      type: 'line',
+      id: 'amm-apron-label',
+      type: 'symbol',
       source: sourceId,
       'source-layer': 'amm-apron',
-      minzoom: 11,
-      paint: {
-        'line-color': '#94a3b8', // 勾边加深，确保纯白背景下清晰可见
-        'line-width': 0.5,
+      minzoom: 13,
+      "layout": {
+        "text-ignore-placement": false,
+        "text-allow-overlap": false,
+        "text-size": 10,
+        "text-font": ["Fira Code SemiBold"],
+        "text-field": [
+          "case",
+          [
+            "any",
+            ["!", ["has", "idapron"]],
+            ["==", ["get", "idapron"], null],
+            ["==", ["get", "idapron"], "null"]
+          ],
+          "",
+          ["to-string", ["get", "idapron"]]
+        ]
       },
+      "paint": {
+        "text-color": "#fefefe",
+        "text-halo-color": "#010101",
+        "text-halo-width": 0.5
+      }
     },
 
     // ── 滑行道面（z11+）───
@@ -1441,8 +1461,21 @@ function buildAMMLayersLight(sourceId = 'amm') {
       'source-layer': 'amm-taxiway',
       minzoom: 11,
       paint: {
+        "fill-antialias": true,
         'fill-color': C.taxiway,
-        'fill-opacity': 0.7,
+        "fill-opacity": {
+          "base": 1,
+          "stops": [
+            [
+              11,
+              0
+            ],
+            [
+              12,
+              1
+            ]
+          ]
+        }
       },
     },
 
@@ -1452,12 +1485,40 @@ function buildAMMLayersLight(sourceId = 'amm') {
       type: 'line',
       source: sourceId,
       'source-layer': 'amm-taxiway-line',
-      minzoom: 11,
+      minzoom: 13.5,
+      paint: {
+        'line-color': C.taxiwayLine,
+        'line-width': ['interpolate', ['linear'], ['zoom'], 15, 0.8, 18, 2]
+      },
+    },
+    // 滑行道引导线
+    {
+      id: 'amm-taxiway-guidanceline',
+      type: 'line',
+      source: sourceId,
+      'source-layer': 'amm-taxiway-guidance-line',
+      minzoom: 13.5,
       paint: {
         'line-color': C.taxiwayLine,
         'line-width': ['interpolate', ['linear'], ['zoom'], 15, 0.8, 18, 2]
       },
     },
+    // 滑行道交叉线
+    {
+      id: 'amm-taxiway-intersectionline',
+      type: 'line',
+      source: sourceId,
+      'source-layer': 'amm-taxiway-intersection-marking',
+      minzoom: 13.5,
+      paint: {
+        'line-color': "#fff",
+        'line-width': ['interpolate', ['linear'], ['zoom'], 15, 0.8, 18, 2],
+        "line-dasharray": [
+          3,
+          3
+        ]
+      },
+    },
 
 
     // ── 等待位（z11+）─────
@@ -1466,12 +1527,58 @@ function buildAMMLayersLight(sourceId = 'amm') {
       type: 'line',
       source: sourceId,
       'source-layer': 'amm-holding',
-      minzoom: 11,
+      minzoom: 13,
       paint: {
         'line-color': C.holding,
         'line-width': 1.5,
       },
     },
+    {
+      id: 'amm-holding-label',
+      type: 'symbol',
+      source: sourceId,
+      'source-layer': 'amm-holding',
+      minzoom: 15,
+      "layout": {
+        "text-offset": [
+          0,
+          0
+        ],
+        "symbol-placement": "point",
+        "text-ignore-placement": true,
+        "text-allow-overlap": true,
+        "text-size": 13,
+        "text-font": [
+          "Font17"
+        ],
+        "text-field": [
+          "case",
+          [
+            "!=",
+            [
+              "get",
+              "idlin"
+            ],
+            ""
+          ],
+          [
+            "concat",
+            ".",
+            [
+              "get",
+              "idlin"
+            ],
+            "."
+          ],
+          ""
+        ]
+      },
+      "paint": {
+        "text-halo-color": C.holding,
+        "text-color": "#010101",
+        "text-halo-width": 2
+      }
+    },
 
     // ── 跑道标记（斑马线、编号等涂装面，z13+）─────────────────────────
     {
@@ -1481,6 +1588,7 @@ function buildAMMLayersLight(sourceId = 'amm') {
       'source-layer': 'amm-runway-marking',
       minzoom: 13,
       paint: {
+        "fill-antialias": true,
         'fill-color': C.runwayMarking,
         'fill-opacity': 0.9,
       },
@@ -1494,20 +1602,9 @@ function buildAMMLayersLight(sourceId = 'amm') {
       'source-layer': 'amm-restricted',
       minzoom: 11,
       paint: {
+        "fill-antialias": true,
         'fill-color': C.restricted,
-        'fill-opacity': 0.08, // 针对白底降低面纯度
-      },
-    },
-    {
-      id: 'amm-restricted-stroke',
-      type: 'line',
-      source: sourceId,
-      'source-layer': 'amm-restricted',
-      minzoom: 11,
-      paint: {
-        'line-color': C.restricted,
-        'line-width': 1.5,
-        'line-dasharray': [4, 2],
+        'fill-opacity': 0.3, // 针对白底降低面纯度
       },
     },
 
@@ -1517,22 +1614,55 @@ function buildAMMLayersLight(sourceId = 'amm') {
       type: 'fill',
       source: sourceId,
       'source-layer': 'amm-hotspot',
-      minzoom: 11,
-      paint: {
-        'fill-color': C.hotspot,
-        'fill-opacity': 0.1, // 针对白底轻微淡化面
-      },
+      minzoom: 12,
+      "paint": {
+        "fill-antialias": true,
+        "fill-outline-color": "#ff00ff",
+        "fill-color": "#89259D",
+        "fill-opacity": 0.3
+      }
     },
     {
-      id: 'amm-hotspot-stroke',
-      type: 'line',
-      source: sourceId,
-      'source-layer': 'amm-hotspot',
-      minzoom: 11,
-      paint: {
-        'line-color': C.hotspot,
-        'line-width': 1.5,
+      id: "amm-hotpost-label",
+      "type": "symbol",
+      "source": sourceId,
+      "source-layer": "amm-hotspot",
+      "minzoom": 12,
+      "layout": {
+        "symbol-placement": "point",
+        "text-ignore-placement": false,
+        "text-allow-overlap": false,
+        "text-size": 14,
+        "text-font": [
+          "Font17"
+        ],
+        "text-field": [
+          "case",
+          [
+            "!=",
+            [
+              "get",
+              "idhot"
+            ],
+            ""
+          ],
+          [
+            "concat",
+            ".",
+            [
+              "get",
+              "idhot"
+            ],
+            "."
+          ],
+          ""
+        ]
       },
+      "paint": {
+        "text-color": "#444",
+        "text-halo-color": "#ff00ff",
+        "text-halo-width": 2
+      }
     },
 
     // ── 跑道中心线（z11+）─────────────────────────────────────────────
@@ -1592,8 +1722,14 @@ function buildAMMLayersLight(sourceId = 'amm') {
       'source-layer': 'amm-stand-line',
       minzoom: 13,
       paint: {
-        'line-color': C.standLine,
-        'line-width': 1,
+        'line-color': '#ffff00',
+        "line-width": [
+          "interpolate",
+          ["exponential", 1.8],
+          ["zoom"],
+          13, 0.2,
+          15, 0.4
+        ]
       },
     },
     // 滑行道名称（中心线 symbol）
@@ -1602,25 +1738,43 @@ function buildAMMLayersLight(sourceId = 'amm') {
       type: 'symbol',
       source: sourceId,
       'source-layer': 'amm-taxiway-line',
-      minzoom: 14,
+      minzoom: 12,
       layout: {
-        'text-field': ['get', 'idlin'],
-        'text-size': 10,
-        "icon-image": "stretch:text_bg",
-        "icon-text-fit": "both",
-        "icon-text-fit-padding": [
-          1,
-          2,
-          1,
-          2
+        "symbol-placement": "line",
+        "text-ignore-placement": false,
+        "text-allow-overlap": false,
+        "text-size": 15,
+        "text-max-angle": 10,
+        "text-font": [
+          "Font17"
         ],
-        'symbol-placement': 'line',
-        'text-keep-upright': true,
-        'text-allow-overlap': false,
+        "text-field": [
+          "case",
+          [
+            "!=",
+            [
+              "get",
+              "idlin"
+            ],
+            ""
+          ],
+          [
+            "concat",
+            ".",
+            [
+              "get",
+              "idlin"
+            ],
+            "."
+          ],
+          ""
+        ],
+        "text-rotation-alignment": "viewport"
       },
       paint: {
-        'text-color': "#FFF",
-        "icon-color": C.taxiwayLine
+        "text-halo-color": "yellow",
+        "text-color": "#010101",
+        "text-halo-width": 2
       },
     },
 
@@ -1631,98 +1785,96 @@ function buildAMMLayersLight(sourceId = 'amm') {
       source: sourceId,
       'source-layer': 'amm-runway-threshold',
       minzoom: 12,
-      layout: {
-        "icon-image": "stretch:text_bg",
-        "icon-text-fit": "both",
-        "icon-text-fit-padding": [
-          1,
-          2,
-          1,
-          2
+      "layout": {
+        "symbol-placement": "point",
+        "text-ignore-placement": false,
+        "text-allow-overlap": false,
+        "text-size": 14,
+        "text-font": [
+          "Font17"
         ],
-        'text-field': ['get', 'idthr'],
-        'text-size': 14,
-        'text-allow-overlap': true,
+        "text-field": "{idthr}",
         'text-rotation-alignment': 'map',
-        'icon-rotation-alignment': 'map',
-      },
-      paint: {
-        'text-color': '#fff',
-        "icon-color": "#b91c1c"
       },
+      "paint": {
+        "text-halo-color": "white",
+        "text-color": "red",
+        "text-halo-width": 2
+      }
     },
 
-    // ── 机位点（z11+）─────
-    {
-      id: 'amm-stand',
-      type: 'circle',
-      source: sourceId,
-      'source-layer': 'amm-stand',
-      minzoom: 12,
-      paint: {
-        'circle-color': C.stand,
-        'circle-radius': 1.5,
-      },
-    },
     // 机位编号标签
     {
       id: 'amm-stand-label',
       type: 'symbol',
       source: sourceId,
       'source-layer': 'amm-stand',
-      minzoom: 14,
-      layout: {
-        'text-field': ['get', 'idstd'],
-        'text-size': 9,
-        'text-anchor': 'bottom',
-        'text-offset': [0, -0.5],
-        'text-allow-overlap': false,
-      },
-      paint: {
-        'text-color': C.standLine, // 改为深墨绿字，白底/浅灰底上高可读
+      minzoom: 13.5,
+      "layout": {
+        "symbol-placement": "point",
+        "text-ignore-placement": false,
+        "text-allow-overlap": false,
+        "text-size": 14,
+        "text-font": [
+          "Font17"
+        ],
+        "text-field": [
+          "case",
+          [
+            "!=",
+            [
+              "get",
+              "idstd"
+            ],
+            ""
+          ],
+          [
+            "concat",
+            ".",
+            [
+              "get",
+              "idstd"
+            ],
+            "."
+          ],
+          ""
+        ],
       },
+      "paint": {
+        "text-halo-color": "#fefefe",
+        "text-color": C.standLine,
+        "text-halo-width": 2
+      }
     },
 
 
     // ── 垂直面状障碍物（z11+）──────────────────────────────────────
     {
       id: 'amm-obstacle-region-fill',
-      type: 'fill',
-      source: sourceId,
-      'source-layer': 'amm-obstacle-region',
-      minzoom: 11,
-      paint: {
-        'fill-color': '#fef08a',
-        'fill-opacity': 0.35,
-      },
-    },
-    {
-      id: 'amm-obstacle-region-stroke',
-      type: 'line',
+      type: 'fill-extrusion',
       source: sourceId,
       'source-layer': 'amm-obstacle-region',
       minzoom: 11,
       paint: {
-        'line-color': '#ca8a04',
-        'line-width': 1.5,
-        'line-dasharray': [1.5, 1]
-      },
+        "fill-extrusion-height": 10,
+        "fill-extrusion-color": 'hsl(240, 25%, 30%)',
+        "fill-extrusion-opacity": {
+          "base": 1,
+          "stops": [
+            [
+              11,
+              0
+            ],
+            [
+              12,
+              1
+            ]
+          ]
+        }
+      }
     },
 
-    // ── 垂直点状障碍物（z11+）──────────────────────────────────────
-    {
-      id: 'amm-obstacle-point',
-      type: 'circle',
-      source: sourceId,
-      'source-layer': 'amm-obstacle-point',
-      minzoom: 11,
-      paint: {
-        'circle-color': '#b45309',
-        'circle-radius': 4,
-        'circle-stroke-color': '#ffffff',
-        'circle-stroke-width': 1,
-      },
-    },
+
     // 点状障碍物名称标签
     {
       id: 'amm-obstacle-point-label',
@@ -1734,13 +1886,31 @@ function buildAMMLayersLight(sourceId = 'amm') {
         'text-field': ['coalesce', ['get', 'ident'], ['get', 'LABEL']],
         'text-size': 9,
         'text-anchor': 'bottom',
-        'text-offset': [0, -0.5],
-        'text-allow-overlap': false,
+        'text-offset': [0, -1],
+        "icon-allow-overlap": true,
+        "icon-image": 'navig:radio_tower',
+        "icon-size": {
+          "base": 2,
+          "stops": [
+            [
+              13,
+              0.5
+            ],
+            [
+              16,
+              1
+            ]
+          ]
+        }
       },
       paint: {
         'text-color': '#92400e',
         'text-halo-color': '#ffffff',
         'text-halo-width': 1,
+        "icon-color": "#010101",
+        "icon-halo-color": "#fefefe",
+        "icon-halo-width": 0.5,
+        "icon-halo-blur": 0.5
       },
     },
 
@@ -1787,6 +1957,15 @@ function buildAMMLayersLight(sourceId = 'amm') {
         'text-halo-width': 1,
       },
     },
+  ];
+
+  // 文字标注置于所有面、线和图标之后，避免被后续图层遮挡。
+  const textLayers = layers.filter((layer) =>
+    layer.type === 'symbol' && layer.layout?.['text-field'] !== undefined
+  );
+  return [
+    ...layers.filter((layer) => !textLayers.includes(layer)),
+    ...textLayers,
   ]
 }
 
@@ -1808,62 +1987,7 @@ const AMM_COLOR_DARK = {
 };
 
 function buildAMMLayersDark(sourceId = 'amm') {
-  const C = AMM_COLOR_DARK;
-  return [
-    { id: 'amm-airport-fill', type: 'fill', source: sourceId, 'source-layer': 'amm-airport', minzoom: 11, paint: { 'fill-color': C.airport, 'fill-opacity': 0.3 } },
-    { id: 'amm-airport-stroke', type: 'line', source: sourceId, 'source-layer': 'amm-airport', minzoom: 11, paint: { 'line-color': '#475569', 'line-width': 1 } },
-    { id: 'amm-runway-fill', type: 'fill', source: sourceId, 'source-layer': 'amm-runway', minzoom: 11, paint: { 'fill-color': C.runway, 'fill-opacity': 1 } },
-    { id: 'amm-runway-stroke', type: 'line', source: sourceId, 'source-layer': 'amm-runway', minzoom: 11, paint: { 'line-color': '#64748b', 'line-width': 0.5 } },
-    { id: 'amm-apron-fill', type: 'fill', source: sourceId, 'source-layer': 'amm-apron', minzoom: 11, paint: { 'fill-color': C.apron, 'fill-opacity': 1 } },
-    { id: 'amm-apron-stroke', type: 'line', source: sourceId, 'source-layer': 'amm-apron', minzoom: 11, paint: { 'line-color': '#334155', 'line-width': 0.5 } },
-    { id: 'amm-taxiway-fill', type: 'fill', source: sourceId, 'source-layer': 'amm-taxiway', minzoom: 11, paint: { 'fill-color': C.taxiway, 'fill-opacity': 0.8 } },
-    { id: 'amm-taxiway-line', type: 'line', source: sourceId, 'source-layer': 'amm-taxiway-line', minzoom: 11, paint: { 'line-color': C.taxiwayLine, 'line-width': ['interpolate', ['linear'], ['zoom'], 15, 0.8, 18, 2] } },
-
-    { id: 'amm-holding', type: 'line', source: sourceId, 'source-layer': 'amm-holding', minzoom: 11, paint: { 'line-color': C.holding, 'line-width': 1.5 } },
-    { id: 'amm-runway-marking', type: 'fill', source: sourceId, 'source-layer': 'amm-runway-marking', minzoom: 13, paint: { 'fill-color': C.runwayMarking, 'fill-opacity': 0.8 } },
-    { id: 'amm-restricted-fill', type: 'fill', source: sourceId, 'source-layer': 'amm-restricted', minzoom: 11, paint: { 'fill-color': C.restricted, 'fill-opacity': 0.12 } },
-    { id: 'amm-restricted-stroke', type: 'line', source: sourceId, 'source-layer': 'amm-restricted', minzoom: 11, paint: { 'line-color': C.restricted, 'line-width': 1.2, 'line-dasharray': [4, 2] } },
-    { id: 'amm-hotspot-fill', type: 'fill', source: sourceId, 'source-layer': 'amm-hotspot', minzoom: 11, paint: { 'fill-color': C.hotspot, 'fill-opacity': 0.15 } },
-    { id: 'amm-hotspot-stroke', type: 'line', source: sourceId, 'source-layer': 'amm-hotspot', minzoom: 11, paint: { 'line-color': C.hotspot, 'line-width': 1.2 } },
-    { id: 'amm-runway-centerline', type: 'line', source: sourceId, 'source-layer': 'amm-runway-centerline', minzoom: 11, paint: { 'line-color': C.runwayCenterline, 'line-width': 1, 'line-dasharray': [6, 3] } },
-    {
-      id: 'amm-runway-info', type: 'symbol', source: sourceId, 'source-layer': 'amm-runway-label', minzoom: 13,
-      layout: { 'text-field': ['concat', ['coalesce', ['get', 'length'], ''], '×', ['coalesce', ['get', 'width'], ''], 'm'], 'text-size': ['interpolate', ['exponential', 1.5], ['zoom'], 13, 10, 16, 13], 'symbol-placement': 'point', 'text-rotate': ['coalesce', ['get', 'bearing'], 0], 'text-rotation-alignment': 'map', 'text-allow-overlap': true, 'text-ignore-placement': true },
-      paint: { 'text-color': '#e2e8f0', 'text-halo-color': '#0f172a', 'text-halo-width': 2 },
-    },
-    { id: 'amm-stand-line', type: 'line', source: sourceId, 'source-layer': 'amm-stand-line', minzoom: 13, paint: { 'line-color': C.standLine, 'line-width': 1 } },
-    {
-      id: 'amm-taxiway-label', type: 'symbol', source: sourceId, 'source-layer': 'amm-taxiway-line', minzoom: 14,
-      layout: { 'text-field': ['get', 'idlin'], 'text-size': 10, "icon-image": "stretch:text_bg", "icon-text-fit": "both", "icon-text-fit-padding": [1, 2, 1, 2], 'symbol-placement': 'line', 'text-keep-upright': true, 'text-allow-overlap': false },
-      paint: { 'text-color': "#0f172a", "icon-color": C.taxiwayLine },
-    },
-    {
-      id: 'amm-runway-threshold-label', type: 'symbol', source: sourceId, 'source-layer': 'amm-runway-threshold', minzoom: 12,
-      layout: { "icon-image": "stretch:text_bg", "icon-text-fit": "both", "icon-text-fit-padding": [1, 2, 1, 2], 'text-field': ['get', 'idthr'], 'text-size': 14, 'text-allow-overlap': true, 'text-rotation-alignment': 'map', 'icon-rotation-alignment': 'map' },
-      paint: { 'text-color': '#ffffff', "icon-color": "#ef4444" },
-    },
-    { id: 'amm-stand', type: 'circle', source: sourceId, 'source-layer': 'amm-stand', minzoom: 12, paint: { 'circle-color': C.stand, 'circle-radius': 1.5 } },
-    {
-      id: 'amm-stand-label', type: 'symbol', source: sourceId, 'source-layer': 'amm-stand', minzoom: 14,
-      layout: { 'text-field': ['get', 'idstd'], 'text-size': 9, 'text-anchor': 'bottom', 'text-offset': [0, -0.5], 'text-allow-overlap': false },
-      paint: { 'text-color': C.stand, 'text-halo-color': '#0f172a', 'text-halo-width': 1 },
-    },
-    { id: 'amm-obstacle-region-fill', type: 'fill', source: sourceId, 'source-layer': 'amm-obstacle-region', minzoom: 11, paint: { 'fill-color': '#fef08a', 'fill-opacity': 0.15 } },
-    { id: 'amm-obstacle-region-stroke', type: 'line', source: sourceId, 'source-layer': 'amm-obstacle-region', minzoom: 11, paint: { 'line-color': '#eab308', 'line-width': 1.2, 'line-dasharray': [1.5, 1] } },
-    { id: 'amm-obstacle-point', type: 'circle', source: sourceId, 'source-layer': 'amm-obstacle-point', minzoom: 11, paint: { 'circle-color': '#f97316', 'circle-radius': 4, 'circle-stroke-color': '#0f172a', 'circle-stroke-width': 1 } },
-    {
-      id: 'amm-obstacle-point-label', type: 'symbol', source: sourceId, 'source-layer': 'amm-obstacle-point', minzoom: 14,
-      layout: { 'text-field': ['coalesce', ['get', 'ident'], ['get', 'LABEL']], 'text-size': 9, 'text-anchor': 'bottom', 'text-offset': [0, -0.5], 'text-allow-overlap': false },
-      paint: { 'text-color': '#fdba74', 'text-halo-color': '#0f172a', 'text-halo-width': 1.2 },
-    },
-    { id: 'amm-construction-fill', type: 'fill', source: sourceId, 'source-layer': 'amm-construction', minzoom: 11, paint: { 'fill-pattern': 'normal:passline', 'fill-opacity': 0.6 } },
-    { id: 'amm-construction-stroke', type: 'line', source: sourceId, 'source-layer': 'amm-construction', minzoom: 11, paint: { 'line-color': '#ea580c', 'line-width': 1.2, 'line-dasharray': [4, 2] } },
-    {
-      id: 'amm-construction-label', type: 'symbol', source: sourceId, 'source-layer': 'amm-construction', minzoom: 13,
-      layout: { 'text-field': ['get', 'text'], 'text-size': 9, 'text-anchor': 'center', 'symbol-placement': 'point', 'text-allow-overlap': false },
-      paint: { 'text-color': '#f97316', 'text-halo-color': '#0f172a', 'text-halo-width': 1 },
-    },
-  ]
+  return buildAMMLayersLight(sourceId, AMM_COLOR_DARK)
 }
 
 // ── Neutral (Charcoal) theme ──────────────────────────────────────────────────
@@ -1884,62 +2008,7 @@ const AMM_COLOR_NEUTRAL = {
 };
 
 function buildAMMLayersNeutral(sourceId = 'amm') {
-  const C = AMM_COLOR_NEUTRAL;
-  const H = '#1f1f23';
-  return [
-    { id: 'amm-airport-fill', type: 'fill', source: sourceId, 'source-layer': 'amm-airport', minzoom: 11, paint: { 'fill-color': C.airport, 'fill-opacity': 0.3 } },
-    { id: 'amm-airport-stroke', type: 'line', source: sourceId, 'source-layer': 'amm-airport', minzoom: 11, paint: { 'line-color': '#52525b', 'line-width': 1 } },
-    { id: 'amm-runway-fill', type: 'fill', source: sourceId, 'source-layer': 'amm-runway', minzoom: 11, paint: { 'fill-color': C.runway, 'fill-opacity': 1 } },
-    { id: 'amm-runway-stroke', type: 'line', source: sourceId, 'source-layer': 'amm-runway', minzoom: 11, paint: { 'line-color': '#52525b', 'line-width': 0.5 } },
-    { id: 'amm-apron-fill', type: 'fill', source: sourceId, 'source-layer': 'amm-apron', minzoom: 11, paint: { 'fill-color': C.apron, 'fill-opacity': 1 } },
-    { id: 'amm-apron-stroke', type: 'line', source: sourceId, 'source-layer': 'amm-apron', minzoom: 11, paint: { 'line-color': '#3f3f46', 'line-width': 0.5 } },
-    { id: 'amm-taxiway-fill', type: 'fill', source: sourceId, 'source-layer': 'amm-taxiway', minzoom: 11, paint: { 'fill-color': C.taxiway, 'fill-opacity': 0.9 } },
-    { id: 'amm-taxiway-line', type: 'line', source: sourceId, 'source-layer': 'amm-taxiway-line', minzoom: 11, paint: { 'line-color': C.taxiwayLine, 'line-width': ['interpolate', ['linear'], ['zoom'], 15, 0.8, 18, 2] } },
-    {
-      id: 'amm-taxiway-label', type: 'symbol', source: sourceId, 'source-layer': 'amm-taxiway-line', minzoom: 14,
-      layout: { 'text-field': ['get', 'idlin'], 'text-size': 10, "icon-image": "stretch:text_bg", "icon-text-fit": "both", "icon-text-fit-padding": [1, 2, 1, 2], 'symbol-placement': 'line', 'text-keep-upright': true, 'text-allow-overlap': false },
-      paint: { 'text-color': H, "icon-color": C.taxiwayLine },
-    },
-    { id: 'amm-holding', type: 'line', source: sourceId, 'source-layer': 'amm-holding', minzoom: 11, paint: { 'line-color': C.holding, 'line-width': 1.5 } },
-    { id: 'amm-runway-marking', type: 'fill', source: sourceId, 'source-layer': 'amm-runway-marking', minzoom: 13, paint: { 'fill-color': C.runwayMarking, 'fill-opacity': 0.85 } },
-    { id: 'amm-restricted-fill', type: 'fill', source: sourceId, 'source-layer': 'amm-restricted', minzoom: 11, paint: { 'fill-color': C.restricted, 'fill-opacity': 0.1 } },
-    { id: 'amm-restricted-stroke', type: 'line', source: sourceId, 'source-layer': 'amm-restricted', minzoom: 11, paint: { 'line-color': C.restricted, 'line-width': 1.2, 'line-dasharray': [4, 2] } },
-    { id: 'amm-hotspot-fill', type: 'fill', source: sourceId, 'source-layer': 'amm-hotspot', minzoom: 11, paint: { 'fill-color': C.hotspot, 'fill-opacity': 0.12 } },
-    { id: 'amm-hotspot-stroke', type: 'line', source: sourceId, 'source-layer': 'amm-hotspot', minzoom: 11, paint: { 'line-color': C.hotspot, 'line-width': 1.2 } },
-    { id: 'amm-runway-centerline', type: 'line', source: sourceId, 'source-layer': 'amm-runway-centerline', minzoom: 11, paint: { 'line-color': C.runwayCenterline, 'line-width': 1, 'line-dasharray': [6, 3] } },
-    {
-      id: 'amm-runway-info', type: 'symbol', source: sourceId, 'source-layer': 'amm-runway-label', minzoom: 13,
-      layout: { 'text-field': ['concat', ['coalesce', ['get', 'length'], ''], '×', ['coalesce', ['get', 'width'], ''], 'm'], 'text-size': ['interpolate', ['exponential', 1.5], ['zoom'], 13, 10, 16, 13], 'symbol-placement': 'point', 'text-rotate': ['coalesce', ['get', 'bearing'], 0], 'text-rotation-alignment': 'map', 'text-allow-overlap': true, 'text-ignore-placement': true },
-      paint: { 'text-color': '#e4e4e7', 'text-halo-color': H, 'text-halo-width': 2 },
-    },
-    { id: 'amm-stand-line', type: 'line', source: sourceId, 'source-layer': 'amm-stand-line', minzoom: 13, paint: { 'line-color': C.standLine, 'line-width': 1 } },
-    {
-      id: 'amm-runway-threshold-label', type: 'symbol', source: sourceId, 'source-layer': 'amm-runway-threshold', minzoom: 12,
-      layout: { "icon-image": "stretch:text_bg", "icon-text-fit": "both", "icon-text-fit-padding": [1, 2, 1, 2], 'text-field': ['get', 'idthr'], 'text-size': 14, 'text-allow-overlap': true, 'text-rotation-alignment': 'map', 'icon-rotation-alignment': 'map' },
-      paint: { 'text-color': '#ffffff', "icon-color": C.threshold },
-    },
-    { id: 'amm-stand', type: 'circle', source: sourceId, 'source-layer': 'amm-stand', minzoom: 12, paint: { 'circle-color': C.stand, 'circle-radius': 1.5 } },
-    {
-      id: 'amm-stand-label', type: 'symbol', source: sourceId, 'source-layer': 'amm-stand', minzoom: 14,
-      layout: { 'text-field': ['get', 'idstd'], 'text-size': 9, 'text-anchor': 'bottom', 'text-offset': [0, -0.5], 'text-allow-overlap': false },
-      paint: { 'text-color': C.stand, 'text-halo-color': H, 'text-halo-width': 1 },
-    },
-    { id: 'amm-obstacle-region-fill', type: 'fill', source: sourceId, 'source-layer': 'amm-obstacle-region', minzoom: 11, paint: { 'fill-color': '#fef08a', 'fill-opacity': 0.1 } },
-    { id: 'amm-obstacle-region-stroke', type: 'line', source: sourceId, 'source-layer': 'amm-obstacle-region', minzoom: 11, paint: { 'line-color': '#eab308', 'line-width': 1.2, 'line-dasharray': [1.5, 1] } },
-    { id: 'amm-obstacle-point', type: 'circle', source: sourceId, 'source-layer': 'amm-obstacle-point', minzoom: 11, paint: { 'circle-color': '#f97316', 'circle-radius': 4, 'circle-stroke-color': H, 'circle-stroke-width': 1 } },
-    {
-      id: 'amm-obstacle-point-label', type: 'symbol', source: sourceId, 'source-layer': 'amm-obstacle-point', minzoom: 14,
-      layout: { 'text-field': ['coalesce', ['get', 'ident'], ['get', 'LABEL']], 'text-size': 9, 'text-anchor': 'bottom', 'text-offset': [0, -0.5], 'text-allow-overlap': false },
-      paint: { 'text-color': '#fdba74', 'text-halo-color': H, 'text-halo-width': 1.2 },
-    },
-    { id: 'amm-construction-fill', type: 'fill', source: sourceId, 'source-layer': 'amm-construction', minzoom: 11, paint: { 'fill-pattern': 'normal:passline', 'fill-opacity': 0.6 } },
-    { id: 'amm-construction-stroke', type: 'line', source: sourceId, 'source-layer': 'amm-construction', minzoom: 11, paint: { 'line-color': '#ea580c', 'line-width': 1.2, 'line-dasharray': [4, 2] } },
-    {
-      id: 'amm-construction-label', type: 'symbol', source: sourceId, 'source-layer': 'amm-construction', minzoom: 13,
-      layout: { 'text-field': ['get', 'text'], 'text-size': 9, 'text-anchor': 'center', 'symbol-placement': 'point', 'text-allow-overlap': false },
-      paint: { 'text-color': '#f97316', 'text-halo-color': H, 'text-halo-width': 1 },
-    },
-  ]
+  return buildAMMLayersLight(sourceId, AMM_COLOR_NEUTRAL)
 }
 
 // ── Dispatcher ────────────────────────────────────────────────────────────────
@@ -1955,15 +2024,14 @@ const AMM_LAYER_GROUPS = {
   ammRunway: ['amm-runway-fill', 'amm-runway-stroke', 'amm-runway-info',
     'amm-runway-marking', 'amm-runway-centerline',
     'amm-runway-threshold', 'amm-runway-threshold-label'],
-  ammApron: ['amm-apron-fill', 'amm-apron-stroke'],
-  ammTaxiway: ['amm-taxiway-fill', 'amm-taxiway-line', 'amm-taxiway-label'],
-  ammHolding: ['amm-holding'],
-  ammStand: ['amm-stand', 'amm-stand-label', 'amm-stand-line'],
-  ammRestricted: ['amm-restricted-fill', 'amm-restricted-stroke'],
-  ammHotspot: ['amm-hotspot-fill', 'amm-hotspot-stroke'],
+  ammApron: ['amm-apron-fill', 'amm-apron-label'],
+  ammTaxiway: ['amm-taxiway-fill', 'amm-taxiway-line', 'amm-taxiway-label', 'amm-taxiway-guidanceline', 'amm-taxiway-intersectionline'],
+  ammHolding: ['amm-holding', 'amm-holding-label'],
+  ammStand: ['amm-stand-label', 'amm-stand-line'],
+  ammRestricted: ['amm-restricted-fill'],
+  ammHotspot: ['amm-hotspot-fill'],
   /** 障碍物（点 + 面） */
-  ammObstacle: ['amm-obstacle-region-fill', 'amm-obstacle-region-stroke',
-    'amm-obstacle-point', 'amm-obstacle-point-label'],
+  ammObstacle: ['amm-obstacle-region-fill', 'amm-obstacle-point-label'],
   ammConstruction: ['amm-construction-fill', 'amm-construction-stroke', 'amm-construction-label'],
 };
 
@@ -1977,10 +2045,22 @@ const TYPEMAP = {
     ocean: ["ocean_label"],
     airspace: ["airspaceLayer", "airspace_label_side_layer", "airspaceLayer_line", "airspace_label_center_layer"],
     airline: ["airline", "airline_label", "airline_point", "airline_radial"],
-    controlled: ["controlledLayer", "controlledLayer_stroke", "controlled_line_label"],
-    restricted: ["restrictedLayer", "restrictedLayer_stroke", "restricted_line_label"],
-    vor: ["vor_icon", "vor_icon_dial", "vor_label"],
-    ndb: ["ndb_icon"],
+    controlled: [
+        "controlledLayer",
+        "controlledLayer_stroke_left_bg",
+        "controlledLayer_stroke_border",
+        "controlledLayer_stroke",
+        "controlled_line_label",
+    ],
+    restricted: [
+        "restrictedLayer",
+        "restrictedLayer_stroke_border",
+        "restrictedLayer_stroke_bg",
+        "restrictedLayer_stroke",
+        "restricted_line_label",
+    ],
+    vor: ["vor_icon", "vor_icon_dial", "vor_label", "vor_label_detail"],
+    ndb: ["ndb_icon", "ndb_label_detail"],
     airport: ["airport", "airport-runway", "airport-runway-cross"],
     adiz: ["adiz-line", "adiz-label"],
     waypointOffAirway: ["waypoint-off-airway-symbol"],
@@ -7448,9 +7528,9 @@ function getAviationBaseStyle(opts) {
             { id: "normal", url: `${spriteBase}/kyresources/sprite-color` },
             { id: "default", url: `${spriteBase}/kyresources/sprite` },
             { id: "v2", url: `${spriteBase}/kyresources/sprite-v2` },
-            { id: "vor", url: `${spriteBase}/kyresources/sprite-vor` },
             { id: "runway", url: `${spriteBase}/kyresources/sprite-runway` },
             { id: "stretch", url: `${spriteBase}/kyresources/sprite-stretch` },
+            { id: "navig", url: `${spriteBase}/kyresources/sprite-navig` },
         ],
         sources: {
             land: { type: "geojson", data: LAND_FC },
@@ -9780,10 +9860,9 @@ const THEME_TOKENS = {
     airspaceStroke: '#6F7E68',
     restrictedFill: '#FAD7A0',
     restrictedFillPattern: "",
-    restrictedStrokeLine: '#f6bf65',
-    restrictedStroke: '#D35400',    // 限制区标注文字色（ICAO 导出/图例用）
-    controlledStroke: '#10B981',
-    controlledFill: '#10B981',
+    restrictedStrokeLine: '#ca84a0',
+    restrictedStroke: '#ca84a0',
+    controlled: '#5fa4d9',
     segment: '#1C2526',
     segmentWith: ['interpolate', ['linear'], ['zoom'], 6, 0.2, 8, 0.8],
     segmentRemark: '#E8A020',       // HAS_REMARK 航段
@@ -9792,10 +9871,14 @@ const THEME_TOKENS = {
     airportText: '#006400',         // 机场文字色（非 AMM）
     runway: '#006400',
     vorDial: '#0b417a',
-    vorNormal: '#3874cb',
+    vorNormal: '#00008B',
     vor: '#00008B',
+    vorCompass: '#2E4053',
+    vorCompassPointer: '#000000',
     ndbIcon: 'v2:ndb-normal',       // 图标按主题不同（正常）
     ndb: '#0066CC',
+    navAidDetailText: '#000000',
+    navAidDetailHalo: '#ffffff',
     waypoint: '#1C2526',
     airlinePointIcon: ['case', ['==', ['get', 'report_type'], 'C'], 'waypoint-compusory', 'waypoint'],
     // airline_label format 内嵌文字色
@@ -9820,7 +9903,7 @@ const THEME_TOKENS = {
     restrictedFill: ['case', ['==', ['get', 'CODE_TYPE'], 'P'], '#ef4444', ['==', ['get', 'CODE_TYPE'], 'D'], '#f97316', '#ef4444'],
     restrictedStrokeLine: '#CC7722',
     restrictedStroke: '#CC7722',
-    controlledStroke: '#22C55E',
+    controlled: '#22C55E',
     controlledFill: '#22C55E',
     segment: '#40C4FF',
     segmentWith: ['interpolate', ['linear'], ['zoom'], 6, 0.2, 8, 0.8],
@@ -9832,8 +9915,12 @@ const THEME_TOKENS = {
     vorDial: '#38bdf8',
     vorNormal: '#38bdf8',
     vor: '#72aae5',
+    vorCompass: '#38bdf8',
+    vorCompassPointer: '#E0F7FA',
     ndbIcon: 'ndb-inway',
     ndb: '#62d6ef',
+    navAidDetailText: '#E0F7FA',
+    navAidDetailHalo: '#0f172a',
     waypoint: '#74cdde',
     airlinePointIcon: ['case', ['==', ['get', 'report_type'], 'C'], 'waypoint-compusory', 'waypoint'],
     alBase: '#0f172a', alDist: '#cbd5e1', alRnp: '#FFFFFF',
@@ -9860,7 +9947,7 @@ const THEME_TOKENS = {
     restrictedFillPattern: "",
     restrictedStrokeLine: '#e59866',
     restrictedStroke: '#e59866',
-    controlledStroke: '#52c9a3',
+    controlled: '#52c9a3',
     controlledFill: '#52c9a3',
     segment: '#8fa8c7',
     segmentWith: ['interpolate', ['linear'], ['zoom'], 6, 0.2, 8, 0.8],
@@ -9872,8 +9959,12 @@ const THEME_TOKENS = {
     vorDial: '#5dade2',
     vorNormal: '#5dade2',
     vor: '#85a9e0',
+    vorCompass: '#5dade2',
+    vorCompassPointer: '#dce9f0',
     ndbIcon: 'ndb-inway',
     ndb: '#7ec8e3',
+    navAidDetailText: '#dce9f0',
+    navAidDetailHalo: '#16212c',
     waypoint: '#a9c6d8',
     airlinePointIcon: ['case', ['==', ['get', 'report_type'], 'C'], 'waypoint-compusory', 'waypoint'],
     alBase: '#1B2838', alDist: '#b8c9d9', alRnp: '#f4c542',
@@ -9901,7 +9992,7 @@ const THEME_TOKENS = {
     restrictedFillPattern: "",
     restrictedStrokeLine: '#C0392B',
     restrictedStroke: '#C0392B',
-    controlledStroke: '#2E5C8A',
+    controlled: '#2E5C8A',
     controlledFill: '#2E5C8A',
     segment: '#34495E',
     segmentWith: ['interpolate', ['linear'], ['zoom'], 6, 0.2, 8, 0.8],
@@ -9913,8 +10004,12 @@ const THEME_TOKENS = {
     vorDial: '#2E5C8A',
     vorNormal: '#2E5C8A',
     vor: '#154360',
+    vorCompass: '#2E5C8A',
+    vorCompassPointer: '#1B2631',
     ndbIcon: 'v2:ndb-normal',
     ndb: '#8B5A2B',
+    navAidDetailText: '#1B2631',
+    navAidDetailHalo: '#F2EFE6',
     waypoint: '#2C3E50',
     airlinePointIcon: ['case', ['==', ['get', 'report_type'], 'C'], 'waypoint-compusory', 'waypoint'],
     alBase: '#F2EFE6', alDist: '#5D6D7E', alRnp: '#D68910',
@@ -9940,7 +10035,7 @@ const THEME_TOKENS = {
     restrictedStrokeLine: '#7E524D',
     restrictedStrokeLineWidth: 1.2,
     restrictedStroke: '#D35400',    // 限制区标注文字色（ICAO 导出/图例用）
-    controlledStroke: "#88918088",
+    controlled: "#88918088",
     controlledFill: '#C7CEC096',
     segment: '#1C2526',
     segmentWith: ['interpolate', ['linear'], ['zoom'], 6, 1.9, 10, 2.2],
@@ -9952,8 +10047,12 @@ const THEME_TOKENS = {
     vorDial: '#0b417a',
     vorNormal: '#3874cb',
     vor: '#00008B',
+    vorCompass: '#2E4053',
+    vorCompassPointer: '#000000',
     ndbIcon: 'v2:ndb-normal',       // 图标按主题不同（正常）
     ndb: '#0066CC',
+    navAidDetailText: '#000000',
+    navAidDetailHalo: '#ffffff',
     waypoint: '#1C2526',
     airlinePointIcon: ['case', ['==', ['get', 'report_type'], 'C'], 'designate_point_inway', 'designate_point_notinway'],
     airlinePointIconSize: 0.65,
@@ -9980,6 +10079,8 @@ const THEME_TOKENS = {
 function buildLayers(themeId = 'light') {
   const T = THEME_TOKENS[themeId] ?? THEME_TOKENS.light;
   const sourceId = 'navdata';
+  const isLightTheme = themeId === 'light';
+  const frutigerBold = ['Frutiger Bold'];
   // `has` alone is insufficient for segment labels: the data can carry an
   // empty direction field. Keep all direction decisions on non-empty values.
   const hasText = (field) => [
@@ -10026,6 +10127,7 @@ function buildLayers(themeId = 'light') {
       ],
       layout: {
         'text-field': ['get', 'name_en'],
+        'text-font': frutigerBold,
         // zoom 插值必须为顶层表达式；每个档位再乘以按 scalerank 得到的大小倍率
         // (scalerank 0=大洋→最大, 8→最小)。
         'text-size': 11,
@@ -10052,16 +10154,67 @@ function buildLayers(themeId = 'light') {
     },
     {
       id: 'airspace_label_side_layer', type: 'symbol', source: sourceId, 'source-layer': 'fir', minzoom: 4,
-      layout: { 'text-field': ["concat", ["get", "TXT_NAME"], "/", ["get", "CODE_ID"], "/", ["get", "CODE_TYPE"]], 'text-size': 10, 'symbol-placement': 'line', 'text-max-width': 8, "text-offset": [0, 1], "text-letter-spacing": 0.05, "text-optional": true },
+      layout: { 'text-field': ["concat", ["get", "TXT_NAME"], "/", ["get", "CODE_ID"], "/", ["get", "CODE_TYPE"]], 'text-font': frutigerBold, 'text-size': 10, 'symbol-placement': 'line', 'text-max-width': 8, "text-offset": [0, 1], "text-letter-spacing": 0.05, "text-optional": true },
       paint: { 'text-color': T.airspaceStroke, ...T.sideHalo },
     },
     {
-      id: 'airspace_label_center_layer', type: 'symbol', source: sourceId, 'source-layer': 'fir-centroid', minzoom: 3,
+      id: 'airspace_label_center_layer', type: 'symbol', source: sourceId, 'source-layer': 'fir-centroid',
+      minzoom: 3,
+      "maxzoom": 6,
       layout: {
-        'text-field': ['coalesce', ['get', 'CODE_ID'], ['get', 'TXT_NAME']],
-        'text-size': ['interpolate', ['linear'], ['zoom'], 3, 12, 17, 16],
+        'text-field': '{CODE_ID}',
+        'text-font': frutigerBold,
         'symbol-placement': 'point',
         'text-max-width': 8,
+        'symbol-sort-key': ['*', -1, ['get', 'SIZE']],
+        "text-letter-spacing": 0.02,
+        "text-size": [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+
+          // Z2：全球视角
+          2,
+          [
+            "interpolate",
+            ["linear"],
+            ["sqrt", ["get", "SIZE"]],
+            100, 9,
+            316, 11,
+            707, 13,
+            1000, 14,
+            1414, 16,
+            2236, 18
+          ],
+
+          // Z4：区域视角
+          4,
+          [
+            "interpolate",
+            ["linear"],
+            ["sqrt", ["get", "SIZE"]],
+            100, 10,
+            316, 12,
+            707, 14,
+            1000, 16,
+            1414, 18,
+            2236, 20
+          ],
+
+          // Z6：FIR 最后显示层级
+          6,
+          [
+            "interpolate",
+            ["linear"],
+            ["sqrt", ["get", "SIZE"]],
+            100, 11,
+            316, 13,
+            707, 15,
+            1000, 17,
+            1414, 19,
+            2236, 21
+          ]
+        ]
       },
       paint: {
         'text-color': T.airspaceStroke,
@@ -10077,14 +10230,57 @@ function buildLayers(themeId = 'light') {
         'fill-opacity': ["interpolate", ["linear"], ["zoom"], 10, 0.15, 11.5, 0],
       },
     },
+    {
+      id: 'restrictedLayer_stroke_bg', type: 'line', source: sourceId, 'source-layer': 'restricted',
+      paint: {
+        'line-color': T.restrictedStrokeLine,
+        'line-opacity': isLightTheme ? ['step', ['zoom'], 0, 6, 0.2] : 0,
+        'line-offset': ['interpolate', ['exponential', 2], ['zoom'], 6, 1, 7, 1, 10, 5],
+        'line-width': ['interpolate', ['exponential', 2], ['zoom'], 6, 1, 7, 2, 10, 10],
+      },
+    },
     {
       id: 'restrictedLayer_stroke', type: 'line', source: sourceId, 'source-layer': 'restricted',
-      paint: { 'line-color': T.restrictedStrokeLine, 'line-width': T.restrictedStrokeLineWidth || 1, "line-dasharray": [2, 2], "line-opacity": ['interpolate', ['linear'], ['zoom'], 4, 0.5, 8, 1] },
+      layout: isLightTheme
+        ? { 'line-join': 'round', 'line-cap': 'round' }
+        : {},
+      paint: isLightTheme
+        ? {
+          'line-color': T.restrictedStrokeLine,
+          'line-opacity': ['step', ['zoom'], 0, 6, 1],
+          'line-width': ['interpolate', ['exponential', 2], ['zoom'], 6, 0.5, 7, 1, 8, 2],
+        }
+        : {
+          'line-color': T.restrictedStrokeLine,
+          'line-width': T.restrictedStrokeLineWidth || 1,
+          'line-opacity': ['interpolate', ['linear'], ['zoom'], 4, 0.5, 8, 1],
+        },
     },
     {
       id: 'restricted_line_label', type: 'symbol', source: sourceId, 'source-layer': 'restricted', minzoom: 6,
-      layout: { 'text-field': ["concat", ["get", "TXT_NAME"], "/", ["get", "CODE_ID"], "/", ["get", "CODE_TYPE"]], "text-letter-spacing": 0.1, 'text-size': 10, 'symbol-placement': 'line', 'text-max-width': 8, "text-offset": [0, 1] },
-      paint: { 'text-color': T.restrictedStroke, ...T.restrictedHalo },
+      layout: {
+        'text-field': [
+          'concat',
+          ['get', 'TXT_NAME'],
+          ':',
+          [
+            'case',
+            ['==', ['get', 'alt_lower'], 0],
+            'GND',
+            ['to-string', ['get', 'alt_lower']]
+          ],
+          '-',
+          [
+            'case',
+            ['==', ['get', 'alt_upper'], 99999],
+            'UNL',
+            ['to-string', ['get', 'alt_upper']]
+          ]
+        ], 'text-font': frutigerBold, "text-letter-spacing": 0.1, 'text-size': 10, 'symbol-placement': 'line', 'text-max-width': 8, "text-offset": [0, 1.5]
+      },
+      paint: isLightTheme
+        ? { 'text-color': T.restrictedStroke, 'text-halo-color': T.halo, 'text-halo-width': 0.5 }
+        : { 'text-color': T.restrictedStroke, ...T.restrictedHalo },
     },
     {
       id: 'controlledLayer', type: 'fill', source: sourceId, 'source-layer': 'controlled-fill', minzoom: 4,
@@ -10093,14 +10289,60 @@ function buildLayers(themeId = 'light') {
         "fill-opacity": ["interpolate", ["linear"], ["zoom"], 10, 0.035, 11.5, 0],
       },
     },
+    {
+      // Based on Navigraph's controlled-airspace treatment. The current
+      // navdata stack calls this source-layer `controlled`; no `lo` filter is
+      // applied so all controlled-airspace features remain visible.
+      id: 'controlledLayer_stroke_left_bg', type: 'line', source: sourceId, 'source-layer': 'controlled',
+      paint: {
+        'line-color': T.controlled,
+        'line-opacity': isLightTheme ? ['step', ['zoom'], 0, 6, 0.2] : 0,
+        'line-offset': ['interpolate', ['exponential', 2], ['zoom'], 6, 0, 7, 1, 10, 5],
+        'line-width': ['interpolate', ['exponential', 2], ['zoom'], 6, 1, 7, 2, 10, 10],
+      },
+    },
     {
       id: 'controlledLayer_stroke', type: 'line', source: sourceId, 'source-layer': 'controlled',
-      paint: { 'line-color': T.controlledStroke, 'line-width': 1, 'line-opacity': ['interpolate', ['linear'], ['zoom'], 4, 0.5, 8, 1], "line-dasharray": [1, 1.4] },
+      layout: isLightTheme
+        ? { 'line-join': 'round', 'line-cap': 'square' }
+        : {},
+      paint: isLightTheme
+        ? {
+          'line-color': T.controlled,
+          'line-dasharray': [2, 2, 4, 2],
+          'line-opacity': ['interpolate', ['linear'], ['zoom'], 6, 0, 6.5, 1],
+          'line-width': 1,
+        }
+        : {
+          'line-color': T.controlled,
+          'line-width': 1,
+          'line-opacity': ['interpolate', ['linear'], ['zoom'], 4, 0.5, 8, 1],
+          'line-dasharray': [1, 1.4],
+        },
     },
     {
       id: 'controlled_line_label', type: 'symbol', source: sourceId, 'source-layer': 'controlled', minzoom: 6,
-      layout: { 'text-field': ["concat", ["get", "TXT_NAME"], "/", ["get", "CODE_ID"], "/", ["get", "CODE_TYPE"]], 'text-size': 10, 'symbol-placement': 'line', 'text-letter-spacing': 0.2, 'text-max-width': 8, "text-offset": [0, 1] },
-      paint: { 'text-color': T.controlledStroke, ...T.controlledHalo },
+      layout: {
+        'text-field': [
+          'concat',
+          ['get', 'TXT_NAME'],
+          ':',
+          [
+            'case',
+            ['==', ['get', 'alt_lower'], 0],
+            'GND',
+            ['to-string', ['get', 'alt_lower']]
+          ],
+          '-',
+          [
+            'case',
+            ['==', ['get', 'alt_upper'], 99999],
+            'UNL',
+            ['to-string', ['get', 'alt_upper']]
+          ]
+        ], 'text-font': frutigerBold, 'text-size': 10, 'symbol-placement': 'line', 'text-letter-spacing': 0.2, 'text-max-width': 8, "text-offset": [0, 1.5]
+      },
+      paint: { 'text-color': T.controlled, ...T.controlledHalo },
     },
     {
       id: 'airline', type: 'line', source: sourceId, 'source-layer': 'segment', minzoom: 6,
@@ -10111,13 +10353,64 @@ function buildLayers(themeId = 'light') {
         "line-opacity": ["interpolate", ["linear"], ["zoom"], 6, 0.5, 7, 1, 8, 1, 12, 0.8, 15, 0.2],
       }
     },
+    {
+      "id": "airline-shadow",
+      "type": "line",
+      "source": sourceId,
+      "source-layer": "segment-shdow",
+      "minzoom": 6,
+      "layout": {
+        "line-cap": "round",
+        "line-join": "round"
+      },
+      "paint": {
+        "line-color": T.segment,
+        "line-width": {
+          "base": 2,
+          "stops": [
+            [
+              3,
+              0.1
+            ],
+            [
+              8,
+              1
+            ]
+          ]
+        },
+        "line-dasharray": [
+          2,
+          2
+        ],
+        "line-opacity": {
+          "base": 2,
+          "stops": [
+            [
+              5,
+              0.125
+            ],
+            [
+              8,
+              0.2
+            ]
+          ]
+        }
+      },
+    },
     {
       id: 'airline_label', type: 'symbol', source: sourceId, 'source-layer': 'segment', minzoom: 6,
       layout: {
-        "icon-image": ["case", hasBothDesignation, "stretch:segment-both", hasForwardDesignation, "stretch:segment-right", hasBackwardDesignation, "stretch:segment-left", "stretch:segment-both"],
+        "icon-image": [
+          'match',
+          ['get', 'DIRECTION'],
+          'FORWARD', 'stretch:segment-right',
+          'BACKWARD', 'stretch:segment-left',
+          'stretch:segment-both',
+        ],
         "icon-anchor": "center", "symbol-placement": "line", "icon-text-fit": "width", "icon-size": 1,
         "text-allow-overlap": false, "icon-allow-overlap": false, "text-optional": false,
         "text-anchor": "center", "text-justify": "center", "text-line-height": 1.3, "text-letter-spacing": 0.1,
+        "text-font": ['Frutiger Regular'],
         "text-field": ["step", ["zoom"],
           ["format", ["case", hasBothDesignation, ["get", "TXT_DESIG"], hasForwardDesignation, ["get", "TXT_DESIG_FORWARD"], hasBackwardDesignation, ["get", "TXT_DESIG_BACKWARD"], "-"], { "font-scale": 1, "text-color": T.alBase }],
           10,
@@ -10143,21 +10436,88 @@ function buildLayers(themeId = 'light') {
       },
     },
     {
-      id: 'airline_radial', type: 'symbol', source: sourceId, 'source-layer': 'segment-radial', minzoom: 13,
-      layout: {
-        'text-field': ['concat', ['get', 'bearing'], '°'],
-        'text-size': 9,
-        'text-rotate': ['to-number', ['get', 'line_angle'], 0],
-        'text-rotation-alignment': 'map',
-        'text-allow-overlap': true,
-        'text-ignore-placement': true,
-        'text-offset': [0, -0.6],
-        'text-justify': 'auto',
+      id: 'airline_radial', type: 'symbol', source: sourceId, 'source-layer': 'segment-radial', minzoom: 11,
+      "layout": {
+        "text-rotation-alignment": "map",
+        "text-line-height": 0.5,
+        "text-font": [
+          "Font11"
+        ],
+        "text-padding": 1,
+        "text-size": {
+          "base": 2,
+          "stops": [
+            [
+              8,
+              6
+            ],
+            [
+              10,
+              8
+            ]
+          ]
+        },
+        "symbol-placement": "line-center",
+        "text-field": [
+          "concat",
+          [
+            "case",
+            [
+              "<",
+              [
+                "to-number",
+                [
+                  "get",
+                  "bearing"
+                ]
+              ],
+              10
+            ],
+            "00",
+            [
+              "case",
+              [
+                "<",
+                [
+                  "to-number",
+                  [
+                    "get",
+                    "bearing"
+                  ]
+                ],
+                100
+              ],
+              "0",
+              ""
+            ]
+          ],
+          [
+            "get",
+            "bearing"
+          ],
+          "^"
+        ]
+      },
+      "paint": {
+        "text-color": T.segment,
+        "text-halo-color": T.halo,
+        "text-halo-width": {
+          "base": 2,
+          "stops": [
+            [
+              8,
+              0.8
+            ],
+            [
+              10,
+              1.2
+            ]
+          ]
+        }
       },
-      paint: { 'text-color': T.segment, ...T.radialHalo },
     },
     {
-      id: 'airport', type: 'symbol', source: sourceId, minzoom: 2, 'source-layer': 'airport',
+      id: 'airport', type: 'symbol', source: sourceId, minzoom: 2.5, 'source-layer': 'airport',
       // 4级前就显示大型机场+中型，5级后全部显示
       filter:
         ['case',
@@ -10187,7 +10547,7 @@ function buildLayers(themeId = 'light') {
         "text-optional": true,
         "visibility": "none",
         "icon-size": ["interpolate", ["linear"], ["zoom"], 2, 0.6, 5, 0.7, 9, 1, 12, 1.1],
-        'text-font': ['Open Sans Semibold'],
+        'text-font': frutigerBold,
       },
       paint: {
         'icon-color': ['case', ['has', 'has_amm'], T.airportamm, T.airport],
@@ -10274,9 +10634,22 @@ function buildLayers(themeId = 'light') {
     },
     {
       id: 'vor_icon_dial', type: 'symbol', source: sourceId, 'source-layer': 'vor', minzoom: 8,
+      'maxzoom': 12,
       layout: {
-        "icon-image": "vor:vor_dial",
-        "icon-size": ["interpolate", ["linear"], ["zoom"], 8, 0.072, 10, 0.072, 11, 0.126, 12, 0.180, 13, 0.234, 14, 0.288, 15, 0.342, 16, 0.396, 17, 0.450, 22, 0.450],
+        "icon-image": "navig:compass",
+        "icon-size": {
+          "base": 2,
+          "stops": [
+            [
+              8,
+              0.0625
+            ],
+            [
+              12,
+              1
+            ]
+          ]
+        },
         "icon-rotate": ["to-number", ["get", "VAL_MAG_VAR"], 0],
         "icon-rotation-alignment": "map",
         "symbol-z-order": "viewport-y",
@@ -10288,10 +10661,140 @@ function buildLayers(themeId = 'light') {
       paint: { "icon-color": T.vorDial }
     },
     {
-      id: 'vor_icon', minzoom: 4, maxzoom: 9, type: 'symbol', source: sourceId, 'source-layer': 'vor',
+      "id": "vor_icon_dial_arrow",
+      "type": "symbol",
+      "source": sourceId,
+      "source-layer": 'vor',
+      "minzoom": 8.5,
+      'maxzoom': 12,
+      "layout": {
+        "icon-rotation-alignment": "map",
+        "icon-allow-overlap": true,
+        "icon-image": "navig:compass-arrow",
+        "icon-rotate": ["to-number", ["get", "VAL_MAG_VAR"], 0],
+        "icon-size": {
+          "base": 2,
+          "stops": [
+            [
+              8,
+              0.0625
+            ],
+            [
+              12,
+              1
+            ]
+          ]
+        }
+      },
+      "paint": {
+        "icon-color": T.vorDial
+      }
+    },
+    {
+      "id": "vor-compass-ring",
+      "type": "line",
+      "source": sourceId,
+      "source-layer": "compass",
+      "minzoom": 12.1,
+      "filter": [
+        "==",
+        [
+          "get",
+          "kind"
+        ],
+        "ring"
+      ],
+      "layout": {
+        "line-cap": "round",
+        "line-join": "round",
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": T.vorDial,
+        "line-width": 1.15,
+        "line-opacity": 0.9
+      }
+    },
+    {
+      "id": "vor-compass-ticks",
+      "type": "line",
+      "source": sourceId,
+      "source-layer": "compass",
+      "minzoom": 12.1,
+      "filter": [
+        "==",
+        [
+          "get",
+          "kind"
+        ],
+        "ticks"
+      ],
+      "layout": {
+        "line-cap": "round",
+        "line-join": "round",
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": T.vorDial,
+        "line-width": [
+          "match",
+          [
+            "get",
+            "rank"
+          ],
+          "cardinal",
+          1.7,
+          "major",
+          1.4,
+          "medium",
+          1.2,
+          1
+        ],
+        "line-opacity": 0.9
+      }
+    },
+    {
+      "id": "vor-compass-pointer",
+      "type": "line",
+      "source": sourceId,
+      "source-layer": "compass",
+      "minzoom": 12.1,
+      "filter": [
+        "==",
+        [
+          "get",
+          "kind"
+        ],
+        "pointer"
+      ],
+      "layout": {
+        "line-cap": "round",
+        "line-join": "round",
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": T.vorDial,
+        "line-width": 1.8,
+        "line-opacity": 1
+      }
+    },
+    {
+      id: 'vor_icon', minzoom: 4, type: 'symbol', source: sourceId, 'source-layer': 'vor',
       layout: {
-        "icon-image": "v2:vor-normal",
-        "icon-size": ["interpolate", ["linear"], ["zoom"], 4, 0.7, 8, 1],
+        "icon-image": "navig:vordme",
+        "icon-size": {
+          "base": 2,
+          "stops": [
+            [
+              5,
+              0.4
+            ],
+            [
+              7,
+              0.5
+            ]
+          ]
+        },
         "icon-rotation-alignment": "map",
         "symbol-z-order": "viewport-y",
         "text-letter-spacing": 0.05,
@@ -10300,13 +10803,40 @@ function buildLayers(themeId = 'light') {
       },
       paint: {
         "icon-color": T.vorNormal,
-        "icon-opacity": ["interpolate", ["linear"], ["zoom"], 8, 1, 9, 0],
+        "icon-halo-color": "#fff",
+        'icon-opacity': 1,
+        "icon-halo-width": {
+          "base": 2,
+          "stops": [
+            [
+              5,
+              0.5
+            ],
+            [
+              7,
+              1
+            ]
+          ]
+        },
+        "icon-halo-blur": {
+          "base": 2,
+          "stops": [
+            [
+              5,
+              0.5
+            ],
+            [
+              7,
+              1
+            ]
+          ]
+        }
       }
     },
     {
-      id: 'vor_label', type: 'symbol', source: sourceId, 'source-layer': 'vor', minzoom: 5,
+      id: 'vor_label', type: 'symbol', source: sourceId, 'source-layer': 'vor', minzoom: 5, maxzoom: 8,
       layout: {
-        'text-field': ['get', 'CODE_ID'], 'text-size': 10, 'text-anchor': 'top',
+        'text-field': ['get', 'CODE_ID'], 'text-font': ['Frutiger Regular'], 'text-size': 10, 'text-anchor': 'top',
         'text-offset': [0, 0.8]
       },
       paint: { 'text-color': T.vor, 'text-halo-color': T.halo, 'text-halo-width': 1 },
@@ -10316,12 +10846,8 @@ function buildLayers(themeId = 'light') {
       layout: {
         "icon-image": T.ndbIcon, "icon-size": ["interpolate", ["linear"], ["zoom"], 6, 0.5, 10, 1],
         "symbol-z-order": "viewport-y",
-        "text-field": [
-          "format",
-          ["get", "CODE_ID"], { "text-color": T.ndb, "font-scale": 1.1 },
-          "", {},
-          ["coalesce", ["get", "VAL_FREQ"], ""], { "text-color": T.ndb, "font-scale": 0.95 }
-        ],
+        "text-font": frutigerBold,
+        "text-field": ["get", "CODE_ID"],
         "text-size": 10,
         "text-offset": [0, 0.5],
         "text-letter-spacing": 0.05,
@@ -10333,10 +10859,67 @@ function buildLayers(themeId = 'light') {
         "text-color": T.ndb,
         ...T.ndbHalo,
         "icon-color": T.ndb,
-        "text-opacity": ["interpolate", ["linear"], ["zoom"], 4, 0, 5.5, 0, 6, 0.6, 8, 1, 10, 0.3],
+        "text-opacity": ["step", ["zoom"], 0, 5.5, 0, 6, 0.6, 7, 1, 8, 0],
         "icon-opacity": ["interpolate", ["linear"], ["zoom"], 4, 0, 5, 0.3, 5.5, 0.8, 8, 1, 12, 1, 14, 0.6],
       }
     },
+    {
+      id: 'vor_label_detail', type: 'symbol', source: sourceId, 'source-layer': 'vor', minzoom: 8,
+      layout: {
+        'text-max-width': 20,
+        'text-allow-overlap': false,
+        'text-size': ['interpolate', ['exponential', 2], ['zoom'], 5, 6, 7, 10.5],
+        'text-radial-offset': 1,
+        'text-justify': 'auto',
+        'text-variable-anchor': ['bottom', 'right', 'left', 'top', 'bottom-right', 'bottom-left', 'top-right', 'top-left'],
+        'text-font': ['Fira Code SemiBold'],
+        'text-padding': 8,
+        'text-line-height': 0.2,
+        'text-field': [
+          'case',
+          ['==', ['get', 'VAL_FREQ'], 0],
+          ['get', 'CODE_ID'],
+          ['format',
+            ['get', 'TXT_NAME'], { 'font-scale': 0.8 },
+            '\n\n\n\n\n\n', {},
+            ['get', 'CODE_ID'], { 'font-scale': 1.5, 'text-font': ['literal', ['Morse']] },
+            '\n', {},
+            ['concat',
+              ['case', ['==', ['get', 'ARINC'], ''], '', ['concat', ' ', ['get', 'ARINC'], ' ']],
+              ['get', 'VAL_FREQ'], ' ', ['get', 'CODE_ID'],
+            ], {},
+          ],
+        ],
+      },
+      paint: { 'text-color': T.navAidDetailText, 'text-halo-color': T.navAidDetailHalo, 'text-halo-width': 0.2 },
+    },
+    {
+      id: 'ndb_label_detail', type: 'symbol', source: sourceId, 'source-layer': 'ndb', minzoom: 8,
+      layout: {
+        'text-max-width': 20,
+        'text-allow-overlap': false,
+        'text-size': ['interpolate', ['exponential', 2], ['zoom'], 5, 6, 7, 10.5],
+        'text-radial-offset': 1,
+        'text-justify': 'auto',
+        'text-variable-anchor': ['bottom', 'right', 'left', 'top', 'bottom-right', 'bottom-left', 'top-right', 'top-left'],
+        'text-font': ['Fira Code SemiBold'],
+        'text-padding': 8,
+        'text-line-height': 0.2,
+        'text-field': [
+          'case',
+          ['==', ['get', 'VAL_FREQ'], 0],
+          ['get', 'CODE_ID'],
+          ['format',
+            ['get', 'TXT_NAME'], { 'font-scale': 0.8 },
+            '\n\n\n\n\n\n', {},
+            ['get', 'CODE_ID'], { 'font-scale': 1.5, 'text-font': ['literal', ['Morse']] },
+            '\n', {},
+            ['get', 'VAL_FREQ'], ' ', ['get', 'CODE_ID'], {},
+          ],
+        ],
+      },
+      paint: { 'text-color': T.navAidDetailText, 'text-halo-color': T.navAidDetailHalo, 'text-halo-width': 0.2 },
+    },
     {
       id: 'airline_point', type: 'symbol', source: sourceId, 'source-layer': 'waypoint', minzoom: 6,
       layout: {
@@ -10349,7 +10932,7 @@ function buildLayers(themeId = 'light') {
         "text-letter-spacing": 0.02,
         'text-variable-anchor-offset': ['bottom', [0, -0.6], 'top', [0, 0.6], 'right', [-0.6, 0], 'left', [0.6, 0], 'bottom-right', [-0.4, -0.4], 'bottom-left', [0.4, -0.4], 'top-right', [-0.4, 0.4], 'top-left', [0.4, 0.4]],
         'text-justify': 'auto',
-        'text-font': ['Open Sans Semibold']
+        'text-font': frutigerBold
       },
       paint: {
         'icon-color': T.waypoint,
@@ -10365,7 +10948,7 @@ function buildLayers(themeId = 'light') {
     },
     {
       id: 'waypoint-off-airway-symbol', type: 'symbol', source: sourceId, 'source-layer': 'waypoint-off-airway', minzoom: 7,
-      layout: { 'icon-image': ['case', ['==', ['get', 'report_type'], 'C'], 'designate_point_inway', 'designate_point_notinway'], 'icon-size': 0.6, 'icon-allow-overlap': true, 'icon-ignore-placement': true, 'text-field': ['get', 'CODE_ID'], 'text-size': 9, 'text-variable-anchor-offset': ['bottom', [0, -0.6], 'top', [0, 0.6], 'right', [-0.6, 0], 'left', [0.6, 0], 'bottom-right', [-0.4, -0.4], 'bottom-left', [0.4, -0.4], 'top-right', [-0.4, 0.4], 'top-left', [0.4, 0.4]], 'text-justify': 'auto', 'text-optional': true },
+      layout: { 'icon-image': ['case', ['==', ['get', 'report_type'], 'C'], 'designate_point_inway', 'designate_point_notinway'], 'icon-size': 0.6, 'icon-allow-overlap': true, 'icon-ignore-placement': true, 'text-field': ['get', 'CODE_ID'], 'text-font': frutigerBold, 'text-size': 9, 'text-variable-anchor-offset': ['bottom', [0, -0.6], 'top', [0, 0.6], 'right', [-0.6, 0], 'left', [0.6, 0], 'bottom-right', [-0.4, -0.4], 'bottom-left', [0.4, -0.4], 'top-right', [-0.4, 0.4], 'top-left', [0.4, 0.4]], 'text-justify': 'auto', 'text-optional': true },
       paint: {
         'icon-color': T.waypoint, 'text-color': T.waypoint, 'text-halo-color': T.halo, 'text-halo-width': 1,
         "icon-opacity": ["interpolate", ["linear"], ["zoom"], 7, 0.5, 12, 1, 15, 0.2],
@@ -10389,12 +10972,24 @@ const CHART_THEMES = {
 const LAYER_GROUPS = {
   adiz: ['adiz-line', 'adiz-label'],
   airspace: ['airspaceLayer', 'airspaceLayer_line', 'airspace_label_center_layer', 'airspace_label_side_layer'],
-  restricted: ['restrictedLayer', 'restrictedLayer_stroke', 'restricted_line_label'],
-  controlled: ['controlledLayer', 'controlledLayer_stroke', 'controlled_line_label'],
-  airline: ['airline_radial', 'airline', 'airline_label', 'airline_point'],
+  restricted: [
+    'restrictedLayer',
+    'restrictedLayer_stroke_border',
+    'restrictedLayer_stroke_bg',
+    'restrictedLayer_stroke',
+    'restricted_line_label',
+  ],
+  controlled: [
+    'controlledLayer',
+    'controlledLayer_stroke_left_bg',
+    'controlledLayer_stroke_border',
+    'controlledLayer_stroke',
+    'controlled_line_label',
+  ],
+  airline: ['airline_radial', 'airline', 'airline-shadow', 'airline_label', 'airline_point'],
   waypointOffAirway: ['waypoint-off-airway-symbol'],
-  vor: ['vor_icon_dial', 'vor_label', 'vor_icon'],
-  ndb: ['ndb_icon'],
+  vor: ['vor_icon_dial', 'vor_icon_dial_arrow', 'vor_label', 'vor_label_detail', 'vor_icon'],
+  ndb: ['ndb_icon', 'ndb_label_detail'],
   airport: ['airport', 'airport-runway', 'airport-runway-cross'],
 };