aviation-chart 0.3.25 → 2.0.1

package/dist/nav-sdk.esm.js

@@ -3463,7 +3463,10 @@ class GlobalConfigManager {
         const headers = this.config.apiKey
             ? { "X-Api-Key": this.config.apiKey }
             : {};
-        const response = await fetch(`${base}/api/periods`, { headers });
+        const apiPath = this.config.apiVersion
+            ? `${base}/api/${this.config.apiVersion}/periods`
+            : `${base}/api/periods`;
+        const response = await fetch(apiPath, { headers });
         if (!response.ok) {
             throw new Error(`获取期数失败（${response.status}）`);
         }
@@ -4286,6 +4289,10 @@ class GraticuleManager {
 function authHeaders(apiKey) {
     return apiKey ? { "X-Api-Key": apiKey } : {};
 }
+function apiPrefix$1(baseUrl, version) {
+    const base = baseUrl.replace(/\/$/, "");
+    return version ? `${base}/api/${version}` : `${base}/api`;
+}
 async function toJSON(res) {
     if (!res.ok) {
         let detail = "";
@@ -4301,7 +4308,7 @@ async function toJSON(res) {
     }
     return res.json();
 }
-async function searchFeatures(baseUrl, apiKey, params) {
+async function searchFeatures(baseUrl, apiKey, params, version) {
     const { q, type, period, limit, signal } = params;
     if (!q || !q.trim()) {
         throw new Error("search: q 参数必填");
@@ -4313,7 +4320,7 @@ async function searchFeatures(baseUrl, apiKey, params) {
         qs.set("period", period);
     if (limit != null)
         qs.set("limit", String(limit));
-    const res = await fetch(`${baseUrl}/api/search?${qs.toString()}`, {
+    const res = await fetch(`${apiPrefix$1(baseUrl, version)}/search?${qs.toString()}`, {
         method: "GET",
         headers: authHeaders(apiKey),
         ...(signal ? { signal } : {}),
@@ -4321,7 +4328,7 @@ async function searchFeatures(baseUrl, apiKey, params) {
     const data = await toJSON(res);
     return data.results ?? [];
 }
-async function getFeatureGeometry(baseUrl, apiKey, params) {
+async function getFeatureGeometry(baseUrl, apiKey, params, version) {
     const { type, id, period, signal } = params;
     if (!type || !id) {
         throw new Error("getGeometry: type 和 id 参数必填");
@@ -4329,15 +4336,15 @@ async function getFeatureGeometry(baseUrl, apiKey, params) {
     const qs = new URLSearchParams({ type, id });
     if (period)
         qs.set("period", period);
-    const res = await fetch(`${baseUrl}/api/geometry?${qs.toString()}`, {
+    const res = await fetch(`${apiPrefix$1(baseUrl, version)}/geometry?${qs.toString()}`, {
         method: "GET",
         headers: authHeaders(apiKey),
         ...(signal ? { signal } : {}),
     });
     return toJSON(res);
 }
-async function getPeriods(baseUrl, apiKey, signal) {
-    const res = await fetch(`${baseUrl}/api/periods`, {
+async function getPeriods(baseUrl, apiKey, signal, version) {
+    const res = await fetch(`${apiPrefix$1(baseUrl, version)}/periods`, {
         method: "GET",
         headers: authHeaders(apiKey),
         ...(signal ? { signal } : {}),
@@ -7405,6 +7412,10 @@ return exported;
 var mlcontour$1 = mlcontour;
 
 const DEFAULT_CHART_API_URL = "https://aips.siniswift.com";
+function apiPrefix(apiUrl, version) {
+    const base = apiUrl.replace(/\/$/, "");
+    return version ? `${base}/api/${version}` : `${base}/api`;
+}
 function getAviationBaseStyle(opts) {
     const apiUrl = opts.apiUrl.replace(/\/$/, "");
     const spriteBase = (opts.spriteUrl ?? apiUrl).replace(/\/$/, "");
@@ -7436,21 +7447,21 @@ function getAviationBaseStyle(opts) {
         }
     };
 }
-function navdataTilesUrl(apiUrl, period) {
-    return `${apiUrl.replace(/\/$/, "")}/api/tiles/${period}/{z}/{x}/{y}.pbf`;
+function navdataTilesUrl(apiUrl, period, version) {
+    return `${apiPrefix(apiUrl, version)}/tiles/${period}/{z}/{x}/{y}.pbf`;
 }
-function getNavdataSource(apiUrl, period) {
+function getNavdataSource(apiUrl, period, version) {
     return {
         type: "vector",
-        tiles: [navdataTilesUrl(apiUrl, period)],
+        tiles: [navdataTilesUrl(apiUrl, period, version)],
         minzoom: 0.5,
         maxzoom: 18,
     };
 }
-function getChartAmmSource(apiUrl) {
+function getChartAmmSource(apiUrl, version) {
     return {
         type: "vector",
-        tiles: [`${apiUrl.replace(/\/$/, "")}/api/amm/{z}/{x}/{y}.pbf`],
+        tiles: [`${apiPrefix(apiUrl, version)}/amm/{z}/{x}/{y}.pbf`],
         minzoom: 11,
         maxzoom: 18,
     };
@@ -7581,103 +7592,216 @@ async function fetchGzJson(url, headers = {}) {
     return new Response(stream).json();
 }
 
-// ICAO aviation chart layer styles — multi-theme support.
-// Add new themes by implementing buildLayersXxx() and registering in CHART_THEMES.
+// ICAO aviation chart layer styles — token-driven multi-theme.
+//
+// 单一 buildLayers(T)：图层结构只写一份（以 light 为准）；凡随主题变化的值
+// （颜色 / halo / icon-image / pattern）都从 token 表 T 取。尺寸曲线、zoom、
+// 偏移、opacity 曲线、text-field、placement 等结构性属性两主题一致，写死。
+//
+// 加主题 = 在 THEME_TOKENS 增加一张 token 表；不再复制整份 build 函数，
+// 彻底消除 light/dark 漂移（历史上 dark 航线消失、6,6 插值等 bug 均源于此）。
+//
+// 本次新增两套主题：
+//   dusk    暮光模式 —— 晨昏蒙影时段过渡用，中等亮度，避免日/夜切换的瞳孔冲击
+//   redNight 红光夜视模式 —— 驾驶舱标准红光照明，全色系统一为红色，
+//            靠明度而非色相区分要素，保护夜间暗适应（视杆细胞）
 
-// ── Light theme ───────────────────────────────────────────────────────────────
-// const ICAO_LIGHT = {
-//   airspaceStroke: '#AAB7B8',
-//   restrictedStroke: "#D35400",
-//   controlledStroke: '#6ec1f4',
-//   controlledFill: '#6ec1f4',
-//   segment: '#0044AA',
-//   waypoint: '#663399',
-//   vor: '#00008B',
-//   ndb: '#0066CC',
-//   airport: '#CC6600',
-//   runway: '#333333',
-// }
-const ICAO_LIGHT = {
-  airspaceStroke: '#AAB7B8',
-  restrictedStroke: "#D35400",
-  controlledStroke: '#10B981',
-  controlledFill: '#10B981',
-  segment: '#2E4053',
-  waypoint: '#1C2526',
-  vor: '#00008B',
-  ndb: '#0066CC',
-  airport: '#006400',
-  runway: '#333333',
+/**
+ * 主题 token 表。每个 key 是一个"随主题变化"的值，值可以是颜色字符串、
+ * _ml 表达式，或 halo 片段对象（用对象展开有条件地注入 text-halo-*）。
+ */
+const THEME_TOKENS = {
+  light: {
+    background: '#EAF2F8',
+    land: '#F7F9FB',
+    halo: '#ffffff',
+    boundaryPattern: 'normal:national-border',
+    adizLine: null,                 // light 不给 adiz 线描色（仅用 pattern）
+    adizLabel: '#6600cc',
+    airspaceStroke: '#AAB7B8',
+    restrictedFill: '#FAD7A0',
+    restrictedStrokeLine: '#f6bf65',
+    restrictedStroke: '#D35400',    // 限制区标注文字色（ICAO 导出/图例用）
+    controlledStroke: '#10B981',
+    controlledFill: '#10B981',
+    segment: '#2E4053',
+    segmentRemark: '#E8A020',       // HAS_REMARK 航段
+    airport: '#006400',             // 机场图标色
+    airportText: '#006400',         // 机场文字色（非 AMM）
+    runway: '#333333',
+    vorDial: '#0b417a',
+    vorNormal: '#3874cb',
+    vor: '#00008B',
+    ndbIcon: 'v2:ndb-normal',       // 图标按主题不同（正常）
+    ndb: '#0066CC',
+    waypoint: '#1C2526',
+    // airline_label format 内嵌文字色
+    alBase: '#ffffff', alDist: '#3E4759', alRnp: '#E8A020',
+    // halo 片段：light 多数标注无 halo → 空对象
+    sideHalo: {},
+    centerHalo: {},
+    restrictedHalo: {},
+    controlledHalo: {},
+    radialHalo: {},
+    runwayHalo: { 'text-halo-width': 1 },
+    alHalo: { 'text-halo-color': '#ffffff', 'text-halo-width': 0.1 },
+    ndbHalo: { 'text-halo-color': '#ffffff', 'text-halo-width': 0.5, 'text-halo-blur': 1 },
+  },
+  dark: {
+    background: '#000000',
+    land: '#0A111A',
+    halo: '#0f172a',
+    boundaryPattern: 'normal:national-border-dark',
+    adizLine: '#a855f7',
+    adizLabel: '#c084fc',
+    airspaceStroke: '#18C29C',
+    restrictedFill: ['case', ['==', ['get', 'CODE_TYPE'], 'P'], '#ef4444', ['==', ['get', 'CODE_TYPE'], 'D'], '#f97316', '#ef4444'],
+    restrictedStrokeLine: '#CC7722',
+    restrictedStroke: '#CC7722',
+    controlledStroke: '#22C55E',
+    controlledFill: '#22C55E',
+    segment: '#40C4FF',
+    segmentRemark: '#fbbf24',
+    airport: '#73ccdd',
+    airportText: '#E0F7FA',
+    runway: '#64748b',
+    vorDial: '#38bdf8',
+    vorNormal: '#38bdf8',
+    vor: '#72aae5',
+    ndbIcon: 'ndb-inway',
+    ndb: '#62d6ef',
+    waypoint: '#74cdde',
+    alBase: '#0f172a', alDist: '#cbd5e1', alRnp: '#FFFFFF',
+    sideHalo: { 'text-halo-color': '#0f172a', 'text-halo-width': 1 },
+    centerHalo: { 'text-halo-color': '#0f172a', 'text-halo-width': 1.5 },
+    restrictedHalo: { 'text-halo-color': '#0f172a', 'text-halo-width': 1 },
+    controlledHalo: { 'text-halo-color': '#0f172a', 'text-halo-width': 1.5 },
+    radialHalo: { 'text-halo-color': '#0f172a', 'text-halo-width': 1 },
+    runwayHalo: { 'text-halo-color': '#0f172a', 'text-halo-width': 1 },
+    alHalo: {},
+    ndbHalo: { 'text-halo-color': '#0f172a', 'text-halo-width': 1 },
+  },
+  // ── 新增：暮光模式（晨昏蒙影 / 日夜切换过渡）───────────────────────────
+  // 设计目标：亮度介于 light 与 dark 之间，避免瞳孔在两个极端间来回收放；
+  // 色相仍按 light 的语义分组（橙=限制区/绿=管制区），但饱和度、对比度降低。
+  dusk: {
+    background: '#1B2838',
+    land: '#22303F',
+    halo: '#16212c',
+    boundaryPattern: 'normal:national-border-dark', // 复用 dark 的深色底图案
+    adizLine: '#c77dff',
+    adizLabel: '#e0aaff',
+    airspaceStroke: '#7fb3d5',
+    restrictedFill: '#e67e22',
+    restrictedStrokeLine: '#e59866',
+    restrictedStroke: '#e59866',
+    controlledStroke: '#52c9a3',
+    controlledFill: '#52c9a3',
+    segment: '#8fa8c7',
+    segmentRemark: '#f4c542',
+    airport: '#7fd1ae',
+    airportText: '#dce9f0',
+    runway: '#7c8ea3',
+    vorDial: '#5dade2',
+    vorNormal: '#5dade2',
+    vor: '#85a9e0',
+    ndbIcon: 'ndb-inway',
+    ndb: '#7ec8e3',
+    waypoint: '#a9c6d8',
+    alBase: '#1B2838', alDist: '#b8c9d9', alRnp: '#f4c542',
+    sideHalo: { 'text-halo-color': '#1B2838', 'text-halo-width': 1 },
+    centerHalo: { 'text-halo-color': '#1B2838', 'text-halo-width': 1.5 },
+    restrictedHalo: { 'text-halo-color': '#1B2838', 'text-halo-width': 1 },
+    controlledHalo: { 'text-halo-color': '#1B2838', 'text-halo-width': 1.5 },
+    radialHalo: { 'text-halo-color': '#1B2838', 'text-halo-width': 1 },
+    runwayHalo: { 'text-halo-color': '#1B2838', 'text-halo-width': 1 },
+    alHalo: { 'text-halo-color': '#1B2838', 'text-halo-width': 0.5 },
+    ndbHalo: { 'text-halo-color': '#1B2838', 'text-halo-width': 1 },
+  },
+  // ── 新增：ForeFlight 风格（致敬，非像素级复刻，官方未公开具体色值）──────
+  // 设计目标：暖米黄底图 + 扁平化（去地形纹理）+ 传统航图色彩语义
+  // （蓝=管制空域，洋红=非管制机场，棕=NDB，橙=限制区）+ 现代无衬线字体，
+  // 整体比三色 VFR 纸图更"干净"，符合 ForeFlight 网页版/Light 主题的视觉语言。
+  foreflight: {
+    background: '#F2EFE6',
+    land: '#F7F5EC',
+    halo: '#F2EFE6',
+    boundaryPattern: 'normal:national-border',
+    adizLine: '#8e44ad',
+    adizLabel: '#8e44ad',
+    airspaceStroke: '#2E5C8A',
+    restrictedFill: '#E8A33D',
+    restrictedStrokeLine: '#C0392B',
+    restrictedStroke: '#C0392B',
+    controlledStroke: '#2E5C8A',
+    controlledFill: '#2E5C8A',
+    segment: '#34495E',
+    segmentRemark: '#D68910',
+    airport: '#B03060',
+    airportText: '#1B2631',
+    runway: '#4A4A4A',
+    vorDial: '#2E5C8A',
+    vorNormal: '#2E5C8A',
+    vor: '#154360',
+    ndbIcon: 'v2:ndb-normal',
+    ndb: '#8B5A2B',
+    waypoint: '#2C3E50',
+    alBase: '#F2EFE6', alDist: '#5D6D7E', alRnp: '#D68910',
+    sideHalo: { 'text-halo-color': '#F2EFE6', 'text-halo-width': 1 },
+    centerHalo: { 'text-halo-color': '#F2EFE6', 'text-halo-width': 1.5 },
+    restrictedHalo: { 'text-halo-color': '#F2EFE6', 'text-halo-width': 1 },
+    controlledHalo: { 'text-halo-color': '#F2EFE6', 'text-halo-width': 1.5 },
+    radialHalo: { 'text-halo-color': '#F2EFE6', 'text-halo-width': 1 },
+    runwayHalo: { 'text-halo-color': '#F2EFE6', 'text-halo-width': 1 },
+    alHalo: { 'text-halo-color': '#F2EFE6', 'text-halo-width': 0.5 },
+    ndbHalo: { 'text-halo-color': '#F2EFE6', 'text-halo-width': 1 },
+  },
 };
 
-function buildLayersLight() {
+function buildLayers(themeId = 'light') {
+  const T = THEME_TOKENS[themeId] ?? THEME_TOKENS.light;
   const sourceId = 'navdata';
-  const C = ICAO_LIGHT;
   return [
     {
       "id": "landLayer", "type": "fill", "source": "land",
       "layout": { "visibility": "visible" },
-      "paint": { "fill-color": "#F7F9FB", "fill-opacity": 1 }
+      "paint": { "fill-color": T.land, "fill-opacity": 1 }
     },
     {
-      "id": "boundary",
-      "type": "line",
-      "source": "boundary",
-      "minzoom": 0,
+      "id": "boundary", "type": "line", "source": "boundary", "minzoom": 0,
       "paint": {
-        "line-width": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          0,
-          1,
-          7,
-          4
-        ],
-        "line-opacity": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          0,
-          1,
-          2,
-          0.5
-        ],
-        "line-pattern": "normal:national-border"
+        "line-width": ["interpolate", ["linear"], ["zoom"], 0, 1, 7, 4],
+        "line-opacity": ["interpolate", ["linear"], ["zoom"], 0, 1, 2, 0.5],
+        "line-pattern": T.boundaryPattern,
       }
     },
     {
       id: 'adiz-line', type: 'line', source: sourceId, 'source-layer': 'adiz', minzoom: 3,
       layout: { 'line-cap': 'round', 'line-join': 'round' },
-      paint: { 'line-width': 4, "line-pattern": "normal:adiz", 'line-opacity': ['interpolate', ['linear'], ['zoom'], 3, 0.6, 8, 0.4] },
+      paint: {
+        ...(T.adizLine ? { 'line-color': T.adizLine } : {}),
+        'line-width': 4, "line-pattern": "normal:adiz",
+        'line-opacity': ['interpolate', ['linear'], ['zoom'], 3, 0.6, 8, 0.4],
+      },
     },
     {
       id: 'adiz-label', type: 'symbol', source: sourceId, 'source-layer': 'adiz-centroid', minzoom: 3,
       layout: { 'text-field': ['coalesce', ['get', 'TXT_NAME'], ['get', 'CODE_ID']], 'text-size': 10, 'text-max-width': 10, 'symbol-placement': 'point' },
-      paint: { 'text-color': '#6600cc', 'text-halo-color': '#ffffff', 'text-halo-width': 1.5 },
+      paint: { 'text-color': T.adizLabel, 'text-halo-color': T.halo, 'text-halo-width': 1.5 },
     },
     {
       id: 'airspaceLayer', type: 'line', source: sourceId, 'source-layer': 'fir', minzoom: 2,
-      // layout: { "line-cap": "butt", "line-join": "miter", "line-miter-limit": 0 },
-      paint: { "line-color": C.airspaceStroke, "line-opacity": ["interpolate", ["linear"], ["zoom"], 2, 0, 2.7, 0.8, 9, 0.8, 10, 0.5], "line-width": 0.5, 'line-dasharray': [4.2, 4] }
+      paint: { "line-color": T.airspaceStroke, "line-opacity": ["interpolate", ["linear"], ["zoom"], 2, 0, 2.7, 0.8, 9, 0.8, 10, 0.5], "line-width": 0.5, 'line-dasharray': [4.2, 4] }
     },
     {
       "id": "airspaceLayer_line", type: 'line', source: sourceId, 'source-layer': 'fir', "minzoom": 5,
       layout: { "line-miter-limit": 0, "line-cap": "butt", "line-join": "miter" },
-      paint: { "line-color": C.airspaceStroke, "line-opacity": ["interpolate", ["linear"], ["zoom"], 5, 0, 5.5, 0.8, 9, 0.8, 10, 0.5], "line-width": 6, "line-dasharray": [0.2, 5] }
+      paint: { "line-color": T.airspaceStroke, "line-opacity": ["interpolate", ["linear"], ["zoom"], 5, 0, 5.5, 0.8, 9, 0.8, 10, 0.5], "line-width": 6, "line-dasharray": [0.2, 5] }
     },
     {
       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 },
-      paint: { 'text-color': C.airspaceStroke },
+      paint: { 'text-color': T.airspaceStroke, ...T.sideHalo },
     },
     {
       id: 'airspace_label_center_layer', type: 'symbol', source: sourceId, 'source-layer': 'fir-centroid', minzoom: 3,
@@ -7688,98 +7812,50 @@ function buildLayersLight() {
         'text-max-width': 8,
       },
       paint: {
-        'text-color': C.airspaceStroke,
+        'text-color': T.airspaceStroke,
+        ...T.centerHalo,
         'text-opacity': ['interpolate', ['linear'], ['zoom'], 3, 0.85, 8, 0.7, 12, 0.5],
       },
     },
     {
       id: 'restrictedLayer', type: 'fill', source: sourceId, 'source-layer': 'restricted-fill', minzoom: 4,
       paint: {
-        'fill-color': "#FAD7A0",
-        // "fill-pattern": "normal:passline",
-        'fill-opacity': [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          10,
-          0.15,
-          11.5,
-          0
-        ],
+        'fill-color': T.restrictedFill,
+        'fill-opacity': ["interpolate", ["linear"], ["zoom"], 10, 0.15, 11.5, 0],
       },
     },
     {
       id: 'restrictedLayer_stroke', type: 'line', source: sourceId, 'source-layer': 'restricted',
-      paint: { 'line-color': "#f6bf65", 'line-width': 1, "line-dasharray": [2, 2], "line-opacity": ['interpolate', ['linear'], ['zoom'], 4, 0.5, 8, 1] },
+      paint: { 'line-color': T.restrictedStrokeLine, 'line-width': 1, "line-dasharray": [2, 2], "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': C.restrictedStroke },
+      paint: { 'text-color': T.restrictedStroke, ...T.restrictedHalo },
     },
     {
       id: 'controlledLayer', type: 'fill', source: sourceId, 'source-layer': 'controlled-fill', minzoom: 4,
       paint: {
-        'fill-color': C.controlledFill,
-        "fill-opacity": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          10,
-          0.035,
-          11.5,
-          0
-        ]
+        'fill-color': T.controlledFill,
+        "fill-opacity": ["interpolate", ["linear"], ["zoom"], 10, 0.035, 11.5, 0],
       },
     },
     {
       id: 'controlledLayer_stroke', type: 'line', source: sourceId, 'source-layer': 'controlled',
-
-      paint: {
-        'line-color': C.controlledStroke, 'line-width': 1, 'line-opacity': ['interpolate', ['linear'], ['zoom'], 4, 0.5, 8, 1], "line-dasharray": [1,
-          1.4]
-      },
+      paint: { 'line-color': T.controlledStroke, '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,
+      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': C.controlledStroke },
+      paint: { 'text-color': T.controlledStroke, ...T.controlledHalo },
     },
     {
       id: 'airline', type: 'line', source: sourceId, 'source-layer': 'segment', minzoom: 6,
       paint: {
-        'line-color': ['case', ['==', ['get', 'HAS_REMARK'], 1], '#E8A020', C.segment],
+        'line-color': ['case', ['==', ['get', 'HAS_REMARK'], 1], T.segmentRemark, T.segment],
         'line-width': ['interpolate', ['linear'], ['zoom'], 6, 0.2, 8, 0.8],
         "line-blur": 0,
-        "line-opacity":
-          [
-            "interpolate",
-            [
-              "linear"
-            ],
-            [
-              "zoom"
-            ],
-            6,
-            0.3,
-            7,
-            1,
-            8,
-            1,
-            12,
-            0.8,
-            15,
-            0.2
-          ]
+        "line-opacity": ["interpolate", ["linear"], ["zoom"], 6, 0.3, 7, 1, 8, 1, 12, 0.8, 15, 0.2],
       }
     },
     {
@@ -7790,56 +7866,27 @@ function buildLayersLight() {
         "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-field": ["step", ["zoom"],
-          ["format", ["case", ["all", ["has", "TXT_DESIG"], ["!=", ["get", "TXT_DESIG"], ""]], ["get", "TXT_DESIG"], ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], ["get", "TXT_DESIG_FORWARD"], ["all", ["has", "TXT_DESIG_BACKWARD"], ["!=", ["get", "TXT_DESIG_BACKWARD"], ""]], ["get", "TXT_DESIG_BACKWARD"], "-"], { "font-scale": 1, "text-color": "#ffffff" }],
+          ["format", ["case", ["all", ["has", "TXT_DESIG"], ["!=", ["get", "TXT_DESIG"], ""]], ["get", "TXT_DESIG"], ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], ["get", "TXT_DESIG_FORWARD"], ["all", ["has", "TXT_DESIG_BACKWARD"], ["!=", ["get", "TXT_DESIG_BACKWARD"], ""]], ["get", "TXT_DESIG_BACKWARD"], "-"], { "font-scale": 1, "text-color": T.alBase }],
           10,
           ["format",
-            ["concat", ["get", "VAL_LEN"], "", ["get", "UOM_DIST"]], { "font-scale": 0.95, "text-color": "#3E4759" }, "\n",
-            ["case", ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], ["case", ["all", ["has", "TXT_DESIG_RNP"], ["!=", ["get", "TXT_DESIG_RNP"], ""]], ["get", "TXT_DESIG_RNP"], ""], ""], { "font-scale": 1, "text-color": "#E8A020" },
+            ["concat", ["get", "VAL_LEN"], "", ["get", "UOM_DIST"]], { "font-scale": 0.95, "text-color": T.alDist }, "\n",
+            ["case", ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], ["case", ["all", ["has", "TXT_DESIG_RNP"], ["!=", ["get", "TXT_DESIG_RNP"], ""]], ["get", "TXT_DESIG_RNP"], ""], ""], { "font-scale": 1, "text-color": T.alRnp },
             ["case", ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], ["case", ["all", ["has", "TXT_DESIG_RNP"], ["!=", ["get", "TXT_DESIG_RNP"], ""]], " ", ""], ""], {},
-            ["case", ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], ["get", "TXT_DESIG_FORWARD"], ["all", ["has", "TXT_DESIG"], ["!=", ["get", "TXT_DESIG"], ""]], ["get", "TXT_DESIG"], ["all", ["has", "TXT_DESIG_BACKWARD"], ["!=", ["get", "TXT_DESIG_BACKWARD"], ""]], ["get", "TXT_DESIG_BACKWARD"], "-"], { "font-scale": 1, "text-color": "#ffffff", "font-weight": "bold" },
+            ["case", ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], ["get", "TXT_DESIG_FORWARD"], ["all", ["has", "TXT_DESIG"], ["!=", ["get", "TXT_DESIG"], ""]], ["get", "TXT_DESIG"], ["all", ["has", "TXT_DESIG_BACKWARD"], ["!=", ["get", "TXT_DESIG_BACKWARD"], ""]], ["get", "TXT_DESIG_BACKWARD"], "-"], { "font-scale": 1, "text-color": T.alBase, "font-weight": "bold" },
             ["case", ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], "", ["case", ["all", ["has", "TXT_DESIG_RNP"], ["!=", ["get", "TXT_DESIG_RNP"], ""]], " ", ""]], {},
-            ["case", ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], "", ["case", ["all", ["has", "TXT_DESIG_RNP"], ["!=", ["get", "TXT_DESIG_RNP"], ""]], ["get", "TXT_DESIG_RNP"], ""]], { "font-scale": 0.85, "text-color": "#E8A020" },
+            ["case", ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], "", ["case", ["all", ["has", "TXT_DESIG_RNP"], ["!=", ["get", "TXT_DESIG_RNP"], ""]], ["get", "TXT_DESIG_RNP"], ""]], { "font-scale": 0.85, "text-color": T.alRnp },
             "\n",
-            ["case", ["all", ["has", "TXT_DESIG_HIGH"], ["!=", ["get", "TXT_DESIG_HIGH"], ""]], ["get", "TXT_DESIG_HIGH"], ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], ["get", "TXT_DESIG_FORWARD"], ["all", ["has", "TXT_DESIG_BACKWARD"], ["!=", ["get", "TXT_DESIG_BACKWARD"], ""]], ["get", "TXT_DESIG_BACKWARD"], "-"], { "font-scale": 0.95, "text-color": "#3E4759" }
+            ["case", ["all", ["has", "TXT_DESIG_HIGH"], ["!=", ["get", "TXT_DESIG_HIGH"], ""]], ["get", "TXT_DESIG_HIGH"], ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], ["get", "TXT_DESIG_FORWARD"], ["all", ["has", "TXT_DESIG_BACKWARD"], ["!=", ["get", "TXT_DESIG_BACKWARD"], ""]], ["get", "TXT_DESIG_BACKWARD"], "-"], { "font-scale": 0.95, "text-color": T.alDist }
           ]
         ],
         "text-size": ["interpolate", ["linear"], ["zoom"], 6, 9, 10, 10],
         "icon-text-fit-padding": [0, 3, 0, 3],
       },
       paint: {
-        "text-halo-color": "#ffffff",
-        "text-halo-width": 0.1,
-        "icon-color": C.segment,
-        "text-opacity": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          6,
-          1,
-          12,
-          1,
-          15,
-          0.3
-        ],
-        "icon-opacity": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          6,
-          1,
-          12,
-          1,
-          15,
-          0.3
-        ]
+        ...T.alHalo,
+        "icon-color": T.segment,
+        "text-opacity": ["interpolate", ["linear"], ["zoom"], 6, 1, 12, 1, 15, 0.3],
+        "icon-opacity": ["interpolate", ["linear"], ["zoom"], 6, 1, 12, 1, 15, 0.3],
       },
     },
     {
@@ -7854,7 +7901,7 @@ function buildLayersLight() {
         'text-offset': [0, -0.6],
         'text-justify': 'auto',
       },
-      paint: { 'text-color': C.segment },
+      paint: { 'text-color': T.segment, ...T.radialHalo },
     },
     {
       id: 'airport', type: 'symbol', source: sourceId, minzoom: 3, 'source-layer': 'airport',
@@ -7877,102 +7924,34 @@ function buildLayersLight() {
         "text-allow-overlap": true,
         "text-ignore-placement": true,
         "visibility": "none",
-        "icon-size": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          5,
-          0.6,
-          9,
-          1.2,
-          12,
-          1.3
-        ]
+        "icon-size": ["interpolate", ["linear"], ["zoom"], 5, 0.6, 9, 1.2, 12, 1.3]
       },
       paint: {
-        'icon-color': ['case',
-          ['has', 'has_amm'], '#4B2D6E',
-          C.airport,
-        ],
-        "icon-opacity": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          2,
-          0.75,
-          3,
-          0.95,
-          5,
-          1,
-          9,
-          1,
-          11,
-          0.2
-        ],
-        "text-color": ['case',
-          ['has', 'has_amm'], '#4B2D6E',
-          C.airport,
-        ],
-        "text-opacity": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          4,
-          0.95,
-          5,
-          1,
-          9,
-          1,
-          11,
-          0.2
-        ],
+        'icon-color': ['case', ['has', 'has_amm'], '#4B2D6E', T.airport],
+        "icon-opacity": ["interpolate", ["linear"], ["zoom"], 2, 0.75, 3, 0.95, 5, 1, 9, 1, 11, 0.2],
+        "text-color": ['case', ['has', 'has_amm'], '#4B2D6E', T.airportText],
+        "text-opacity": ["interpolate", ["linear"], ["zoom"], 4, 0.95, 5, 1, 9, 1, 11, 0.2],
       },
     },
     {
-      id: 'runway-line',
-      type: 'line',
-      source: sourceId,
-      'source-layer': 'runway',
-      filter: ['!', ['has', 'has_amm']],
-      minzoom: 4,
-      maxzoom: 11,
+      id: 'runway-line', type: 'line', source: sourceId, 'source-layer': 'runway',
+      filter: ['!', ['has', 'has_amm']], minzoom: 4, maxzoom: 11,
       paint: {
-        'line-color': C.runway,
+        'line-color': T.runway,
         'line-width': ['interpolate', ['linear'], ['zoom'], 4, 1, 13, 10],
       },
     },
     {
-      id: 'runway-line-amm',
-      type: 'line',
-      source: sourceId,
-      'source-layer': 'runway',
-      filter: ['has', 'has_amm'],
-      minzoom: 4,
-      maxzoom: 11,
+      id: 'runway-line-amm', type: 'line', source: sourceId, 'source-layer': 'runway',
+      filter: ['has', 'has_amm'], minzoom: 4, maxzoom: 11,
       paint: {
-        'line-color': C.runway,
+        'line-color': T.runway,
         'line-width': ['interpolate', ['linear'], ['zoom'], 4, 1, 10, 4],
         'line-opacity': ['interpolate', ['linear'], ['zoom'], 10.5, 1, 11, 0],
       },
     },
     {
-      id: 'runway-label',
-      type: 'symbol',
-      source: sourceId,
-      'source-layer': 'runway',
-      minzoom: 10,
+      id: 'runway-label', type: 'symbol', source: sourceId, 'source-layer': 'runway', minzoom: 10,
       layout: {
         'text-field': ['concat', ['to-string', ['get', 'VAL_LEN']], '×', ['to-string', ['get', 'VAL_WID']], 'm'],
         'text-size': 10,
@@ -7981,28 +7960,16 @@ function buildLayersLight() {
         'text-optional': true,
       },
       paint: {
-        'text-color': C.runway,
-        'text-halo-width': 1,
+        'text-color': T.runway,
+        ...T.runwayHalo,
         'text-opacity': ['interpolate', ['linear'], ['zoom'], 10.5, 1, 11, 0],
       },
     },
     {
-      id: 'vor_icon_dial',
-      type: 'symbol',
-      source: sourceId,
-      'source-layer': 'vor',
-      minzoom: 8,
+      id: 'vor_icon_dial', type: 'symbol', source: sourceId, 'source-layer': 'vor', minzoom: 8,
       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-size": [
-        //   "interpolate",
-        //   ["exponential", 1.25],
-        //   ["zoom"],
-        //   8, 0.28,
-        //   17, 1.7,
-        //   22, 1.7
-        // ],
         "icon-rotate": ["to-number", ["get", "VAL_MAG_VAR"], 0],
         "icon-rotation-alignment": "map",
         "symbol-z-order": "viewport-y",
@@ -8011,7 +7978,7 @@ function buildLayersLight() {
         "icon-allow-overlap": true,
         "visibility": "none",
       },
-      paint: { "icon-color": "#0b417a" }
+      paint: { "icon-color": T.vorDial }
     },
     {
       id: 'vor_icon', minzoom: 4, maxzoom: 9, type: 'symbol', source: sourceId, 'source-layer': 'vor',
@@ -8025,45 +7992,25 @@ function buildLayersLight() {
         "icon-allow-overlap": true,
       },
       paint: {
-        "icon-color": "#3874cb",
+        "icon-color": T.vorNormal,
         "icon-opacity": ["interpolate", ["linear"], ["zoom"], 8, 1, 9, 0],
       }
     },
     {
       id: 'vor_label', type: 'symbol', source: sourceId, 'source-layer': 'vor', minzoom: 5,
       layout: { 'text-field': ['get', 'CODE_ID'], 'text-size': 10, 'text-anchor': 'bottom', 'text-offset': [0, -0.8] },
-      paint: { 'text-color': C.vor, 'text-halo-color': '#ffffff', 'text-halo-width': 1 },
+      paint: { 'text-color': T.vor, 'text-halo-color': T.halo, 'text-halo-width': 1 },
     },
     {
       id: 'ndb_icon', type: 'symbol', source: sourceId, minzoom: 4, 'source-layer': 'ndb',
       layout: {
-        "icon-image": "v2:ndb-normal", "icon-size": ["interpolate", ["linear"], ["zoom"], 6, 0.5, 10, 1],
+        "icon-image": T.ndbIcon, "icon-size": ["interpolate", ["linear"], ["zoom"], 6, 0.5, 10, 1],
         "symbol-z-order": "viewport-y",
-        // "text-field": ["concat", ["get", "CODE_ID"], "\n", ["get", "VAL_FREQ"], "kHz"],
         "text-field": [
           "format",
-          [
-            "get",
-            "CODE_ID"
-          ],
-          {
-            "text-color": C.ndb,
-            "font-scale": 1.1,
-          },
-          "",
-          {},
-          [
-            "coalesce",
-            [
-              "get",
-              "VAL_FREQ"
-            ],
-            ""
-          ],
-          {
-            "text-color": C.ndb,
-            "font-scale": 0.95
-          }
+          ["get", "CODE_ID"], { "text-color": T.ndb, "font-scale": 1.1 },
+          "", {},
+          ["coalesce", ["get", "VAL_FREQ"], ""], { "text-color": T.ndb, "font-scale": 0.95 }
         ],
         "text-size": 10,
         "text-offset": [0, 0.5],
@@ -8073,53 +8020,11 @@ function buildLayersLight() {
         "text-anchor": "top"
       },
       paint: {
-        "text-color": C.ndb,
-        "text-halo-color": "#ffffff",
-        "text-halo-width": 0.5,
-        "text-halo-blur": 1,
-        "icon-color": C.ndb,
-        "text-opacity": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          4,
-          0,
-          5.5,
-          0,
-          6,
-          0.6,
-          8,
-          1,
-          10,
-          0.3,
-          12,
-          0
-        ],
-        "icon-opacity": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          4,
-          0,
-          5,
-          0.3,
-          5.5,
-          0.8,
-          8,
-          1,
-          12,
-          1,
-          14,
-          0.6
-        ]
+        "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, 12, 0],
+        "icon-opacity": ["interpolate", ["linear"], ["zoom"], 4, 0, 5, 0.3, 5.5, 0.8, 8, 1, 12, 1, 14, 0.6],
       }
     },
     {
@@ -8135,421 +8040,39 @@ function buildLayersLight() {
         'text-justify': 'auto',
       },
       paint: {
-        'icon-color': C.waypoint,
-        'text-color': C.waypoint,
-        'text-halo-color': '#ffffff',
-        'text-halo-width': 1,
+        'icon-color': T.waypoint,
+        'text-color': T.waypoint,
         "icon-halo-color": "rgba(0,0,0,0)",
         "icon-halo-width": 0,
-        "icon-opacity": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          6,
-          0.5,
-          12,
-          1,
-          15,
-          0.2
-        ],
-        "text-halo-color": "#FFFFFF",
+        "icon-opacity": ["interpolate", ["linear"], ["zoom"], 6, 0.5, 12, 1, 15, 0.2],
+        "text-halo-color": T.halo,
+        "text-halo-width": 1,
         "text-halo-blur": 0,
-        "text-opacity": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          6,
-          1,
-          12,
-          0.9,
-          15,
-          0.15
-        ],
+        "text-opacity": ["interpolate", ["linear"], ["zoom"], 6, 1, 12, 0.9, 15, 0.15],
       },
     },
     {
       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 },
       paint: {
-        'icon-color': C.waypoint, 'text-color': C.waypoint, 'text-halo-color': '#ffffff', 'text-halo-width': 1,
-        "icon-opacity": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          7,
-          0.5,
-          12,
-          1,
-          15,
-          0.2
-        ],
-        "text-opacity": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          7,
-          1,
-          12,
-          0.9,
-          15,
-          0.15
-        ],
+        '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],
+        "text-opacity": ["interpolate", ["linear"], ["zoom"], 7, 1, 12, 0.9, 15, 0.15],
       },
     },
   ]
 }
 
-// ── Dark theme ────────────────────────────────────────────────────────────────
-const ICAO_DARK = {
-  airspaceStroke: '#18C29C',
-  restrictedStroke: '#CC7722',
-  controlledStroke: '#22C55E',
-  controlledFill: '#22C55E',
-  segment: '#40C4FF',
-  waypoint: '#74cdde',
-  vor: '#72aae5',
-  ndb: '#62d6ef',
-  airport: '#73ccdd',
-  runway: '#64748b',
-};
-
-function buildLayersDark() {
-  const sourceId = 'navdata';
-  const C = ICAO_DARK;
-  return [
-    {
-      "id": "landLayer", "type": "fill", "source": "land",
-      "layout": { "visibility": "visible" },
-      "paint": { "fill-color": "#0A111A", "fill-opacity": 1 }
-    },
-    {
-      "id": "boundary",
-      "type": "line",
-      "source": "boundary",
-      "minzoom": 0,
-      "paint": {
-        "line-width": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          0,
-          1,
-          7,
-          4
-        ],
-        "line-opacity": 1,
-        "line-pattern": "normal:national-border-dark"
-      }
-    },
-    {
-      id: 'adiz-line', type: 'line', source: sourceId, 'source-layer': 'adiz', minzoom: 3,
-      layout: { 'line-cap': 'round', 'line-join': 'round' },
-      paint: { 'line-color': '#a855f7', 'line-width': ['interpolate', ['linear'], ['zoom'], 3, 3, 7, 6], "line-pattern": "normal:adiz", 'line-opacity': ['interpolate', ['linear'], ['zoom'], 3, 0.7, 8, 0.5] },
-    },
-    {
-      id: 'adiz-label', type: 'symbol', source: sourceId, 'source-layer': 'adiz-centroid', minzoom: 3,
-      layout: { 'text-field': ['coalesce', ['get', 'TXT_NAME'], ['get', 'CODE_ID']], 'text-size': 10, 'text-max-width': 10, 'symbol-placement': 'point' },
-      paint: { 'text-color': '#c084fc', 'text-halo-color': '#0f172a', 'text-halo-width': 1.5 },
-    },
-    {
-      id: 'airspaceLayer', type: 'line', source: sourceId, 'source-layer': 'fir', minzoom: 2,
-      layout: { "line-cap": "butt", "line-join": "miter", "line-miter-limit": 0 },
-      paint: { "line-color": C.airspaceStroke, "line-opacity": ["interpolate", ["linear"], ["zoom"], 2, 0, 2.7, 0.8, 9, 0.8, 10, 0.5], "line-width": 0.8, 'line-dasharray': [4.2, 4] }
-    },
-    {
-      "id": "airspaceLayer_line", type: 'line', source: sourceId, 'source-layer': 'fir', "minzoom": 5,
-      layout: { "line-miter-limit": 0, "line-cap": "butt", "line-join": "miter" },
-      paint: { "line-color": C.airspaceStroke, "line-opacity": ["interpolate", ["linear"], ["zoom"], 5, 0, 5.5, 0.8, 9, 0.8, 10, 0.5], "line-width": 5, "line-dasharray": [0.2, 5] }
-    },
-    {
-      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 },
-      paint: { 'text-color': C.airspaceStroke, 'text-halo-color': '#0f172a', 'text-halo-width': 1 },
-    },
-    {
-      id: 'airspace_label_center_layer', type: 'symbol', source: sourceId, 'source-layer': 'fir-centroid', minzoom: 3,
-      layout: {
-        'text-field': ['coalesce', ['get', 'TXT_NAME'], ['get', 'CODE_ID']],
-        'text-size': ['interpolate', ['linear'], ['zoom'], 3, 12, 17, 16],
-        'symbol-placement': 'point',
-        'text-max-width': 8,
-      },
-      paint: {
-        'text-color': C.airspaceStroke,
-        'text-halo-color': '#0f172a',
-        'text-halo-width': 1.5,
-        'text-opacity': ['interpolate', ['linear'], ['zoom'], 3, 0.85, 8, 0.7, 12, 0.5],
-      },
-    },
-    {
-      id: 'restrictedLayer', type: 'fill', source: sourceId, 'source-layer': 'restricted-fill', minzoom: 4,
-      paint: { 'fill-color': ['case', ['==', ['get', 'CODE_TYPE'], 'P'], '#ef4444', ['==', ['get', 'CODE_TYPE'], 'D'], '#f97316', '#ef4444'], 'fill-opacity': 0.04 },
-    },
-    {
-      id: 'restrictedLayer_stroke', type: 'line', source: sourceId, 'source-layer': 'restricted',
-      paint: { 'line-color': C.restrictedStroke, 'line-width': 1, "line-dasharray": [2, 2], "line-opacity": ['interpolate', ['linear'], ['zoom'], 4, 0.6, 8, 1] },
-    },
-    {
-      id: 'restricted_line_label', type: 'symbol', source: sourceId, 'source-layer': 'restricted', minzoom: 6,
-      layout: { 'text-field': ['coalesce', ['get', 'TXT_NAME'], ['get', 'CODE_ID']], 'text-size': 10, 'symbol-placement': 'line', 'text-max-width': 8, "text-offset": [0, 1] },
-      paint: { 'text-color': C.restrictedStroke, 'text-halo-color': '#0f172a', 'text-halo-width': 1 },
-    },
-    {
-      id: 'controlledLayer', type: 'fill', source: sourceId, 'source-layer': 'controlled-fill', minzoom: 4,
-      paint: {
-        'fill-color': C.controlledFill, "fill-opacity": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          10,
-          0.04,
-          11.5,
-          0
-        ]
-      },
-    },
-    {
-      id: 'controlledLayer_stroke', type: 'line', source: sourceId, 'source-layer': 'controlled',
-      paint: { 'line-color': C.controlledStroke, 'line-width': 1, 'line-opacity': ['interpolate', ['linear'], ['zoom'], 4, 0.6, 8, 1], "line-dasharray": [4, 2] },
-    },
-    {
-      id: 'controlled_line_label', type: 'symbol', source: sourceId, 'source-layer': 'controlled', minzoom: 6,
-      layout: { 'text-field': ['coalesce', ['get', 'TXT_NAME'], ['get', 'CODE_ID']], 'text-size': 10, 'symbol-placement': 'point', 'text-max-width': 8 },
-      paint: { 'text-color': C.controlledStroke, 'text-halo-color': '#0f172a', 'text-halo-width': 1.5 },
-    },
-    {
-      id: 'airline', type: 'line', source: sourceId, 'source-layer': 'segment', minzoom: 6,
-      paint: {
-        'line-color': ['case', ['==', ['get', 'HAS_REMARK'], 1], '#fbbf24', C.segment],
-        'line-width': ['interpolate', ['linear'], ['zoom'], 6, 0.2, 8, 0.8],
-        "line-blur": 0,
-        "line-opacity":
-          [
-            "interpolate",
-            [
-              "linear"
-            ],
-            [
-              "zoom"
-            ],
-            6,
-            0.3,
-            7,
-            1,
-            8,
-            1,
-            12,
-            0.8,
-            15,
-            0.2
-          ]
-      },
-    },
-    {
-      id: 'airline_label', type: 'symbol', source: sourceId, 'source-layer': 'segment', minzoom: 6,
-      layout: {
-        "icon-image": ["case", ["all", ["has", "TXT_DESIG"], ["!=", ["get", "TXT_DESIG"], ""], ["!=", ["get", "TXT_DESIG"], " "], ["!=", ["get", "TXT_DESIG"], null]], "segment-both", ["all", ["has", "TXT_DESIG_FORWARD"]], "segment-right", ["all", ["has", "TXT_DESIG_BACKWARD"]], "segment-left", "segment-both"],
-        "icon-anchor": "center", "symbol-placement": "line", "icon-text-fit": "width", "icon-size": 1,
-        "text-allow-overlap": false, "icon-allow-overlap": false,
-        "text-anchor": "center", "text-justify": "center", "text-line-height": 1.3, "text-letter-spacing": 0.1,
-        "text-field":
-          ["step", ["zoom"],
-            ["format", ["case", ["all", ["has", "TXT_DESIG"], ["!=", ["get", "TXT_DESIG"], ""]], ["get", "TXT_DESIG"], ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], ["get", "TXT_DESIG_FORWARD"], ["all", ["has", "TXT_DESIG_BACKWARD"], ["!=", ["get", "TXT_DESIG_BACKWARD"], ""]], ["get", "TXT_DESIG_BACKWARD"], "-"], { "font-scale": 1, "text-color": "#0f172a" }],
-            10,
-            ["format",
-              ["concat", ["get", "VAL_LEN"], "", ["get", "UOM_DIST"]], { "font-scale": 0.95, "text-color": "#cbd5e1" }, "\n",
-              ["case", ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], ["case", ["all", ["has", "TXT_DESIG_RNP"], ["!=", ["get", "TXT_DESIG_RNP"], ""]], ["get", "TXT_DESIG_RNP"], ""], ""], { "font-scale": 1, "text-color": "#FFFFFF" },
-              ["case", ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], ["case", ["all", ["has", "TXT_DESIG_RNP"], ["!=", ["get", "TXT_DESIG_RNP"], ""]], " ", ""], ""], {},
-              ["case", ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], ["get", "TXT_DESIG_FORWARD"], ["all", ["has", "TXT_DESIG"], ["!=", ["get", "TXT_DESIG"], ""]], ["get", "TXT_DESIG"], ["all", ["has", "TXT_DESIG_BACKWARD"], ["!=", ["get", "TXT_DESIG_BACKWARD"], ""]], ["get", "TXT_DESIG_BACKWARD"], "-"], { "font-scale": 1, "text-color": "#0f172a", "font-weight": "bold" },
-              ["case", ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], "", ["case", ["all", ["has", "TXT_DESIG_RNP"], ["!=", ["get", "TXT_DESIG_RNP"], ""]], " ", ""]], {},
-              ["case", ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], "", ["case", ["all", ["has", "TXT_DESIG_RNP"], ["!=", ["get", "TXT_DESIG_RNP"], ""]], ["get", "TXT_DESIG_RNP"], ""]], { "font-scale": 0.85, "text-color": "#FFFFFF" },
-              "\n",
-              ["case", ["all", ["has", "TXT_DESIG_HIGH"], ["!=", ["get", "TXT_DESIG_HIGH"], ""]], ["get", "TXT_DESIG_HIGH"], ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], ["get", "TXT_DESIG_FORWARD"], ["all", ["has", "TXT_DESIG_BACKWARD"], ["!=", ["get", "TXT_DESIG_BACKWARD"], ""]], ["get", "TXT_DESIG_BACKWARD"], "-"], { "font-scale": 0.95, "text-color": "#cbd5e1" }
-            ]
-          ],
-        "text-size": ["interpolate", ["linear"], ["zoom"], 6, 9, 10, 10],
-        "icon-text-fit-padding": [0, 3, 0, 3],
-      },
-      paint: { "icon-color": C.segment },
-    },
-    {
-      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, -1] },
-      paint: { 'text-color': C.segment, 'text-halo-color': '#0f172a', 'text-halo-width': 1 },
-    },
-    {
-      id: 'airport', type: 'symbol', source: sourceId, minzoom: 3, 'source-layer': 'airport',
-      filter: ['case', ['<', ['zoom'], 6], ['==', ['get', 'level'], 1], true],
-      layout: {
-        "icon-image": ["case", ["==", ["get", "CODE_TYPE_MIL_OPS"], "MIL"], "airport-mil", ["==", ["get", "CODE_TYPE_MIL_OPS"], "MILEXT"], "airport-milext", "airport-civ"], "icon-size": ["interpolate", ["linear"], ["zoom"], 4, 0.5, 10, 0.9], "symbol-z-order": "viewport-y", "text-field": ["get", "codeId"],
-        "text-letter-spacing": 0.05,
-        "text-anchor": "bottom",
-        'text-field': ['get', 'CODE_ID'],
-        "text-justify": "center",
-        "text-size": ["interpolate", ["linear"], ["zoom"], 4, 0, 5, 12],
-        "text-offset": ["interpolate", ["linear"], ["zoom"], 4, ["literal", [0, -1.2]], 5, ["literal", [0, -0.6]]],
-        "icon-allow-overlap": true,
-        "icon-ignore-placement": true,
-        "text-allow-overlap": true,
-        "text-ignore-placement": true,
-        "visibility": "none",
-        "icon-size": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          5,
-          0.6,
-          9,
-          1.2,
-          12,
-          1.3
-        ]
-      },
-      paint: {
-        'icon-color': ['case',
-          ['has', 'has_amm'], '#4B2D6E',
-          C.airport,
-        ],
-        "icon-opacity": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          2,
-          0.75,
-          3,
-          0.95,
-          5,
-          1,
-          9,
-          1,
-          11,
-          0.2
-        ],
-        "text-color": ['case',
-          ['has', 'has_amm'], '#4B2D6E',
-          "#E0F7FA",
-        ],
-        "text-opacity": [
-          "interpolate",
-          [
-            "linear"
-          ],
-          [
-            "zoom"
-          ],
-          4,
-          0.95,
-          5,
-          1,
-          9,
-          1,
-          11,
-          0.2
-        ],
-      },
-    },
-    {
-      id: 'runway-line', type: 'line', source: sourceId, 'source-layer': 'runway', filter: ['!', ['has', 'has_amm']], minzoom: 4,
-      paint: { 'line-color': C.runway, 'line-width': ['interpolate', ['linear'], ['zoom'], 4, 1, 10, 3] },
-    },
-    {
-      id: 'runway-line-amm', type: 'line', source: sourceId, 'source-layer': 'runway', filter: ['has', 'has_amm'], minzoom: 4,
-      paint: { 'line-color': C.runway, 'line-width': ['interpolate', ['linear'], ['zoom'], 4, 1, 10, 3], 'line-opacity': ['interpolate', ['linear'], ['zoom'], 10.5, 1, 11, 0] },
-    },
-    {
-      id: 'runway-label', type: 'symbol', source: sourceId, 'source-layer': 'runway', minzoom: 10,
-      layout: { 'text-field': ['concat', ['to-string', ['get', 'VAL_LEN']], '×', ['to-string', ['get', 'VAL_WID']], 'm'], 'text-size': 10, 'text-font': ['Noto Sans Regular'], 'symbol-placement': 'line-center', 'text-rotation-alignment': 'map', 'text-optional': true },
-      paint: { 'text-color': C.runway, 'text-halo-color': '#0f172a', 'text-halo-width': 1, 'text-opacity': ['interpolate', ['linear'], ['zoom'], 10.5, 1, 11, 0] },
-    },
-    {
-      id: 'vor_icon_dial', type: 'symbol', source: sourceId, 'source-layer': 'vor',
-      layout: { "icon-image": "vor:vor_dial", "icon-size": ["interpolate", ["linear"], ["zoom"], 5, 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-rotate": ["to-number", ["get", "VAL_MAG_VAR"], 0], "icon-rotation-alignment": "map", "symbol-z-order": "viewport-y", "text-letter-spacing": 0.05, "text-optional": true, "icon-allow-overlap": true, "visibility": "none" },
-      paint: { "icon-color": "#38bdf8" }
-    },
-    {
-      id: 'vor_icon', minzoom: 4, maxzoom: 9, type: 'symbol', source: sourceId, 'source-layer': 'vor',
-      layout: {
-        "icon-image": "v2:vor-normal",
-        "icon-size": ["interpolate", ["linear"], ["zoom"], 4, 0.7, 8, 1],
-        "icon-rotation-alignment": "map",
-        "symbol-z-order": "viewport-y",
-        "text-letter-spacing": 0.05,
-        "text-optional": true,
-        "icon-allow-overlap": true,
-      },
-      paint: {
-        "icon-color": "#38bdf8",
-        "icon-opacity": ["interpolate", ["linear"], ["zoom"], 8, 1, 9, 0],
-      }
-    },
-    {
-      id: 'vor_label', type: 'symbol', source: sourceId, 'source-layer': 'vor', minzoom: 5,
-      layout: { 'text-field': ['get', 'CODE_ID'], 'text-size': 10, 'text-anchor': 'bottom', 'text-offset': [0, -0.8] },
-      paint: { 'text-color': C.vor, 'text-halo-color': '#0f172a', 'text-halo-width': 1 },
-    },
-    {
-      id: 'ndb_icon', type: 'symbol', source: sourceId, minzoom: 4, 'source-layer': 'ndb',
-      layout: { "icon-image": "ndb-inway", "icon-size": ["interpolate", ["linear"], ["zoom"], 6, 0.5, 10, 1], "symbol-z-order": "viewport-y", "text-field": ["concat", ["get", "CODE_ID"], "\n", ["get", "VAL_FREQ"], "kHz"], "text-size": 10, "text-offset": [0, 1.4], "text-letter-spacing": 0.05, "text-optional": true, "icon-allow-overlap": true },
-      paint: { "text-color": C.ndb, "text-halo-color": "#0f172a", "text-halo-width": 1, "icon-color": C.ndb }
-    },
-    {
-      id: 'airline_point', type: 'symbol', source: sourceId, 'source-layer': 'waypoint', minzoom: 6,
-      layout: { 'icon-image': ['case', ['==', ['get', 'report_type'], 'C'], 'waypoint-compusory', 'waypoint'], '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 },
-      paint: { 'icon-color': C.waypoint, 'text-color': C.waypoint, 'text-halo-color': '#0f172a', 'text-halo-width': 1 },
-    },
-    {
-      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 },
-      paint: { 'icon-color': C.waypoint, 'text-color': C.waypoint, 'text-halo-color': '#0f172a', 'text-halo-width': 1 },
-    },
-  ]
-}
-
-
-// ── Theme registry
-// Add new entries here to register additional chart styles.
+// ── Theme registry ──────────────────────────────────────────────────────────
+// 加主题 = 在 THEME_TOKENS 增加一张 token 表 + 在此登记。
 const CHART_THEMES = {
-  light: { id: 'light', label: '日间', background: '#EAF2F8', build: buildLayersLight },
-  dark: { id: 'dark', label: '夜间', background: '#000000', build: buildLayersDark },
+  light: { id: 'light', label: '日间', background: '#EAF2F8' },
+  dark: { id: 'dark', label: '夜间', background: '#000000' },
+  dusk: { id: 'dusk', label: '暮光', background: '#1B2838' },
+  foreflight: { id: 'foreflight', label: 'ForeFlight 风格', background: '#F2EFE6' },
 };
 
