aviation-chart 2.0.42 → 2.0.47

package/dist/nav-sdk.d.ts

@@ -800,7 +800,7 @@ declare class RasterManager {
     private updateCoordinates;
     private addSource;
     private addLayer;
-    addRasterLayer(layerId: string, sourceId: string, meteoType: string): void;
+    addRasterLayer(layerId: string, sourceId: string, meteoType: string, beforeId: string): void;
     updateRasterLayer(sourceId: string, newUrl: string, meteoType: string): void;
     removeRasterLayer(layerId: string, sourceId: string): void;
 }

package/dist/nav-sdk.esm.js

@@ -4104,7 +4104,7 @@ class RasterManager {
             return;
         this.map.addSource(sourceId, { type: "image", url, coordinates: coords });
     }
-    addLayer(layerId, sourceId) {
+    addLayer(layerId, sourceId, beforeId) {
         if (this.map.getLayer(layerId))
             return;
         this.map.addLayer({
@@ -4117,12 +4117,12 @@ class RasterManager {
                 'raster-opacity': 1,
                 "raster-resampling": 'linear',
             }
-        });
+        }, beforeId);
     }
-    addRasterLayer(layerId, sourceId, meteoType) {
+    addRasterLayer(layerId, sourceId, meteoType, beforeId) {
         this.updateCoordinates(meteoType);
         this.addSource(sourceId, this.rasterUrl, this.coordinates);
-        this.addLayer(layerId, sourceId);
+        this.addLayer(layerId, sourceId, beforeId);
     }
     updateRasterLayer(sourceId, newUrl, meteoType) {
         this.rasterUrl = newUrl;
@@ -10250,8 +10250,8 @@ const THEME_TOKENS = {
     airportText: '#006400',         // 机场文字色（非 AMM）
     runway: '#006400',
     vorDial: '#0b417a',
-    vorNormal: '#00008B',
-    vor: '#00008B',
+    vorNormal: '#1C2526',
+    vor: '#1C2526',
     vorCompass: '#2E4053',
     vorCompassPointer: '#000000',
     ndbIcon: 'v2:ndb-normal',       // 图标按主题不同（正常）
@@ -10578,14 +10578,36 @@ function buildLayers(themeId = 'light') {
       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,
+      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-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 },
+      paint: {
+        'text-color': T.airspaceStroke, ...T.sideHalo,
+        'text-opacity': ["interpolate", ["linear"], ["zoom"], 5, 0, 5.5, 0.8, 9, 0.8, 10, 0.5],
+      },
     },
     {
-      id: 'airspace_label_center_layer', type: 'symbol', source: sourceId, 'source-layer': 'fir-centroid',
+      id: 'airspace_label_center_layer',
+      filter: [
+        '>=',
+        ['to-number', ['get', 'SIZE'], 0],
+        [
+          'step', ['zoom'],
+          1e20,          // zoom < 2：不显示
+          3, 700000,    // zoom ≥ 2：面积 ≥ 70万 km²
+          4, 300000,     // zoom ≥ 3：面积 ≥ 20万 km²
+          5, 80000,     // zoom ≥ 4：面积 ≥ 8万 km²
+          6, 20000,      // zoom ≥ 5：面积 ≥ 2万 km²
+          7, 0           // zoom ≥ 6：全部允许显示
+        ]
+      ],
+
+      type: 'symbol',
+      source: sourceId,
+      'source-layer': 'fir-centroid',
       minzoom: 3,
-      maxzoom: 7,
       layout: {
         'text-field': '{CODE_ID}',
         'text-font': ['Frutiger Regular'],
@@ -10942,126 +10964,6 @@ function buildLayers(themeId = 'light') {
         }
       },
     },
-    {
-      id: 'airport', type: 'symbol', source: sourceId, minzoom: 2.5, 'source-layer': 'airport',
-      // 4级前就显示大型机场+中型，5级后全部显示
-      filter:
-        ['case',
-          ['<=', ['zoom'], 3], ['<=', ['get', 'level'], 1],   // zoom ≤3，只显示 level=1（大型）
-          ['<=', ['zoom'], 4], ['<=', ['get', 'level'], 2],   // zoom ≤4，显示 level≤2（大型+中型）
-          ['<=', ['zoom'], 5], ['<=', ['get', 'level'], 3],   // zoom ≤5，显示 level≤3（大型+中型+小型）
-          true                                                 // zoom >5，全部显示
-        ],
-      layout: {
-        "icon-image": ["case", ["==", ["get", "CODE_TYPE_MIL_OPS"], "MIL"], "airport-milext-circle", ["==", ["get", "CODE_TYPE_MIL_OPS"], "MILEXT"], "airport-mil-circle", "airport-civ-cirlce"],
-        // "icon-image": ["case", ["==", ["get", "CODE_TYPE_MIL_OPS"], "MIL"], "airport-mil", ["==", ["get", "CODE_TYPE_MIL_OPS"], "MILEXT"], "airport-milext", "airport-civ"],
-        "symbol-z-order": "viewport-y",
-        "text-letter-spacing": 0.05,
-        "icon-pitch-alignment": "map",
-        'text-field': ['get', 'CODE_ID'],
-        "text-anchor": "bottom",
-        "text-justify": "center",
-        "text-size": ["interpolate", ["linear"], ["zoom"], 3, 0, 4, 9, 5, 10],
-        "text-offset": [
-          "interpolate", ["linear"], ["zoom"],
-          5, ["literal", [0, -0.8]],
-          9, ["literal", [0, -1.2]],
-          12, ["literal", [0, -1.3]]
-        ],
-        "icon-allow-overlap": true,
-        "icon-ignore-placement": true,
-        "text-allow-overlap": false,
-        "text-ignore-placement": false,
-        "text-optional": true,
-        "visibility": "none",
-        "icon-size": ["interpolate", ["linear"], ["zoom"], 2, 0.6, 5, 0.7, 9, 1, 12, 1.1],
-        'text-font': frutigerBold,
-      },
-      paint: {
-        'icon-color': ['case', ['has', 'has_amm'], T.airportamm, 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'], T.airportamm, T.airportText],
-        "text-opacity": ["interpolate", ["linear"], ["zoom"], 4, 0.95, 5, 1, 9, 1, 11, 0.2],
-      },
-    },
-    // Runway-orientation strip: a small mark rotated to the true bearing of the
-    // airport's longest runway (RWY_BRG1). Airports with a crossing runway get a
-    // second strip (RWY_BRG2). Both ride the 'airport' source-layer point, so the
-    // strip sits at the airport symbol's center. `icon-rotation-alignment: map`
-    // keeps the strip aligned to the ground as the map rotates. The `runway-strip`
-    // sprite is supplied by the host sprite sheet.
-    {
-      id: 'airport-runway', type: 'symbol', source: sourceId, minzoom: 4, 'source-layer': 'airport',
-      filter: [
-        'all',
-        ['has', 'RWY_BRG1'],
-        ['case',
-          ['<=', ['zoom'], 3], ['<=', ['get', 'level'], 1],
-          ['<=', ['zoom'], 4], ['<=', ['get', 'level'], 2],
-          ['<=', ['zoom'], 5], ['<=', ['get', 'level'], 3],
-          true
-        ]
-      ],
-      layout: {
-        'icon-image': 'runway:runway-strip',
-        "icon-pitch-alignment": "map",
-        'icon-rotate': ['get', 'RWY_BRG1'],
-        'icon-rotation-alignment': 'map',
-        'icon-size': ['interpolate', ['linear'], ['zoom'], 2, 0.3, 9, 0.7, 12, 0.7],
-        'icon-allow-overlap': true,
-        'icon-ignore-placement': true,
-        'visibility': 'none',
-      },
-      paint: {
-        "icon-color": T.runway,
-        "icon-opacity": ["interpolate", ["linear"], ["zoom"], 2, 0.75, 9, 1, 11, 0.2],
-      },
-    },
-    {
-      id: 'airport-runway-cross', type: 'symbol', source: sourceId, minzoom: 4, 'source-layer': 'airport',
-      filter: [
-        'all',
-        ['has', 'RWY_BRG2'],
-        ['case',
-          ['<=', ['zoom'], 3], ['<=', ['get', 'level'], 1],
-          ['<=', ['zoom'], 4], ['<=', ['get', 'level'], 2],
-          ['<=', ['zoom'], 5], ['<=', ['get', 'level'], 3],
-          true
-        ]
-      ],
-      layout: {
-        'icon-image': 'runway:runway-strip',
-        'icon-rotate': ['get', 'RWY_BRG2'],
-        "icon-pitch-alignment": "map",
-        'icon-rotation-alignment': 'map',
-        'icon-size': ['interpolate', ['linear'], ['zoom'], 2, 0.3, 9, 0.7, 12, 0.7],
-        'icon-allow-overlap': true,
-        'icon-ignore-placement': true,
-        'visibility': 'none',
-      },
-      paint: {
-        "icon-color": T.runway,
-        "icon-opacity": ["interpolate", ["linear"], ["zoom"], 2, 0.75, 9, 1, 11, 0.2],
-      },
-    },
     {
       id: 'vor_icon_dial', type: 'symbol', source: sourceId, 'source-layer': 'vor', minzoom: 8,
       'maxzoom': 12,
@@ -11211,22 +11113,9 @@ function buildLayers(themeId = 'light') {
       }
     },
     {
-      id: 'vor_icon', minzoom: 4, type: 'symbol', source: sourceId, 'source-layer': 'vor',
+      id: 'vor_icon', minzoom: 5, type: 'symbol', source: sourceId, 'source-layer': 'vor',
       layout: {
         "icon-pitch-alignment": "map",
-        "icon-size": {
-          "base": 2,
-          "stops": [
-            [
-              5,
-              0.4
-            ],
-            [
-              7,
-              0.5
-            ]
-          ]
-        },
         'icon-image': [
           'case',
           ['==', ['get', 'NAVAID_TYPE'], 'VOR'],
@@ -11256,19 +11145,30 @@ function buildLayers(themeId = 'light') {
       },
       paint: {
         "icon-color": T.vorNormal,
-        'icon-opacity': 1,
+        'icon-opacity': [
+          'step', ['zoom'],
+          ['case', ['==', ['get', 'inway'], 'Y'], 1, 0],
+          8, 1
+        ]
       }
     },
     {
-      id: 'vor_label', type: 'symbol', source: sourceId, 'source-layer': 'vor', minzoom: 5, maxzoom: 8,
+      id: 'vor_label', type: 'symbol', source: sourceId, 'source-layer': 'vor', minzoom: 5.5, maxzoom: 8,
       layout: {
         'text-field': ['get', 'CODE_ID'],
         'text-anchor': 'top',
-        "text-size": 10,
-        'text-offset': [0, 0.7],
+        "text-size": 9,
+        'text-offset': [0, 0.6],
         'text-font': ['Frutiger Blod']
       },
-      paint: { 'text-color': T.vor, 'text-halo-color': T.halo, 'text-halo-width': 1 },
+      paint: {
+        'text-color': T.vor, 'text-halo-color': T.halo, 'text-halo-width': 1,
+        'text-opacity': [
+          'step', ['zoom'],
+          ['case', ['==', ['get', 'inway'], 'Y'], 1, 0],
+          8, 1
+        ]
+      },
     },
     {
       id: 'ndb_icon', type: 'symbol', source: sourceId, minzoom: 4, 'source-layer': 'ndb',
@@ -11350,6 +11250,167 @@ function buildLayers(themeId = 'light') {
       },
       paint: { 'text-color': T.navAidDetailText, 'text-halo-color': T.navAidDetailHalo, 'text-halo-width': 0.2 },
     },
+
+    {
+      id: 'airport', type: 'symbol', source: sourceId, minzoom: 2.5, 'source-layer': 'airport',
+      // 4级前就显示大型机场+中型，5级后全部显示
+      filter:
+        ['case',
+          ['<=', ['zoom'], 3], ['<=', ['get', 'level'], 1],   // zoom ≤3，只显示 level=1（大型）
+          ['<=', ['zoom'], 4], ['<=', ['get', 'level'], 2],   // zoom ≤4，显示 level≤2（大型+中型）
+          ['<=', ['zoom'], 5], ['<=', ['get', 'level'], 3],   // zoom ≤5，显示 level≤3（大型+中型+小型）
+          true                                                 // zoom >5，全部显示
+        ],
+      layout: {
+        "icon-image": ["case", ["==", ["get", "CODE_TYPE_MIL_OPS"], "MIL"], "airport-milext-circle", ["==", ["get", "CODE_TYPE_MIL_OPS"], "MILEXT"], "airport-mil-circle", "airport-civ-cirlce"],
+        // "icon-image": ["case", ["==", ["get", "CODE_TYPE_MIL_OPS"], "MIL"], "airport-mil", ["==", ["get", "CODE_TYPE_MIL_OPS"], "MILEXT"], "airport-milext", "airport-civ"],
+        "symbol-z-order": "viewport-y",
+        "text-letter-spacing": 0.05,
+        "icon-pitch-alignment": "map",
+        'text-field': ['get', 'CODE_ID'],
+        "text-anchor": "bottom",
+        "text-justify": "center",
+        "text-size": ["interpolate", ["linear"], ["zoom"], 3, 0, 4, 9, 5, 10],
+        "text-offset": [
+          "interpolate", ["linear"], ["zoom"],
+          5, ["literal", [0, -0.8]],
+          9, ["literal", [0, -1.2]],
+          12, ["literal", [0, -1.3]]
+        ],
+        "icon-allow-overlap": true,
+        "icon-ignore-placement": true,
+        "text-allow-overlap": false,
+        "text-ignore-placement": false,
+        "text-optional": true,
+        "visibility": "none",
+        "icon-size": ["interpolate", ["linear"], ["zoom"], 2, 0.6, 5, 0.7, 9, 1, 12, 1.1],
+        'text-font': frutigerBold,
+      },
+      paint: {
+        'icon-color': ['case', ['has', 'has_amm'], T.airportamm, 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'], T.airportamm, T.airportText],
+        "text-opacity": ["interpolate", ["linear"], ["zoom"], 4, 0.95, 5, 1, 9, 1, 11, 0.2],
+      },
+    },
+    // Runway-orientation strip: a small mark rotated to the true bearing of the
+    // airport's longest runway (RWY_BRG1). Airports with a crossing runway get a
+    // second strip (RWY_BRG2). Both ride the 'airport' source-layer point, so the
+    // strip sits at the airport symbol's center. `icon-rotation-alignment: map`
+    // keeps the strip aligned to the ground as the map rotates. The `runway-strip`
+    // sprite is supplied by the host sprite sheet.
+    {
+      id: 'airport-runway', type: 'symbol', source: sourceId, minzoom: 4, 'source-layer': 'airport',
+      filter: [
+        'all',
+        ['has', 'RWY_BRG1'],
+        ['case',
+          ['<=', ['zoom'], 3], ['<=', ['get', 'level'], 1],
+          ['<=', ['zoom'], 4], ['<=', ['get', 'level'], 2],
+          ['<=', ['zoom'], 5], ['<=', ['get', 'level'], 3],
+          true
+        ]
+      ],
+      layout: {
+        'icon-image': 'runway:runway-strip',
+        "icon-pitch-alignment": "map",
+        'icon-rotate': ['get', 'RWY_BRG1'],
+        'icon-rotation-alignment': 'map',
+        'icon-size': ['interpolate', ['linear'], ['zoom'], 2, 0.3, 9, 0.7, 12, 0.7],
+        'icon-allow-overlap': true,
+        'icon-ignore-placement': true,
+        'visibility': 'none',
+      },
+      paint: {
+        "icon-color": T.runway,
+        "icon-opacity": [
+          "interpolate",
+          [
+            "linear"
+          ],
+          [
+            "zoom"
+          ],
+          2,
+          0.75,
+          3,
+          0.95,
+          5,
+          0.5,
+          6,
+          0.1,
+          9,
+          1,
+          11,
+          0.2
+        ]
+      },
+    },
+    {
+      id: 'airport-runway-cross', type: 'symbol', source: sourceId, minzoom: 4, 'source-layer': 'airport',
+      filter: [
+        'all',
+        ['has', 'RWY_BRG2'],
+        ['case',
+          ['<=', ['zoom'], 3], ['<=', ['get', 'level'], 1],
+          ['<=', ['zoom'], 4], ['<=', ['get', 'level'], 2],
+          ['<=', ['zoom'], 5], ['<=', ['get', 'level'], 3],
+          true
+        ]
+      ],
+      layout: {
+        'icon-image': 'runway:runway-strip',
+        'icon-rotate': ['get', 'RWY_BRG2'],
+        "icon-pitch-alignment": "map",
+        'icon-rotation-alignment': 'map',
+        'icon-size': ['interpolate', ['linear'], ['zoom'], 2, 0.3, 9, 0.7, 12, 0.7],
+        'icon-allow-overlap': true,
+        'icon-ignore-placement': true,
+        'visibility': 'none',
+      },
+      paint: {
+        "icon-color": T.runway,
+        "icon-opacity": [
+          "interpolate",
+          [
+            "linear"
+          ],
+          [
+            "zoom"
+          ],
+          2,
+          0.75,
+          3,
+          0.95,
+          5,
+          0.5,
+          6,
+          0.1,
+          9,
+          1,
+          11,
+          0.2
+        ]
+      },
+    },
     {
       id: 'airline_point', type: 'symbol', source: sourceId, 'source-layer': 'waypoint', minzoom: 6,
       layout: {
@@ -11423,7 +11484,11 @@ const LAYER_GROUPS = {
   ],
   airline: ['airline_radial', 'airline', 'airline-shadow', 'airline_label', 'airline_point'],
   waypointOffAirway: ['waypoint-off-airway-symbol'],
-  vor: ['vor_icon_dial', 'vor_icon_dial_arrow', 'vor_label', 'vor_label_detail', 'vor_icon'],
+  vor: ['vor_icon_dial', 'vor_icon_dial_arrow', 'vor_label', 'vor_label_detail', 'vor_icon',
+    'vor-compass-ring',
+    'vor-compass-ticks',
+    'vor-compass-pointer'
+  ],
   ndb: ['ndb_icon', 'ndb_label_detail'],
   airport: ['airport', 'airport-runway', 'airport-runway-cross'],
 };

package/glm.txt

@@ -1,6 +1,6 @@
 # aviation-chart SDK 开发手册
 
-SDK 版本：2.0.42
+SDK 版本：2.0.47
 
 # 开发约定
 
@@ -438,7 +438,10 @@ setLayerVisible 的组名使用 TYPEMAP 的键；AMM_LAYER_GROUPS 仅用于查
       "vor_icon_dial_arrow",
       "vor_label",
       "vor_label_detail",
-      "vor_icon"
+      "vor_icon",
+      "vor-compass-ring",
+      "vor-compass-ticks",
+      "vor-compass-pointer"
     ],
     "ndb": [
       "ndb_icon",
@@ -568,8 +571,7 @@ setLayerVisible 的组名使用 TYPEMAP 的键；AMM_LAYER_GROUPS 仅用于查
       "type": "symbol",
       "source": "navdata",
       "sourceLayer": "fir-centroid",
-      "minzoom": 3,
-      "maxzoom": 7
+      "minzoom": 3
     },
     {
       "id": "restrictedLayer",
@@ -651,27 +653,6 @@ setLayerVisible 的组名使用 TYPEMAP 的键；AMM_LAYER_GROUPS 仅用于查
       "sourceLayer": "segment-radial",
       "minzoom": 11
     },
-    {
-      "id": "airport",
-      "type": "symbol",
-      "source": "navdata",
-      "sourceLayer": "airport",
-      "minzoom": 2.5
-    },
-    {
-      "id": "airport-runway",
-      "type": "symbol",
-      "source": "navdata",
-      "sourceLayer": "airport",
-      "minzoom": 4
-    },
-    {
-      "id": "airport-runway-cross",
-      "type": "symbol",
-      "source": "navdata",
-      "sourceLayer": "airport",
-      "minzoom": 4
-    },
     {
       "id": "vor_icon_dial",
       "type": "symbol",
@@ -714,14 +695,14 @@ setLayerVisible 的组名使用 TYPEMAP 的键；AMM_LAYER_GROUPS 仅用于查
       "type": "symbol",
       "source": "navdata",
       "sourceLayer": "vor",
-      "minzoom": 4
+      "minzoom": 5
     },
     {
       "id": "vor_label",
       "type": "symbol",
       "source": "navdata",
       "sourceLayer": "vor",
-      "minzoom": 5,
+      "minzoom": 5.5,
       "maxzoom": 8
     },
     {
@@ -745,6 +726,27 @@ setLayerVisible 的组名使用 TYPEMAP 的键；AMM_LAYER_GROUPS 仅用于查
       "sourceLayer": "ndb",
       "minzoom": 8
     },
+    {
+      "id": "airport",
+      "type": "symbol",
+      "source": "navdata",
+      "sourceLayer": "airport",
+      "minzoom": 2.5
+    },
+    {
+      "id": "airport-runway",
+      "type": "symbol",
+      "source": "navdata",
+      "sourceLayer": "airport",
+      "minzoom": 4
+    },
+    {
+      "id": "airport-runway-cross",
+      "type": "symbol",
+      "source": "navdata",
+      "sourceLayer": "airport",
+      "minzoom": 4
+    },
     {
       "id": "airline_point",
       "type": "symbol",
@@ -2135,7 +2137,7 @@ declare class RasterManager {
     constructor(map: Map);
     get rasterSourceUrl(): string;
     set rasterSourceUrl(url: string);
-    addRasterLayer(layerId: string, sourceId: string, meteoType: string): void;
+    addRasterLayer(layerId: string, sourceId: string, meteoType: string, beforeId: string): void;
     updateRasterLayer(sourceId: string, newUrl: string, meteoType: string): void;
     removeRasterLayer(layerId: string, sourceId: string): void;
 }

package/package.json

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