aviation-chart 0.3.26 → 2.0.2

package/README.md

@@ -1,170 +1 @@
-# Kunyu Aviation Chart SDK
-
-A high-performance aviation chart SDK providing complete aeronautical data visualization: FIR/UIR, controlled and restricted airspace, airways, navaids (VOR/NDB), airports and runways, AMM, and terrain — plus business features such as NOTAM, ADS-B, and weather radar. Built with a modular architecture supporting plugins, performance optimization, and unified error handling.
-
-## ✨ Features
-
-- **Aviation data stack**: FIR, controlled/restricted airspace, airways, VOR/NDB, airport runways, AMM, terrain/contours — published per AIRAC period
-- **Theme switching**: in-place light/dark recoloring that never covers your overlay layers
-- **Business modules**: NOTAM, ADS-B, weather radar, raster layers
-- **Performance**: LOD (level-of-detail), lazy layer loading, massive-point clustering, low-zoom style simplification
-- **Plugin system**: unified plugin interface with a built-in measurement plugin
-- **Unified error handling**: centralized error management, fallback strategies, error statistics
-
-## 🚀 Getting Started
-
-### Option 1: CDN script (global `navMap`)
-
-```html
-<!-- latest -->
-<script src="https://aips.siniswift.com/sdk/nav-sdk.min.js"></script>
-<!-- or pin a version -->
-<!-- <script src="https://aips.siniswift.com/sdk/nav-sdk@0.2.0.min.js"></script> -->
-
-<div id="map" style="width:100%;height:600px;"></div>
-
-<script>
-  const sdk = new navMap.MapSDK({
-    container: 'map',
-    center: [116.3974, 39.9093],
-    zoom: 4,
-    theme: 'light',        // 'light' | 'dark'
-    period: '202606',      // AIRAC period; auto-computed if omitted
-  });
-</script>
-```
-
-> The underlying map engine is bundled into `nav-sdk.min.js` — no extra script needed.
-
-### Option 2: npm
-
-```bash
-npm install aviation-chart
-```
-
-```javascript
-import { MapSDK, MeasurePlugin } from 'aviation-chart';
-
-const sdk = new MapSDK({
-  container: 'map',
-  center: [116.3974, 39.9093],
-  zoom: 4,
-  performance: { lodEnabled: true, clusteringEnabled: true, lazyLoadingEnabled: true },
-});
-```
-
-## 📚 API Overview
-
-### Initialization options
-
-| Option | Description |
-|---|---|
-| `container` | Container id or element (required) |
-| `center` / `zoom` | Initial center and zoom |
-| `theme` | `'light'` / `'dark'` |
-| `period` | AIRAC period `YYYYMM` |
-| `apiUrl` | Chart data service URL, default `https://aips.siniswift.com` |
-| `layers` | Initial layer visibility, e.g. `{ airspace: true, controlled: false, terrain: false }` |
-| `performance` | `{ lodEnabled, clusteringEnabled, lazyLoadingEnabled }` |
-| `errorHandler` | Custom error handler function |
-
-### Layer control
-
-Layer groups: `airspace` (FIR), `airline` (airways), `controlled`, `restricted`, `vor`, `ndb`, `airport`, `runway`, `adiz`, `waypointOffAirway`, `amm`, `terrain`, `contour`, `background`, `landLayer`, `boundary`.
-
-```javascript
-// Two equivalent APIs
-sdk.setLayerVisible('airspace', true);
-sdk.addBuiltInLayer('controlled');
-sdk.toggleBuiltInLayer('airline');
-sdk.removeBuiltInLayer('restricted');
-
-// Theme and period
-sdk.setTheme('dark');
-sdk.setPeriod('202609');
-
-// LOD
-sdk.layerManager.setLODEnabled(true);
-```
-
-### Feature drawing (GeoJSON)
-
-```javascript
-sdk.addPoint([lng, lat], properties, style);
-sdk.addLine(coordinates, properties, style);
-sdk.addPolygon(coordinates, properties, style);
-
-// Cluster massive point sets
-sdk.geoJSONManager.setClusteringEnabled(true);
-```
-
-### Business features
-
-```javascript
-sdk.notam.open(true);          // NOTAM
-sdk.adsb.open();               // ADS-B
-sdk.api.getRadarData();        // weather radar data
-```
-
-### Popup
-
-```javascript
-const popup = new navMap.Popup()
-  .setLngLat([lng, lat])
-  .setHTML('<h3>Title</h3>')
-  .addTo(sdk.map);
-```
-
-### Plugins
-
-```javascript
-const measure = new navMap.MeasurePlugin();
-sdk.use(measure);
-measure.enable('distance');    // 'distance' | 'area'
-measure.disable();
-
-const plugin = sdk.getPlugin('measure');
-```
-
-### Underlying engine passthrough
-
-The SDK passes through the full underlying map-engine API — call methods directly on the instance, or access the raw instance via `sdk.map`:
-
-```javascript
-sdk.flyTo({ center: [lng, lat], zoom: 8 });
-sdk.setPaintProperty('airline', 'line-color', '#0057c8');
-sdk.queryRenderedFeatures([x, y]);
-
-const map = sdk.map;  // raw map instance
-```
-
-### Error & performance
-
-```javascript
-const sdk = new navMap.MapSDK({
-  container: 'map',
-  errorHandler: (error) => console.error(error.code, error.details),
-});
-
-sdk.getErrorStats();        // error statistics
-sdk.getPerformanceStats();  // performance statistics
-```
-
-## 🔧 Writing a Plugin
-
-```javascript
-export class MyPlugin {
-  name = 'my-plugin';
-  version = '1.0.0';
-  install(sdk) { /* install logic */ }
-  uninstall(sdk) { /* uninstall logic */ }
-}
-
-const plugin = new MyPlugin();
-sdk.use(plugin);
-sdk.pluginManager.hasPlugin('my-plugin');
-```
-
-## 📄 License
-
-MIT License
+ ## Kunyu

