@idm-plugin/meteo2 0.9.9 → 1.0.1

package/dist/openmeteo/src/index.d.ts

@@ -29,6 +29,7 @@ export interface OMParams {
     apikey?: string;
     fake?: boolean;
     fakes?: boolean[];
+    meta?: any;
 }
 /**
  * @see https://open-meteo.com/en/docs
@@ -44,20 +45,48 @@ export declare class MeteoHelper2 {
     private readonly SEASONAL;
     private METEO2_UPDATE;
     constructor(apikey: string, debug?: boolean);
+    /**
+     * 标准大气模式
+     */
     standardWeatherModels(): Promise<any>;
+    /**
+     * 标准海洋模式
+     */
     standardMarineModels(): Promise<any>;
+    /**
+     * 自动匹配大气模式和海洋模式
+     * @param model0
+     */
     autoPickMeteoModel(model0?: string): Promise<OMOptions>;
+    /**
+     * 生成指定范围内的数字序列
+     * @param start
+     * @param stop
+     * @param step
+     */
     static range(start: number, stop: number, step: number): number[];
     /**
      * 大气数据
      * @param params
      * @param callback
+     * @param seasonal 是否季节预报, 季节预报不调整时间区间
+     * @param climate 是否气候预报, 气候预报不调整时间区间
+     * @param historical 是否历史数据, 历史数据不调整时间区间
+     * @param options
+     */
+    weatherForecast(params: any, callback: Function | undefined, seasonal: boolean, climate: boolean, historical: boolean, options?: OMOptions): Promise<any[]>;
+    /**
+     * 尝试调用天气接口, 并解析数据
+     * @param url
+     * @param params
+     * @param callback
+     * @param fakeYear
      * @param options
+     * @private
      */
-    weatherForecast(params: any, callback: Function | undefined, options?: OMOptions): Promise<any[]>;
+    private tryToFetchWeatherApi;
     /**
      * 海洋数据
-     *
      * Data Set |	Region	|	Spatial Resolution |	Temporal Resolution	| Data Availability	| Update frequency
      * MeteoFrance MFWAM |	Global	| 0.08° (~8 km) |	3-Hourly	| October 2021 with 10 day forecast	| Every 12 hours
      * MeteoFrance SMOC Currents, Tides & SST	| Global |	0.08° (~8 km)  | 	Hourly |	January 2022 with 10 day | forecast	Every 24 hours
@@ -73,9 +102,35 @@ export declare class MeteoHelper2 {
      */
     marineForecast(params: any, options?: OMOptions): Promise<any[]>;
     /**
-     * 解析请求数据
+     * 尝试调用海洋接口
+     * @param url
+     * @param params
+     * @param options
+     * @private
+     */
+    private tryToFetchMarineApi;
+    /**
+     * 检查时间区间, 并调整为合理范围(不超时90天)
+     * @param startDate
+     * @param endDate
+     * @param adjustable 是否季节预报, 季节预报不调整时间区间
+     * @param options
+     * @private
+     */
+    private checkTimeInterval;
+    /**
+     * 从消息中提取时间区间, 并调整为合理范围
+     * @param message
+     * @param interval
+     * @param options
+     * @private
+     */
+    private matchDateRange;
+    /**
+     * 解析天气数据
      * @param rsps
      * @param params
+     * @param fakeYear 对应用前一年数据的预报进行时间调整
      * @param options
      * @private
      */
