aviation-chart 0.3.3 → 0.3.5

package/dist/nav-sdk.d.ts

@@ -8,6 +8,7 @@ import { Geoman } from '@geoman-io/maplibre-geoman-free';
 interface GlobalConfig {
     apiKey?: string;
     baseUrl?: string;
+    apiUrl?: string;
     version?: string;
     period?: string;
     chartConfig?: {
@@ -437,7 +438,9 @@ interface IMapSDK {
     destroy(): void;
     use(plugin: IPlugin): void;
     getPlugin<T extends IPlugin>(name: string): T | undefined;
-    setPeriod(period: string): void;
+    setPeriod(period: string, options?: {
+        validate?: boolean;
+    }): void;
     getPeriod(): string | undefined;
     generateCurrentPeriod(): Promise<string>;
     showGraticule(): void;
@@ -799,6 +802,39 @@ declare class RasterManager {
     removeRasterLayer(layerId: string, sourceId: string): void;
 }
 
+type FeatureType = "airport" | "waypoint" | "vor" | "ndb" | "airspace" | "restricted" | "controlled" | "airway";
+interface SearchParams {
+    q: string;
+    type?: FeatureType;
+    period?: string;
+    limit?: number;
+    signal?: AbortSignal;
+}
+interface SearchResultItem {
+    type: FeatureType;
+    id: string;
+    code: string;
+    name?: string;
+    name_chn?: string;
+}
+interface GeometryParams {
+    type: FeatureType;
+    id: string;
+    period?: string;
+    signal?: AbortSignal;
+}
+interface GeometryFeature {
+    type: "Feature";
+    geometry: {
+        type: "Point" | "LineString" | "Polygon" | "MultiPolygon" | "MultiLineString" | "MultiPoint";
+        coordinates: any;
+    };
+    properties: Record<string, any>;
+}
+declare function searchFeatures(baseUrl: string, apiKey: string | undefined, params: SearchParams): Promise<SearchResultItem[]>;
+declare function getFeatureGeometry(baseUrl: string, apiKey: string | undefined, params: GeometryParams): Promise<GeometryFeature>;
+declare function getPeriods(baseUrl: string, apiKey?: string, signal?: AbortSignal): Promise<string[]>;
+
 interface SelectFeatureOptions {
     isHighlight: boolean;
     highlightColor: string;
@@ -1002,9 +1038,15 @@ declare class MapSDK implements IMapSDK {
         lazyLoadingEnabled: boolean;
     };
     getErrorStats(): void;
-    setPeriod(period: string): void;
+    setPeriod(period: string, options?: {
+        validate?: boolean;
+    }): void;
+    private _applyPeriod;
     getPeriod(): string | undefined;
     generateCurrentPeriod(): Promise<string>;
+    search(params: SearchParams): Promise<SearchResultItem[]>;
+    getGeometry(params: GeometryParams): Promise<GeometryFeature>;
+    getPeriods(signal?: AbortSignal): Promise<string[]>;
     showGraticule(): void;
     hideGraticule(): void;
     toggleGraticule(): void;
@@ -3544,4 +3586,4 @@ declare function buildLayersDark(): ({
     maxzoom?: never;
 })[];
 
-export { API, MapSDK as AviationChart, BuiltInLayer, CHART_THEMES, Circle, CircleOptions, ClusteringConfig, DEFAULT_LAYER_VISIBILITY, DrawPlugin, EnhancedMarker, EnhancedPolygon, ErrorHandler, ErrorManager, EventListener, GROUP_ALIASES, GeoJSONCollection, GeoJSONFeature, GeoJSONManager, 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, StrokeLineType, StyleConfig, TYPEMAP, Text, TextOptions, WindFrame, WindManager, WindOptions, MapSDK as default, globalConfig };
+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

@@ -3259,12 +3259,6 @@ class ClickManager {
     }
 }
 
-let _api = null;
-function getApi() {
-    if (!_api)
-        _api = new API();
-    return _api;
-}
 class GlobalConfigManager {
     constructor() {
         this.config = {};
@@ -3463,11 +3457,20 @@ class GlobalConfigManager {
         return this.config.period;
     }
     async generateCurrentPeriod() {
-        const response = await getApi().getPeriodData();
-        const { data } = await response.json();
-        const period = data.filter((item) => item.valIscurrent == "1")[0]
-            .txtPeriodName;
-        return period;
+        const base = (this.config.apiUrl || "https://aips.siniswift.com").replace(/\/$/, "");
+        const headers = this.config.apiKey
+            ? { "X-Api-Key": this.config.apiKey }
+            : {};
+        const response = await fetch(`${base}/api/periods`, { headers });
+        if (!response.ok) {
+            throw new Error(`获取期数失败（${response.status}）`);
+        }
+        const { periods } = (await response.json());
+        const current = periods?.[0];
+        if (!current) {
+            throw new Error("后端未返回任何期数");
+        }
+        return current;
     }
     setMapReinitCallback(callback) {
         this.mapReinitCallback = callback;
@@ -4278,6 +4281,69 @@ class GraticuleManager {
     }
 }
 
+function authHeaders(apiKey) {
+    return apiKey ? { "X-Api-Key": apiKey } : {};
+}
+async function toJSON(res) {
+    if (!res.ok) {
+        let detail = "";
+        try {
+            detail = await res.text();
+        }
+        catch {
+        }
+        const msg = res.status === 403
+            ? "搜索接口鉴权失败（403）：请检查初始化传入的 apiKey 是否正确"
+            : `请求失败（${res.status}）${detail ? ": " + detail.trim() : ""}`;
+        throw new Error(msg);
+    }
+    return res.json();
+}
+async function searchFeatures(baseUrl, apiKey, params) {
+    const { q, type, period, limit, signal } = params;
+    if (!q || !q.trim()) {
+        throw new Error("search: q 参数必填");
+    }
+    const qs = new URLSearchParams({ q: q.trim() });
+    if (type)
+        qs.set("type", type);
+    if (period)
+        qs.set("period", period);
+    if (limit != null)
+        qs.set("limit", String(limit));
+    const res = await fetch(`${baseUrl}/api/search?${qs.toString()}`, {
+        method: "GET",
+        headers: authHeaders(apiKey),
+        ...(signal ? { signal } : {}),
+    });
+    const data = await toJSON(res);
+    return data.results ?? [];
+}
+async function getFeatureGeometry(baseUrl, apiKey, params) {
+    const { type, id, period, signal } = params;
+    if (!type || !id) {
+        throw new Error("getGeometry: type 和 id 参数必填");
+    }
+    const qs = new URLSearchParams({ type, id });
+    if (period)
+        qs.set("period", period);
+    const res = await fetch(`${baseUrl}/api/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`, {
+        method: "GET",
+        headers: authHeaders(apiKey),
+        ...(signal ? { signal } : {}),
+    });
+    const data = await toJSON(res);
+    return data.periods ?? [];
+}
+
 function identity(x) {
   return x;
 }
@@ -6541,12 +6607,32 @@ class MapSDK {
     }
     getErrorStats() {
     }
-    setPeriod(period) {
+    setPeriod(period, options) {
+        if (options?.validate) {
+            this.getPeriods()
+                .then((all) => {
+                if (!all.includes(period)) {
+                    const err = new Error(`期数 ${period} 不存在,可用期数:${all.join(", ")}`);
+                    this.map?.fire("error", { error: err });
+                    return;
+                }
+                this._applyPeriod(period);
+            })
+                .catch((e) => (void 0));
+            return;
+        }
+        this._applyPeriod(period);
+    }
+    _applyPeriod(period) {
+        const from = this.getPeriod();
         this.globalConfig.setPeriod(period);
         const navdata = this.map?.getSource("navdata");
         if (navdata?.setTiles) {
             navdata.setTiles([navdataTilesUrl(this._chartApiUrl, period)]);
         }
+        if (from !== undefined && from !== period) {
+            this.map?.fire("periodchange", { from, to: period });
+        }
     }
     getPeriod() {
         return this.globalConfig.getPeriod();
@@ -6554,6 +6640,26 @@ class MapSDK {
     async generateCurrentPeriod() {
         return await this.globalConfig.generateCurrentPeriod();
     }
+    search(params) {
+        const apiKey = this.globalConfig.getConfig().apiKey;
+        const period = params.period ?? this.getPeriod();
+        return searchFeatures(this._chartApiUrl, apiKey, {
+            ...params,
+            ...(period ? { period } : {}),
+        });
+    }
+    getGeometry(params) {
+        const apiKey = this.globalConfig.getConfig().apiKey;
+        const period = params.period ?? this.getPeriod();
+        return getFeatureGeometry(this._chartApiUrl, apiKey, {
+            ...params,
+            ...(period ? { period } : {}),
+        });
+    }
+    getPeriods(signal) {
+        const apiKey = this.globalConfig.getConfig().apiKey;
+        return getPeriods(this._chartApiUrl, apiKey, signal);
+    }
     showGraticule() {
         this.graticule?.show();
     }
@@ -6635,6 +6741,7 @@ class MapSDK {
             config.apiKey = options.apiKey;
         if (options.baseUrl)
             config.baseUrl = options.baseUrl;
+        config.apiUrl = this._chartApiUrl;
         if (options.period)
             config.period = options.period;
         globalConfig.setConfig(config);
@@ -28287,4 +28394,4 @@ var LngLat = _mlGlExports.LngLat;
 var LngLatBounds = _mlGlExports.LngLatBounds;
 var Marker = _mlGlExports.Marker;
 var Popup = _mlGlExports.Popup;
-export { API, MapSDK as AviationChart, CHART_THEMES, Circle, DEFAULT_LAYER_VISIBILITY, DrawPlugin, EnhancedMarker, EnhancedPolygon, ErrorManager, GROUP_ALIASES, GeoJSONManager, LAYER_GROUPS, LAYER_LABELS, LayerManager, LngLat, LngLatBounds, _mlGl as MapEngine, MapSDK, Marker, MeasurePlugin, NOTAM, PerformanceManager, PluginManager, Polyline, Popup, TYPEMAP, Text$1 as Text, WindManager, MapSDK as default, globalConfig };
+export { API, MapSDK as AviationChart, CHART_THEMES, Circle, DEFAULT_LAYER_VISIBILITY, DrawPlugin, EnhancedMarker, EnhancedPolygon, ErrorManager, GROUP_ALIASES, GeoJSONManager, LAYER_GROUPS, LAYER_LABELS, LayerManager, LngLat, LngLatBounds, _mlGl as MapEngine, MapSDK, Marker, MeasurePlugin, NOTAM, PerformanceManager, PluginManager, Polyline, Popup, TYPEMAP, Text$1 as Text, WindManager, MapSDK as default, getFeatureGeometry, getPeriods, globalConfig, searchFeatures };

package/package.json

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