package/dist/nav-sdk.d.ts

@@ -20,7 +20,7 @@ interface GlobalConfig {
         defaultZoom?: number;
     };
     styleConfig?: {
-        theme?: "light" | "dark";
+        theme?: string;
         language?: "zh-CN" | "en-US";
     };
     periodConfig?: {
@@ -424,7 +424,7 @@ interface IMapSDK {
     setMapStyle(style: string | StyleSpecification, options?: {
         diff?: boolean;
     }): Promise<void>;
-    setTheme(theme: "light" | "dark"): void;
+    setTheme(theme: string): void;
     addPoint(coordinates: [number, number], properties?: Record<string, any>, style?: StyleConfig): string;
     addLine(coordinates: [number, number][], properties?: Record<string, any>, style?: StyleConfig): string;
     addPolygon(coordinates: [number, number][][], properties?: Record<string, any>, style?: StyleConfig): string;
@@ -541,7 +541,7 @@ interface MapSDKOptions {
     enableAIP?: boolean;
     enableNOTAM?: boolean;
     enableADSB?: boolean;
-    theme?: 'light' | 'dark';
+    theme?: string;
     language?: 'zh-CN' | 'en-US';
     switchDay?: number;
     graticule?: {
@@ -1005,7 +1005,8 @@ declare class MapSDK implements IMapSDK {
     setMapStyle(style: string | StyleSpecification, options?: {
         diff?: boolean;
     }): Promise<void>;
-    setTheme(theme: "light" | "dark"): void;
+    setTheme(theme: string): void;
+    private _resolveThemeId;
     private _themeLayerDefs;
     private _applyThemedProps;
     restoreLandLayer(): void;
@@ -1262,6 +1263,22 @@ declare namespace CHART_THEMES {
         let background_1: string;
         export { background_1 as background };
     }
+    namespace dusk {
+        let id_2: string;
+        export { id_2 as id };
+        let label_2: string;
+        export { label_2 as label };
+        let background_2: string;
+        export { background_2 as background };
+    }
+    namespace foreflight {
+        let id_3: string;
+        export { id_3 as id };
+        let label_3: string;
+        export { label_3 as label };
+        let background_3: string;
+        export { background_3 as background };
+    }
 }
 declare namespace LAYER_GROUPS {
     export let adiz: string[];
@@ -1276,8 +1293,6 @@ declare namespace LAYER_GROUPS {
     export { ndb_1 as ndb };
     let airport_1: string[];
     export { airport_1 as airport };
-    let runway_1: string[];
-    export { runway_1 as runway };
 }
 declare namespace LAYER_LABELS {
     let adiz_1: string;
@@ -1298,8 +1313,6 @@ declare namespace LAYER_LABELS {
     export { ndb_2 as ndb };
     let airport_2: string;
     export { airport_2 as airport };
-    let runway_2: string;
-    export { runway_2 as runway };
 }
 
 export { API, MapSDK as AviationChart, BuiltInLayer, CHART_THEMES, Circle, CircleOptions, ClusteringConfig, DEFAULT_LAYER_VISIBILITY, DrawPlugin, EnhancedMarker, EnhancedPolygon, ErrorHandler, ErrorManager, EventListener, FeatureType, GROUP_ALIASES, GeoJSONCollection, GeoJSONFeature, GeoJSONManager, GeometryFeature, GeometryParams, GlobalConfigManager, HookCallback, HookContext, HookRegistry, IGeoJSONManager, ILayerManager, IMapSDK, IPlugin, LAYER_GROUPS, LAYER_LABELS, LODConfig, LayerConfig, LayerManager, LineType, MapEvent, MapSDK, MapSDKOptions, MarkerOptions, MeasurePlugin, NOTAM, PerformanceManager, PluginManager, PolygonOptions, Polyline, PolylineOptions, SDKError, SearchParams, SearchResultItem, StrokeLineType, StyleConfig, TYPEMAP, Text, TextOptions, WindFrame, WindManager, WindOptions, MapSDK as default, getFeatureGeometry, getPeriods, globalConfig, searchFeatures };

package/dist/nav-sdk.esm.js

@@ -1980,8 +1980,7 @@ const TYPEMAP = {
     restricted: ["restrictedLayer", "restrictedLayer_stroke", "restricted_line_label"],
     vor: ["vor_icon", "vor_icon_dial", "vor_label"],
     ndb: ["ndb_icon"],
-    airport: ["airport"],
-    runway: ["runway-line", "runway-line-amm", "runway-label"],
+    airport: ["airport", "airport-runway", "airport-runway-cross"],
     adiz: ["adiz-line", "adiz-label"],
     waypointOffAirway: ["waypoint-off-airway-symbol"],
     amm: getChartAMMLayerIds(),
@@ -1999,7 +1998,6 @@ const DEFAULT_LAYER_VISIBILITY = {
     vor: true,
     ndb: true,
     airport: true,
-    runway: false,
     adiz: false,
     waypointOffAirway: false,
     amm: true,
@@ -7428,6 +7426,7 @@ function getAviationBaseStyle(opts) {
             { id: "default", url: `${spriteBase}/sprites/sprite` },
             { id: "v2", url: `${spriteBase}/sprites/sprite-v2` },
             { id: "vor", url: `${spriteBase}/sprites/sprite-vor` },
+            { id: "runway", url: `${spriteBase}/sprites/sprite-runway` },
         ],
         sources: {
             land: { type: "geojson", data: { type: "FeatureCollection", features: [] } },
@@ -7600,6 +7599,11 @@ async function fetchGzJson(url, headers = {}) {
 //
 // 加主题 = 在 THEME_TOKENS 增加一张 token 表；不再复制整份 build 函数，
 // 彻底消除 light/dark 漂移（历史上 dark 航线消失、6,6 插值等 bug 均源于此）。
+//
+// 本次新增两套主题：
+//   dusk    暮光模式 —— 晨昏蒙影时段过渡用，中等亮度，避免日/夜切换的瞳孔冲击
+//   redNight 红光夜视模式 —— 驾驶舱标准红光照明，全色系统一为红色，
+//            靠明度而非色相区分要素，保护夜间暗适应（视杆细胞）
 
 /**
  * 主题 token 表。每个 key 是一个"随主题变化"的值，值可以是颜色字符串、
@@ -7676,6 +7680,81 @@ const THEME_TOKENS = {
     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 buildLayers(themeId = 'light') {
@@ -7853,36 +7932,42 @@ function buildLayers(themeId = 'light') {
         "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: 'runway-line', type: 'line', source: sourceId, 'source-layer': 'runway',
-      filter: ['!', ['has', 'has_amm']], minzoom: 4, maxzoom: 11,
-      paint: {
-        'line-color': T.runway,
-        'line-width': ['interpolate', ['linear'], ['zoom'], 4, 1, 13, 10],
+      id: 'airport-runway', type: 'symbol', source: sourceId, minzoom: 2, 'source-layer': 'airport',
+      filter: ['all', ['has', 'RWY_BRG1'], ['case', ['<', ['zoom'], 6], ['==', ['get', 'level'], 1], true]],
+      layout: {
+        'icon-image': 'runway:runway-strip',
+        'icon-rotate': ['get', 'RWY_BRG1'],
+        'icon-rotation-alignment': 'map',
+        'icon-size': ['interpolate', ['linear'], ['zoom'], 5, 0.6, 9, 1.2, 12, 1.3],
+        'icon-allow-overlap': true,
+        'icon-ignore-placement': true,
+        'visibility': 'none',
       },
-    },
-    {
-      id: 'runway-line-amm', type: 'line', source: sourceId, 'source-layer': 'runway',
-      filter: ['has', 'has_amm'], minzoom: 4, maxzoom: 11,
       paint: {
-        'line-color': T.runway,
-        'line-width': ['interpolate', ['linear'], ['zoom'], 4, 1, 10, 4],
-        'line-opacity': ['interpolate', ['linear'], ['zoom'], 10.5, 1, 11, 0],
+        'icon-opacity': ['interpolate', ['linear'], ['zoom'], 5, 0.6, 9, 1, 12, 1],
       },
     },
     {
-      id: 'runway-label', type: 'symbol', source: sourceId, 'source-layer': 'runway', minzoom: 10,
+      id: 'airport-runway-cross', type: 'symbol', source: sourceId, minzoom: 2, 'source-layer': 'airport',
+      filter: ['all', ['has', 'RWY_BRG2'], ['case', ['<', ['zoom'], 6], ['==', ['get', 'level'], 1], true]],
       layout: {
-        'text-field': ['concat', ['to-string', ['get', 'VAL_LEN']], '×', ['to-string', ['get', 'VAL_WID']], 'm'],
-        'text-size': 10,
-        'symbol-placement': 'line-center',
-        'text-rotation-alignment': 'map',
-        'text-optional': true,
+        'icon-image': 'runway:runway-strip',
+        'icon-rotate': ['get', 'RWY_BRG2'],
+        'icon-rotation-alignment': 'map',
+        'icon-size': ['interpolate', ['linear'], ['zoom'], 5, 0.6, 9, 1.2, 12, 1.3],
+        'icon-allow-overlap': true,
+        'icon-ignore-placement': true,
+        'visibility': 'none',
       },
       paint: {
-        'text-color': T.runway,
-        ...T.runwayHalo,
-        'text-opacity': ['interpolate', ['linear'], ['zoom'], 10.5, 1, 11, 0],
+        'icon-opacity': ['interpolate', ['linear'], ['zoom'], 5, 0.6, 9, 1, 12, 1],
       },
     },
     {
@@ -7988,6 +8073,8 @@ function buildLayers(themeId = 'light') {
 const CHART_THEMES = {
   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' },
 };
 
 // ── Layer groups & labels (theme-independent) ────────────────────────────────
@@ -8000,8 +8087,7 @@ const LAYER_GROUPS = {
   waypointOffAirway: ['waypoint-off-airway-symbol'],
   vor: ['vor_icon_dial', 'vor_label', 'vor_icon'],
   ndb: ['ndb_icon'],
-  airport: ['airport'],
-  runway: ['runway-line', 'runway-line-amm', 'runway-label'],
+  airport: ['airport', 'airport-runway', 'airport-runway-cross'],
 };
 
 const LAYER_LABELS = {
@@ -8014,7 +8100,6 @@ const LAYER_LABELS = {
   vor: 'VOR',
   ndb: 'NDB',
   airport: '机场',
-  runway: '跑道',
 };
 
 class WindManager {
@@ -8098,7 +8183,7 @@ class MapSDK {
         this._baseUrl = options.staticUrl || "https://aips.siniswift.com";
         this._chartApiUrl = (options.apiUrl || DEFAULT_CHART_API_URL).replace(/\/$/, "");
         this._apiVersion = options.apiVersion || undefined;
-        const themeId = options.theme === "dark" ? "dark" : "light";
+        const themeId = this._resolveThemeId(options.theme);
         const themeConfig = CHART_THEMES[themeId] ?? CHART_THEMES.light;
         const style = options.style ??
             getAviationBaseStyle({
@@ -8254,7 +8339,7 @@ class MapSDK {
         if (!this.map.getSource("navdata")) {
             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;
@@ -8395,8 +8480,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", {
@@ -8412,6 +8497,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 = {

package/package.json

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