aviation-chart 2.0.9 → 2.0.11

package/dist/nav-sdk.esm.js

@@ -1606,7 +1606,7 @@ function buildAMMLayersLight(sourceId = 'amm') {
       layout: {
         'text-field': ['get', 'idlin'],
         'text-size': 10,
-        "icon-image": "text_bg",
+        "icon-image": "stretch:text_bg",
         "icon-text-fit": "both",
         "icon-text-fit-padding": [
           1,
@@ -1632,7 +1632,7 @@ function buildAMMLayersLight(sourceId = 'amm') {
       'source-layer': 'amm-runway-threshold',
       minzoom: 12,
       layout: {
-        "icon-image": "text_bg",
+        "icon-image": "stretch:text_bg",
         "icon-text-fit": "both",
         "icon-text-fit-padding": [
           1,
@@ -1834,12 +1834,12 @@ function buildAMMLayersDark(sourceId = 'amm') {
     { 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": "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 },
+      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": "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' },
+      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 } },
@@ -1897,7 +1897,7 @@ function buildAMMLayersNeutral(sourceId = 'amm') {
     { 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": "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 },
+      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 } },
@@ -1915,7 +1915,7 @@ function buildAMMLayersNeutral(sourceId = 'amm') {
     { 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": "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' },
+      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 } },
@@ -7430,6 +7430,7 @@ function getAviationBaseStyle(opts) {
             { id: "v2", url: `${spriteBase}/sprites/sprite-v2` },
             { id: "vor", url: `${spriteBase}/sprites/sprite-vor` },
             { id: "runway", url: `${spriteBase}/sprites/sprite-runway` },
+            { id: "stretch", url: `${spriteBase}/sprites/sprite-stretch` },
         ],
         sources: {
             land: { type: "geojson", data: { type: "FeatureCollection", features: [] } },
@@ -7960,7 +7961,7 @@ function buildLayers(themeId = 'light') {
     {
       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-image": ["case", ["all", ["has", "TXT_DESIG"], ["!=", ["get", "TXT_DESIG"], ""], ["!=", ["get", "TXT_DESIG"], " "], ["!=", ["get", "TXT_DESIG"], null]], "stretch:segment-both", ["all", ["has", "TXT_DESIG_FORWARD"]], "stretch:segment-right", ["all", ["has", "TXT_DESIG_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,
@@ -7978,7 +7979,7 @@ function buildLayers(themeId = 'light') {
             ["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],
+        "text-size": ["interpolate", ["linear"], ["zoom"], 6.5, 9, 10, 10],
         "icon-text-fit-padding": [0, 3, 0, 3],
       },
       paint: {
@@ -8003,15 +8004,25 @@ function buildLayers(themeId = 'light') {
       paint: { 'text-color': T.segment, ...T.radialHalo },
     },
     {
-      id: 'airport', type: 'symbol', source: sourceId, minzoom: 3, 'source-layer': 'airport',
-      filter: ['case', ['<', ['zoom'], 6], ['==', ['get', 'level'], 1], true],
+      id: 'airport', type: 'symbol', source: sourceId, minzoom: 2, '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-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"],
+        "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"], 3, 0.4, 4, 0.5, 10, 0.7],
+        "symbol-z-order": "viewport-y",
+        "text-field": ["get", "codeId"],
         "text-letter-spacing": 0.05,
         'text-field': ['get', 'CODE_ID'],
         "text-anchor": "bottom",
         "text-justify": "center",
-        "text-size": ["interpolate", ["linear"], ["zoom"], 4, 0, 5, 10, 9, 12],
+        "text-size": ["interpolate", ["linear"], ["zoom"], 4, 0, 5, 10, 9, 11],
         "text-offset": [
           "interpolate", ["linear"], ["zoom"],
           5, ["literal", [0, -0.8]],
@@ -8023,7 +8034,7 @@ function buildLayers(themeId = 'light') {
         "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.7, 9, 1.2, 12, 1.3]
       },
       paint: {
         'icon-color': ['case', ['has', 'has_amm'], '#4B2D6E', T.airport],
@@ -8039,8 +8050,17 @@ function buildLayers(themeId = 'light') {
     // 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: 3, 'source-layer': 'airport',
-      filter: ['all', ['has', 'RWY_BRG1'], ['case', ['<', ['zoom'], 6], ['==', ['get', 'level'], 1], true]],
+      id: 'airport-runway', type: 'symbol', source: sourceId, minzoom: 2, '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-rotate': ['get', 'RWY_BRG1'],
@@ -8052,12 +8072,21 @@ function buildLayers(themeId = 'light') {
       },
       paint: {
         "icon-color": T.airport,
-        "icon-opacity": ["interpolate", ["linear"], ["zoom"], 2, 0.75, 3, 0.95, 5, 1, 9, 1, 11, 0.2],
+        "icon-opacity": ["interpolate", ["linear"], ["zoom"], 2, 0.65, 3, 0.85, 5, 0.9, 9, 1, 11, 0.2],
       },
     },
     {
-      id: 'airport-runway-cross', type: 'symbol', source: sourceId, minzoom: 3, 'source-layer': 'airport',
-      filter: ['all', ['has', 'RWY_BRG2'], ['case', ['<', ['zoom'], 6], ['==', ['get', 'level'], 1], true]],
+      id: 'airport-runway-cross', type: 'symbol', source: sourceId, minzoom: 2, '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'],
@@ -8069,7 +8098,7 @@ function buildLayers(themeId = 'light') {
       },
       paint: {
         "icon-color": T.airport,
-        "icon-opacity": ["interpolate", ["linear"], ["zoom"], 2, 0.75, 3, 0.95, 5, 1, 9, 1, 11, 0.2],
+        "icon-opacity": ["interpolate", ["linear"], ["zoom"], 2, 0.65, 3, 0.85, 5, 0.9, 9, 1, 11, 0.2],
       },
     },
     {
@@ -8151,11 +8180,11 @@ 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, 0.5, 12, 1, 15, 0.2],
+        "icon-opacity": ["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,
-        "text-opacity": ["interpolate", ["linear"], ["zoom"], 6, 1, 12, 0.9, 15, 0.15],
+        "text-opacity": ["interpolate", ["linear"], ["zoom"], 6.49, 0, 6.5, 1, 12, 0.9, 15, 0.15],
       },
     },
     {

package/package.json

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