@@ -88,21 +143,49 @@ export declare class MeteoHelper2 {
      */
     private parseSeasonalDailyVariable;
     private mergeSegments;
+    /**
+     * 合并天气数据, 以IFS025为主, 并用IFS的能见度数据补全IFS025
+     * @param rows
+     * @private
+     */
     private mergeWeatherData;
+    /**
+     * 合并海洋数据, 以best_match为主, 并用meteofrance_currents的海流数据补全其他模型, 用ecmwf_wam的波浪数据补全meteofrance_wave, 用meteofrance_wave的波浪数据补全ecmwf_wam, 并对齐时间
+     * @param rows
+     * @param st
+     * @private
+     */
     private mergeMarineData;
+    /**
+     * 选择预报地址
+     * @param marine 是否为海洋预报
+     * @param selfHosted 是否自建服务，默认为true
+     * @param historical 是否为历史数据，默认为false，如果为true，则会使用历史数据接口
+     * @param options
+     * @private
+     */
     private pickForecastUrl;
+    /**
+     * 选择天气模型, 如果没有指定模型，则使用best_match，如果指定了模型，则按照优先级排序，并去重，确保ecmwf_ifs025和ecmwf_ifs同时存在
+     * @param models
+     * @private
+     */
     private pickWeatherModels;
+    /**
+     * 选择海洋模型, 如果没有指定模型，则使用best_match，如果指定了模型，则按照优先级排序，并去重，确保meteofrance_currents和ecmwf_wam025同时存在
+     * @param models
+     * @private
+     */
     private pickMarineModels;
     /**
-     * 完善start_hour/end_hour 或者是forecast_days变量,二选一
-     * @param datetime 从指定时间开始，不指定时从当前时间开始
-     * @param marine 是否为海洋预报
-     * @param params 要查询的要素
-     * @param options 请求参数
+     * 构建公共参数
+     * @param datetime 指定预报开始时间，格式为ISO 8601字符串，例如"2024-01-01T00:00:00Z"，不指定时从当前时间开始
+     * @param params
+     * @param options
      * @private
      */
     private prepare;
-    private toStdLng;
+    static toStdLng(lng: number, precision?: number): number;
     private timezoneOffset;
     /**
      * 格式化时区
@@ -161,13 +244,20 @@ export declare class MeteoHelper2 {
      * @param lng
      * @param startDate
      * @param endDate
+     * @param withDaily
+     * @param withHourly
      * @param withMarine
      * @param options
      */
-    spotHistorical(lat: number, lng: number, startDate: string, endDate: string, withDaily?: boolean, withHourly?: boolean, withMarine?: boolean, options?: OMOptions): Promise<{
-        weather: any[];
-        marine: any[] | undefined;
-    }>;
+    spotHistorical(lat: number, lng: number, startDate: string, endDate: string, withDaily?: boolean, withHourly?: boolean, withMarine?: boolean, options?: OMOptions): Promise<any>;
+    /**
+     * Fetch historical data for a single date range
+     */
+    private _fetchHistoricalData;
+    /**
+     * Merge multiple historical data chunks
+     */
+    private _mergeHistoricalResults;
     /**
      * 季节预报数据
      * 提供未来45天~9个月的预报数据
@@ -203,9 +293,24 @@ export declare class MeteoHelper2 {
      * @param endDate
      * @param options
      */
-    spotClimate(lat: number, lng: number, startDate: string, endDate: string | undefined, options?: OMOptions): Promise<{
-        weather: any[];
-    }>;
+    spotClimate(lat: number, lng: number, startDate: string, endDate: string | undefined, options?: OMOptions): Promise<any>;
+    /**
+     * Fetch climate data for a single date range
+     */
+    private _fetchClimateData;
+    /**
+     * Merge multiple climate data chunks
+     */
+    private _mergeClimateResults;
+    /**
+     * 更新模型信息，获取最新的模型更新时间和可用性等信息，避免使用过期的数据
+     * @param options
+     */
     update(options?: OMOptions): Promise<any>;
+    /**
+     * 选择需要更新的模型，按照更新时间排序，返回模型和更新时间等信息
+     * @param model
+     * @param options
+     */
     pickUpdateMeta(model: string | string[], options?: OMOptions): Promise<any[]>;
 }

package/dist/openmeteo/src/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/read/src/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tropicals/src/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/worldtides/src/index.d.ts

@@ -13,7 +13,6 @@ export declare class TidesHelper {
     private readonly apikey;
     private readonly debug;
     constructor(apikey: string, debug?: boolean);
-    private toStdLng;
     /**
      * 潮汐预报数据
      * @param lat

package/dist/worldtides/src/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@idm-plugin/meteo2",
   "private": false,
-  "version": "0.9.9",
+  "version": "1.0.1",
   "description": "idm plugin for meteo2(open meteo)",
   "type": "module",
   "keywords": [
@@ -39,12 +39,13 @@
   },
   "peerDependencies": {
     "@idm-plugin/geo2": "^1.4.7",
-    "@idm-plugin/meteo": "^0.6.7",
-    "@idm-plugin/tag": "^0.2.3"
+    "@idm-plugin/meteo": "^0.7.1",
+    "@idm-plugin/tag": "^0.2.3",
+    "openmeteo": "^1.2.3"
   },
   "devDependencies": {
     "@idm-plugin/geo2": "^1.4.7",
-    "@idm-plugin/meteo": "^0.6.7",
+    "@idm-plugin/meteo": "^0.7.2",
     "@idm-plugin/tag": "^0.2.3",
     "@types/jest": "^25.2.2",
     "@types/node": "^18.14.2",
@@ -70,7 +71,7 @@
     "tsconfig-paths": "^3.12.0",
     "typescript": "^4.9.3",
     "vite": "^4.1.0",
-    "vite-plugin-dts": "^2.0.2",
+    "vite-plugin-dts": "^4.5.4",
     "vite-plugin-static-copy": "^0.17.0"
   },
   "lint-staged": {