aviation-chart 2.0.20 → 2.0.22

package/dist/nav-sdk.d.ts

@@ -1258,7 +1258,7 @@ declare namespace CHART_THEMES {
         let label: string;
         let background: string;
     }
-    namespace dark {
+    namespace standard {
         let id_1: string;
         export { id_1 as id };
         let label_1: string;
@@ -1266,7 +1266,7 @@ declare namespace CHART_THEMES {
         let background_1: string;
         export { background_1 as background };
     }
-    namespace dusk {
+    namespace dark {
         let id_2: string;
         export { id_2 as id };
         let label_2: string;
@@ -1274,7 +1274,7 @@ declare namespace CHART_THEMES {
         let background_2: string;
         export { background_2 as background };
     }
-    namespace sectional {
+    namespace dusk {
         let id_3: string;
         export { id_3 as id };
         let label_3: string;
@@ -1282,6 +1282,14 @@ declare namespace CHART_THEMES {
         let background_3: string;
         export { background_3 as background };
     }
+    namespace sectional {
+        let id_4: string;
+        export { id_4 as id };
+        let label_4: string;
+        export { label_4 as label };
+        let background_4: string;
+        export { background_4 as background };
+    }
 }
 declare namespace LAYER_GROUPS {
     export let adiz: string[];

package/dist/nav-sdk.esm.js

@@ -9767,15 +9767,15 @@ const THEME_TOKENS = {
     land: '#F2F5F9',
     halo: '#ffffff',
     boundaryPattern: 'normal:national-border-light',
-    adizLine: null,                 // light 不给 adiz 线描色（仅用 pattern）
-    adizLabel: '#6600cc',
     airspaceStroke: '#6F7E68',
     restrictedFill: '#FAD7A0',
+    restrictedFillPattern: "",
     restrictedStrokeLine: '#f6bf65',
     restrictedStroke: '#D35400',    // 限制区标注文字色（ICAO 导出/图例用）
     controlledStroke: '#10B981',
     controlledFill: '#10B981',
     segment: '#1C2526',
+    segmentWith: ['interpolate', ['linear'], ['zoom'], 6, 0.2, 8, 0.8],
     segmentRemark: '#E8A020',       // HAS_REMARK 航段
     airport: '#006400',             // 机场图标色
     airportamm: "#4B2D6E",   // AMM 机场
@@ -9787,6 +9787,7 @@ const THEME_TOKENS = {
     ndbIcon: 'v2:ndb-normal',       // 图标按主题不同（正常）
     ndb: '#0066CC',
     waypoint: '#1C2526',
+    airlinePointIcon: ['case', ['==', ['get', 'report_type'], 'C'], 'waypoint-compusory', 'waypoint'],
     // airline_label format 内嵌文字色
     alBase: '#ffffff', alDist: '#3E4759', alRnp: '#E8A020',
     // halo 片段：light 多数标注无 halo → 空对象
@@ -9804,8 +9805,6 @@ const THEME_TOKENS = {
     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',
@@ -9813,6 +9812,7 @@ const THEME_TOKENS = {
     controlledStroke: '#22C55E',
     controlledFill: '#22C55E',
     segment: '#40C4FF',
+    segmentWith: ['interpolate', ['linear'], ['zoom'], 6, 0.2, 8, 0.8],
     segmentRemark: '#fbbf24',
     airport: '#73ccdd',
     airportamm: "#c084fc",   // AMM 机场
@@ -9824,6 +9824,7 @@ const THEME_TOKENS = {
     ndbIcon: 'ndb-inway',
     ndb: '#62d6ef',
     waypoint: '#74cdde',
+    airlinePointIcon: ['case', ['==', ['get', 'report_type'], 'C'], 'waypoint-compusory', 'waypoint'],
     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 },
@@ -9842,15 +9843,15 @@ const THEME_TOKENS = {
     land: '#22303F',
     halo: '#16212c',
     boundaryPattern: 'normal:national-border-dusk',
-    adizLine: '#c77dff',
-    adizLabel: '#e0aaff',
     airspaceStroke: '#7fb3d5',
     restrictedFill: '#e67e22',
+    restrictedFillPattern: "",
     restrictedStrokeLine: '#e59866',
     restrictedStroke: '#e59866',
     controlledStroke: '#52c9a3',
     controlledFill: '#52c9a3',
     segment: '#8fa8c7',
+    segmentWith: ['interpolate', ['linear'], ['zoom'], 6, 0.2, 8, 0.8],
     segmentRemark: '#f4c542',
     airport: '#7fd1ae',
     airportamm: "#6C3483",   // AMM 机场
@@ -9862,6 +9863,7 @@ const THEME_TOKENS = {
     ndbIcon: 'ndb-inway',
     ndb: '#7ec8e3',
     waypoint: '#a9c6d8',
+    airlinePointIcon: ['case', ['==', ['get', 'report_type'], 'C'], 'waypoint-compusory', 'waypoint'],
     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 },
@@ -9881,15 +9883,15 @@ const THEME_TOKENS = {
     land: '#F7F5EC',
     halo: '#F2EFE6',
     boundaryPattern: 'normal:national-border',
-    adizLine: '#8e44ad',
-    adizLabel: '#8e44ad',
     airspaceStroke: '#2E5C8A',
     restrictedFill: '#E8A33D',
+    restrictedFillPattern: "",
     restrictedStrokeLine: '#C0392B',
     restrictedStroke: '#C0392B',
     controlledStroke: '#2E5C8A',
     controlledFill: '#2E5C8A',
     segment: '#34495E',
+    segmentWith: ['interpolate', ['linear'], ['zoom'], 6, 0.2, 8, 0.8],
     segmentRemark: '#D68910',
     airport: '#B03060',
     airportamm: "#6C3483",   // AMM 机场
@@ -9901,6 +9903,7 @@ const THEME_TOKENS = {
     ndbIcon: 'v2:ndb-normal',
     ndb: '#8B5A2B',
     waypoint: '#2C3E50',
+    airlinePointIcon: ['case', ['==', ['get', 'report_type'], 'C'], 'waypoint-compusory', 'waypoint'],
     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 },
@@ -9911,6 +9914,48 @@ const THEME_TOKENS = {
     alHalo: { 'text-halo-color': '#F2EFE6', 'text-halo-width': 0.5 },
     ndbHalo: { 'text-halo-color': '#F2EFE6', 'text-halo-width': 1 },
   },
+  // 标准版
+  standard: {
+    background: '#C8DCE8',
+    land: '#F2F5F9',
+    halo: '#ffffff',
+    boundaryPattern: 'normal:national-border-light',
+    airspaceStroke: '#6F7E68',
+    restrictedFill: 'transparent',
+    restrictedFillPattern: "normal:passline-restricted-fill",
+    restrictedStrokeLine: '#7E524D',
+    restrictedStrokeLineWidth:1.2,
+    restrictedStroke: '#D35400',    // 限制区标注文字色（ICAO 导出/图例用）
+    controlledStroke: "#88918038",
+    controlledFill: '#C7CEC056',
+    segment: '#1C2526',
+    segmentWith: ['interpolate', ['linear'], ['zoom'], 6, 1.9, 10, 2.2],
+    segmentRemark: '#E8A020',       // HAS_REMARK 航段
+    airport: '#006400',             // 机场图标色
+    airportamm: "#4B2D6E",   // AMM 机场
+    airportText: '#006400',         // 机场文字色（非 AMM）
+    runway: '#006400',
+    vorDial: '#0b417a',
+    vorNormal: '#3874cb',
+    vor: '#00008B',
+    ndbIcon: 'v2:ndb-normal',       // 图标按主题不同（正常）
+    ndb: '#0066CC',
+    waypoint: '#1C2526',
+    airlinePointIcon: ['case', ['==', ['get', 'report_type'], 'C'], 'designate_point_inway', 'designate_point_notinway'],
+    airlinePointIconSize: 0.65,
+    waypointOpacity: ["interpolate", ["linear"], ["zoom"], 6.5, 1, 12, 1, 15, 0.2],
+    // 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 },
+  },
 };
 
 function buildLayers(themeId = 'light') {
@@ -9926,24 +9971,10 @@ function buildLayers(themeId = 'light') {
       "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.9],
+        "line-opacity": 1,
         "line-pattern": T.boundaryPattern,
       }
     },
-    {
-      id: 'adiz-line', type: 'line', source: sourceId, 'source-layer': 'adiz', minzoom: 3,
-      layout: { 'line-cap': 'round', 'line-join': 'round' },
-      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': T.adizLabel, 'text-halo-color': T.halo, 'text-halo-width': 1.5 },
-    },
     {
       id: 'airspaceLayer', type: 'line', source: sourceId, 'source-layer': 'fir', minzoom: 2,
       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] }
@@ -9976,12 +10007,13 @@ function buildLayers(themeId = 'light') {
       id: 'restrictedLayer', type: 'fill', source: sourceId, 'source-layer': 'restricted-fill', minzoom: 4,
       paint: {
         'fill-color': T.restrictedFill,
+        "fill-pattern": T.restrictedFillPattern,
         'fill-opacity': ["interpolate", ["linear"], ["zoom"], 10, 0.15, 11.5, 0],
       },
     },
     {
       id: 'restrictedLayer_stroke', type: 'line', source: sourceId, 'source-layer': 'restricted',
-      paint: { 'line-color': T.restrictedStrokeLine, 'line-width': 1, "line-dasharray": [2, 2], "line-opacity": ['interpolate', ['linear'], ['zoom'], 4, 0.5, 8, 1] },
+      paint: { 'line-color': T.restrictedStrokeLine, 'line-width': T.restrictedStrokeLineWidth || 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,
@@ -10008,7 +10040,7 @@ function buildLayers(themeId = 'light') {
       id: 'airline', type: 'line', source: sourceId, 'source-layer': 'segment', minzoom: 6,
       paint: {
         'line-color': ['case', ['==', ['get', 'HAS_REMARK'], 1], T.segmentRemark, T.segment],
-        'line-width': ['interpolate', ['linear'], ['zoom'], 6, 0.2, 8, 0.8],
+        'line-width': T.segmentWith,
         "line-blur": 0,
         "line-opacity": ["interpolate", ["linear"], ["zoom"], 6, 0.5, 7, 1, 8, 1, 12, 0.8, 15, 0.2],
       }
@@ -10238,7 +10270,8 @@ function buildLayers(themeId = 'light') {
     {
       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-image': T.airlinePointIcon,
+        'icon-size': T.airlinePointIconSize || 0.6,
         'icon-allow-overlap': true,
         'icon-ignore-placement': true,
         'text-field': ['get', 'CODE_ID'],
@@ -10252,7 +10285,7 @@ function buildLayers(themeId = 'light') {
         'text-color': T.waypoint,
         "icon-halo-color": "rgba(0,0,0,0)",
         "icon-halo-width": 0,
-        "icon-opacity": ["interpolate", ["linear"], ["zoom"], 6.5, 0.5, 12, 1, 15, 0.2],
+        "icon-opacity": T.waypointOpacity || ["interpolate", ["linear"], ["zoom"], 6.5, 0.5, 12, 1, 15, 0.2],
         "text-halo-color": T.halo,
         "text-halo-width": 1,
         "text-halo-blur": 0,
@@ -10275,6 +10308,7 @@ function buildLayers(themeId = 'light') {
 // 加主题 = 在 THEME_TOKENS 增加一张 token 表 + 在此登记。
 const CHART_THEMES = {
   light: { id: 'light', label: '日间', background: '#C8DCE8' },
+  standard: { id: 'standard', label: 'Pro风格', background: '#C8DCE8' },
   dark: { id: 'dark', label: '夜间', background: '#000000' },
   dusk: { id: 'dusk', label: '暮光', background: '#1B2838' },
   sectional: { id: 'sectional', label: 'ForeFlight 风格', background: '#DCEAEF' },
@@ -10438,10 +10472,10 @@ class MapSDK {
         const authHeaders = apiKey
             ? { "X-Api-Key": apiKey }
             : {};
-        const landPromise = fetchGzJson(`${this._chartApiUrl}/topjson/land.topojson.gz`, authHeaders).catch((err) => {
+        const landPromise = fetchGzJson(`${this._chartApiUrl}/topjson/land.topojson`, authHeaders).catch((err) => {
             return null;
         });
-        const boundaryPromise = fetchGzJson(`${this._chartApiUrl}/topjson/boundary.topojson.gz`, authHeaders).catch((err) => {
+        const boundaryPromise = fetchGzJson(`${this._chartApiUrl}/topjson/boundary.topojson`, authHeaders).catch((err) => {
             return null;
         });
         this.map.on("load", async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aviation-chart",
-  "version": "2.0.20",
+  "version": "2.0.22",
   "description": "KunYu aviation map SDK",
   "main": "dist/nav-sdk.esm.js",
   "module": "dist/nav-sdk.esm.js",