-function buildLayers(themeId = 'light') {
-  return (CHART_THEMES[themeId] ?? CHART_THEMES.light).build()
-}
-
-// ── Layer groups & labels (theme-independent) 
+// ── Layer groups & labels (theme-independent) ────────────────────────────────
 const LAYER_GROUPS = {
   adiz: ['adiz-line', 'adiz-label'],
   airspace: ['airspaceLayer', 'airspaceLayer_line', 'airspace_label_center_layer', 'airspace_label_side_layer'],
@@ -8656,7 +8179,8 @@ class MapSDK {
     initializeMap(options) {
         this._baseUrl = options.staticUrl || "https://aips.siniswift.com";
         this._chartApiUrl = (options.apiUrl || DEFAULT_CHART_API_URL).replace(/\/$/, "");
-        const themeId = options.theme === "dark" ? "dark" : "light";
+        this._apiVersion = options.apiVersion || undefined;
+        const themeId = this._resolveThemeId(options.theme);
         const themeConfig = CHART_THEMES[themeId] ?? CHART_THEMES.light;
         const style = options.style ??
             getAviationBaseStyle({
@@ -8810,9 +8334,9 @@ class MapSDK {
             return;
         }
         if (!this.map.getSource("navdata")) {
-            this.map.addSource("navdata", getNavdataSource(this._chartApiUrl, period));
+            this.map.addSource("navdata", getNavdataSource(this._chartApiUrl, period, this._apiVersion));
         }
-        const themeId = this.initialOptions.theme === "dark" ? "dark" : "light";
+        const themeId = this._resolveThemeId(this.initialOptions.theme);
         for (const layer of buildLayers(themeId)) {
             if (this.map.getLayer(layer.id))
                 continue;
@@ -8821,7 +8345,7 @@ class MapSDK {
             this.map.addLayer(layer);
         }
         if (!this.map.getSource("amm")) {
-            this.map.addSource("amm", getChartAmmSource(this._chartApiUrl));
+            this.map.addSource("amm", getChartAmmSource(this._chartApiUrl, this._apiVersion));
         }
         const ammBefore = this.map.getLayer("airspaceLayer") ? "airspaceLayer" : undefined;
         for (const layer of buildAMMLayers("amm", themeId)) {
@@ -8953,8 +8477,8 @@ class MapSDK {
         });
     }
     setTheme(theme) {
-        const prevTheme = globalConfig.getConfig().styleConfig?.theme ||
-            "light";
+        theme = this._resolveThemeId(theme);
+        const prevTheme = this._resolveThemeId(globalConfig.getConfig().styleConfig?.theme);
         if (prevTheme === theme)
             return;
         globalConfig.updateConfigItem("styleConfig", {
@@ -8970,6 +8494,9 @@ class MapSDK {
             this._applyThemedProps(id, prevDefs[id], nextDefs[id]);
         }
     }
+    _resolveThemeId(theme) {
+        return theme && CHART_THEMES[theme] ? theme : "light";
+    }
     _themeLayerDefs(theme) {
         const themeConfig = CHART_THEMES[theme] ?? CHART_THEMES.light;
         const defs = {
@@ -9150,7 +8677,7 @@ class MapSDK {
         this.globalConfig.setPeriod(period);
         const navdata = this.map?.getSource("navdata");
         if (navdata?.setTiles) {
-            navdata.setTiles([navdataTilesUrl(this._chartApiUrl, period)]);
+            navdata.setTiles([navdataTilesUrl(this._chartApiUrl, period, this._apiVersion)]);
         }
         if (from !== undefined && from !== period) {
             this.map?.fire("periodchange", { from, to: period });
@@ -9168,7 +8695,7 @@ class MapSDK {
         return searchFeatures(this._chartApiUrl, apiKey, {
             ...params,
             ...(period ? { period } : {}),
-        });
+        }, this._apiVersion);
     }
     getGeometry(params) {
         const apiKey = this.globalConfig.getConfig().apiKey;
@@ -9176,11 +8703,11 @@ class MapSDK {
         return getFeatureGeometry(this._chartApiUrl, apiKey, {
             ...params,
             ...(period ? { period } : {}),
-        });
+        }, this._apiVersion);
     }
     getPeriods(signal) {
         const apiKey = this.globalConfig.getConfig().apiKey;
-        return getPeriods(this._chartApiUrl, apiKey, signal);
+        return getPeriods(this._chartApiUrl, apiKey, signal, this._apiVersion);
     }
     showGraticule() {
         this.graticule?.show();
@@ -9264,6 +8791,8 @@ class MapSDK {
         if (options.baseUrl)
             config.baseUrl = options.baseUrl;
         config.apiUrl = this._chartApiUrl;
+        if (this._apiVersion)
+            config.apiVersion = this._apiVersion;
         if (options.period)
             config.period = options.period;
         globalConfig.setConfig(config);