From 43d18c52b70c89a7932cb2283c9965a551b30b0d Mon Sep 17 00:00:00 2001 From: patrick-zippenfenig Date: Wed, 3 Jul 2024 10:13:42 +0200 Subject: [PATCH] fix: seamless domains for knmi, dmi and metno --- csharp/openmeteo_sdk/Model.cs | 9 ++++++--- csharp/openmeteo_sdk/Variable.cs | 1 - flatbuffers/weather_api.fbs | 8 +++++--- java/com/openmeteo/sdk/Model.java | 11 +++++++---- java/com/openmeteo/sdk/Variable.java | 3 +-- kotlin/com/openmeteo/sdk/Model.kt | 9 ++++++--- kotlin/com/openmeteo/sdk/Variable.kt | 1 - python/openmeteo_sdk/Model.py | 9 ++++++--- python/openmeteo_sdk/Variable.py | 1 - .../OpenMeteoSdk/weather_api_generated.swift | 16 +++++++++------- ts/model.ts | 9 ++++++--- ts/variable.ts | 3 +-- 12 files changed, 47 insertions(+), 33 deletions(-) diff --git a/csharp/openmeteo_sdk/Model.cs b/csharp/openmeteo_sdk/Model.cs index 71d1704..780e90b 100644 --- a/csharp/openmeteo_sdk/Model.cs +++ b/csharp/openmeteo_sdk/Model.cs @@ -77,9 +77,12 @@ public enum Model : byte ecmwf_wam025_ensemble = 67, ncep_gfswave025 = 68, ncep_gefswave025 = 69, - knmi_harmonie_arome_europe = 70, - knmi_harmonie_arome_netherlands = 71, - dmi_harmonie_arome_europe = 72, + knmi_seamless = 70, + knmi_harmonie_arome_europe = 71, + knmi_harmonie_arome_netherlands = 72, + dmi_seamless = 73, + dmi_harmonie_arome_europe = 74, + metno_seamless = 75, }; diff --git a/csharp/openmeteo_sdk/Variable.cs b/csharp/openmeteo_sdk/Variable.cs index e2973a6..6781773 100644 --- a/csharp/openmeteo_sdk/Variable.cs +++ b/csharp/openmeteo_sdk/Variable.cs @@ -117,7 +117,6 @@ public enum Variable : byte global_tilted_irradiance_instant = 107, ocean_current_velocity = 108, ocean_current_direction = 109, - cloud_cover_2m = 110, }; diff --git a/flatbuffers/weather_api.fbs b/flatbuffers/weather_api.fbs index a3f9dd6..5e80bf3 100644 --- a/flatbuffers/weather_api.fbs +++ b/flatbuffers/weather_api.fbs @@ -123,9 +123,12 @@ enum Model: ubyte { ecmwf_wam025_ensemble, ncep_gfswave025, ncep_gefswave025, + knmi_seamless, knmi_harmonie_arome_europe, knmi_harmonie_arome_netherlands, - dmi_harmonie_arome_europe + dmi_seamless, + dmi_harmonie_arome_europe, + metno_seamless } enum Variable: ubyte { @@ -238,8 +241,7 @@ enum Variable: ubyte { global_tilted_irradiance, global_tilted_irradiance_instant, ocean_current_velocity, - ocean_current_direction, - cloud_cover_2m + ocean_current_direction } enum Aggregation: ubyte { diff --git a/java/com/openmeteo/sdk/Model.java b/java/com/openmeteo/sdk/Model.java index 34eae1e..71f84a1 100644 --- a/java/com/openmeteo/sdk/Model.java +++ b/java/com/openmeteo/sdk/Model.java @@ -75,11 +75,14 @@ private Model() { } public static final int ecmwf_wam025_ensemble = 67; public static final int ncep_gfswave025 = 68; public static final int ncep_gefswave025 = 69; - public static final int knmi_harmonie_arome_europe = 70; - public static final int knmi_harmonie_arome_netherlands = 71; - public static final int dmi_harmonie_arome_europe = 72; + public static final int knmi_seamless = 70; + public static final int knmi_harmonie_arome_europe = 71; + public static final int knmi_harmonie_arome_netherlands = 72; + public static final int dmi_seamless = 73; + public static final int dmi_harmonie_arome_europe = 74; + public static final int metno_seamless = 75; - public static final String[] names = { "undefined", "best_match", "gfs_seamless", "gfs_global", "gfs_hrrr", "meteofrance_seamless", "meteofrance_arpege_seamless", "meteofrance_arpege_world", "meteofrance_arpege_europe", "meteofrance_arome_seamless", "meteofrance_arome_france", "meteofrance_arome_france_hd", "jma_seamless", "jma_msm", "jms_gsm", "jma_gsm", "gem_seamless", "gem_global", "gem_regional", "gem_hrdps_continental", "icon_seamless", "icon_global", "icon_eu", "icon_d2", "ecmwf_ifs04", "metno_nordic", "era5_seamless", "era5", "cerra", "era5_land", "ecmwf_ifs", "gwam", "ewam", "glofas_seamless_v3", "glofas_forecast_v3", "glofas_consolidated_v3", "glofas_seamless_v4", "glofas_forecast_v4", "glofas_consolidated_v4", "gfs025", "gfs05", "CMCC_CM2_VHR4", "FGOALS_f3_H_highresSST", "FGOALS_f3_H", "HiRAM_SIT_HR", "MRI_AGCM3_2_S", "EC_Earth3P_HR", "MPI_ESM1_2_XR", "NICAM16_8S", "cams_europe", "cams_global", "cfsv2", "era5_ocean", "cma_grapes_global", "bom_access_global", "bom_access_global_ensemble", "arpae_cosmo_seamless", "arpae_cosmo_2i", "arpae_cosmo_2i_ruc", "arpae_cosmo_5m", "ecmwf_ifs025", "ecmwf_aifs025", "gfs013", "gfs_graphcast025", "ecmwf_wam025", "meteofrance_wave", "meteofrance_currents", "ecmwf_wam025_ensemble", "ncep_gfswave025", "ncep_gefswave025", "knmi_harmonie_arome_europe", "knmi_harmonie_arome_netherlands", "dmi_harmonie_arome_europe", }; + public static final String[] names = { "undefined", "best_match", "gfs_seamless", "gfs_global", "gfs_hrrr", "meteofrance_seamless", "meteofrance_arpege_seamless", "meteofrance_arpege_world", "meteofrance_arpege_europe", "meteofrance_arome_seamless", "meteofrance_arome_france", "meteofrance_arome_france_hd", "jma_seamless", "jma_msm", "jms_gsm", "jma_gsm", "gem_seamless", "gem_global", "gem_regional", "gem_hrdps_continental", "icon_seamless", "icon_global", "icon_eu", "icon_d2", "ecmwf_ifs04", "metno_nordic", "era5_seamless", "era5", "cerra", "era5_land", "ecmwf_ifs", "gwam", "ewam", "glofas_seamless_v3", "glofas_forecast_v3", "glofas_consolidated_v3", "glofas_seamless_v4", "glofas_forecast_v4", "glofas_consolidated_v4", "gfs025", "gfs05", "CMCC_CM2_VHR4", "FGOALS_f3_H_highresSST", "FGOALS_f3_H", "HiRAM_SIT_HR", "MRI_AGCM3_2_S", "EC_Earth3P_HR", "MPI_ESM1_2_XR", "NICAM16_8S", "cams_europe", "cams_global", "cfsv2", "era5_ocean", "cma_grapes_global", "bom_access_global", "bom_access_global_ensemble", "arpae_cosmo_seamless", "arpae_cosmo_2i", "arpae_cosmo_2i_ruc", "arpae_cosmo_5m", "ecmwf_ifs025", "ecmwf_aifs025", "gfs013", "gfs_graphcast025", "ecmwf_wam025", "meteofrance_wave", "meteofrance_currents", "ecmwf_wam025_ensemble", "ncep_gfswave025", "ncep_gefswave025", "knmi_seamless", "knmi_harmonie_arome_europe", "knmi_harmonie_arome_netherlands", "dmi_seamless", "dmi_harmonie_arome_europe", "metno_seamless", }; public static String name(int e) { return names[e]; } } diff --git a/java/com/openmeteo/sdk/Variable.java b/java/com/openmeteo/sdk/Variable.java index e514159..aece62b 100644 --- a/java/com/openmeteo/sdk/Variable.java +++ b/java/com/openmeteo/sdk/Variable.java @@ -115,9 +115,8 @@ private Variable() { } public static final int global_tilted_irradiance_instant = 107; public static final int ocean_current_velocity = 108; public static final int ocean_current_direction = 109; - public static final int cloud_cover_2m = 110; - public static final String[] names = { "undefined", "apparent_temperature", "cape", "cloud_cover", "cloud_cover_high", "cloud_cover_low", "cloud_cover_mid", "daylight_duration", "dew_point", "diffuse_radiation", "diffuse_radiation_instant", "direct_normal_irradiance", "direct_normal_irradiance_instant", "direct_radiation", "direct_radiation_instant", "et0_fao_evapotranspiration", "evapotranspiration", "freezing_level_height", "growing_degree_days", "is_day", "latent_heat_flux", "leaf_wetness_probability", "lifted_index", "lightning_potential", "precipitation", "precipitation_hours", "precipitation_probability", "pressure_msl", "rain", "relative_humidity", "runoff", "sensible_heat_flux", "shortwave_radiation", "shortwave_radiation_instant", "showers", "snow_depth", "snow_height", "snowfall", "snowfall_height", "snowfall_water_equivalent", "sunrise", "sunset", "soil_moisture", "soil_moisture_index", "soil_temperature", "surface_pressure", "surface_temperature", "temperature", "terrestrial_radiation", "terrestrial_radiation_instant", "total_column_integrated_water_vapour", "updraft", "uv_index", "uv_index_clear_sky", "vapour_pressure_deficit", "visibility", "weather_code", "wind_direction", "wind_gusts", "wind_speed", "vertical_velocity", "geopotential_height", "wet_bulb_temperature", "river_discharge", "wave_height", "wave_period", "wave_direction", "wind_wave_height", "wind_wave_period", "wind_wave_peak_period", "wind_wave_direction", "swell_wave_height", "swell_wave_period", "swell_wave_peak_period", "swell_wave_direction", "pm10", "pm2p5", "dust", "aerosol_optical_depth", "carbon_monoxide", "nitrogen_dioxide", "ammonia", "ozone", "sulphur_dioxide", "alder_pollen", "birch_pollen", "grass_pollen", "mugwort_pollen", "olive_pollen", "ragweed_pollen", "european_aqi", "european_aqi_pm2p5", "european_aqi_pm10", "european_aqi_nitrogen_dioxide", "european_aqi_ozone", "european_aqi_sulphur_dioxide", "us_aqi", "us_aqi_pm2p5", "us_aqi_pm10", "us_aqi_nitrogen_dioxide", "us_aqi_ozone", "us_aqi_sulphur_dioxide", "us_aqi_carbon_monoxide", "sunshine_duration", "convective_inhibition", "shortwave_radiation_clear_sky", "global_tilted_irradiance", "global_tilted_irradiance_instant", "ocean_current_velocity", "ocean_current_direction", "cloud_cover_2m", }; + public static final String[] names = { "undefined", "apparent_temperature", "cape", "cloud_cover", "cloud_cover_high", "cloud_cover_low", "cloud_cover_mid", "daylight_duration", "dew_point", "diffuse_radiation", "diffuse_radiation_instant", "direct_normal_irradiance", "direct_normal_irradiance_instant", "direct_radiation", "direct_radiation_instant", "et0_fao_evapotranspiration", "evapotranspiration", "freezing_level_height", "growing_degree_days", "is_day", "latent_heat_flux", "leaf_wetness_probability", "lifted_index", "lightning_potential", "precipitation", "precipitation_hours", "precipitation_probability", "pressure_msl", "rain", "relative_humidity", "runoff", "sensible_heat_flux", "shortwave_radiation", "shortwave_radiation_instant", "showers", "snow_depth", "snow_height", "snowfall", "snowfall_height", "snowfall_water_equivalent", "sunrise", "sunset", "soil_moisture", "soil_moisture_index", "soil_temperature", "surface_pressure", "surface_temperature", "temperature", "terrestrial_radiation", "terrestrial_radiation_instant", "total_column_integrated_water_vapour", "updraft", "uv_index", "uv_index_clear_sky", "vapour_pressure_deficit", "visibility", "weather_code", "wind_direction", "wind_gusts", "wind_speed", "vertical_velocity", "geopotential_height", "wet_bulb_temperature", "river_discharge", "wave_height", "wave_period", "wave_direction", "wind_wave_height", "wind_wave_period", "wind_wave_peak_period", "wind_wave_direction", "swell_wave_height", "swell_wave_period", "swell_wave_peak_period", "swell_wave_direction", "pm10", "pm2p5", "dust", "aerosol_optical_depth", "carbon_monoxide", "nitrogen_dioxide", "ammonia", "ozone", "sulphur_dioxide", "alder_pollen", "birch_pollen", "grass_pollen", "mugwort_pollen", "olive_pollen", "ragweed_pollen", "european_aqi", "european_aqi_pm2p5", "european_aqi_pm10", "european_aqi_nitrogen_dioxide", "european_aqi_ozone", "european_aqi_sulphur_dioxide", "us_aqi", "us_aqi_pm2p5", "us_aqi_pm10", "us_aqi_nitrogen_dioxide", "us_aqi_ozone", "us_aqi_sulphur_dioxide", "us_aqi_carbon_monoxide", "sunshine_duration", "convective_inhibition", "shortwave_radiation_clear_sky", "global_tilted_irradiance", "global_tilted_irradiance_instant", "ocean_current_velocity", "ocean_current_direction", }; public static String name(int e) { return names[e]; } } diff --git a/kotlin/com/openmeteo/sdk/Model.kt b/kotlin/com/openmeteo/sdk/Model.kt index a5d6e7f..5431862 100644 --- a/kotlin/com/openmeteo/sdk/Model.kt +++ b/kotlin/com/openmeteo/sdk/Model.kt @@ -75,8 +75,11 @@ class Model private constructor() { const val ecmwf_wam025_ensemble: UByte = 67u const val ncep_gfswave025: UByte = 68u const val ncep_gefswave025: UByte = 69u - const val knmi_harmonie_arome_europe: UByte = 70u - const val knmi_harmonie_arome_netherlands: UByte = 71u - const val dmi_harmonie_arome_europe: UByte = 72u + const val knmi_seamless: UByte = 70u + const val knmi_harmonie_arome_europe: UByte = 71u + const val knmi_harmonie_arome_netherlands: UByte = 72u + const val dmi_seamless: UByte = 73u + const val dmi_harmonie_arome_europe: UByte = 74u + const val metno_seamless: UByte = 75u } } diff --git a/kotlin/com/openmeteo/sdk/Variable.kt b/kotlin/com/openmeteo/sdk/Variable.kt index 0573434..ac0dc3b 100644 --- a/kotlin/com/openmeteo/sdk/Variable.kt +++ b/kotlin/com/openmeteo/sdk/Variable.kt @@ -115,6 +115,5 @@ class Variable private constructor() { const val global_tilted_irradiance_instant: UByte = 107u const val ocean_current_velocity: UByte = 108u const val ocean_current_direction: UByte = 109u - const val cloud_cover_2m: UByte = 110u } } diff --git a/python/openmeteo_sdk/Model.py b/python/openmeteo_sdk/Model.py index 81133e9..d78ffbb 100644 --- a/python/openmeteo_sdk/Model.py +++ b/python/openmeteo_sdk/Model.py @@ -73,6 +73,9 @@ class Model(object): ecmwf_wam025_ensemble = 67 ncep_gfswave025 = 68 ncep_gefswave025 = 69 - knmi_harmonie_arome_europe = 70 - knmi_harmonie_arome_netherlands = 71 - dmi_harmonie_arome_europe = 72 + knmi_seamless = 70 + knmi_harmonie_arome_europe = 71 + knmi_harmonie_arome_netherlands = 72 + dmi_seamless = 73 + dmi_harmonie_arome_europe = 74 + metno_seamless = 75 diff --git a/python/openmeteo_sdk/Variable.py b/python/openmeteo_sdk/Variable.py index 1bec09b..4545211 100644 --- a/python/openmeteo_sdk/Variable.py +++ b/python/openmeteo_sdk/Variable.py @@ -113,4 +113,3 @@ class Variable(object): global_tilted_irradiance_instant = 107 ocean_current_velocity = 108 ocean_current_direction = 109 - cloud_cover_2m = 110 diff --git a/swift/Sources/OpenMeteoSdk/weather_api_generated.swift b/swift/Sources/OpenMeteoSdk/weather_api_generated.swift index 3028701..a39a97e 100644 --- a/swift/Sources/OpenMeteoSdk/weather_api_generated.swift +++ b/swift/Sources/OpenMeteoSdk/weather_api_generated.swift @@ -129,11 +129,14 @@ public enum openmeteo_sdk_Model: UInt8, Enum, Verifiable { case ecmwfWam025Ensemble = 67 case ncepGfswave025 = 68 case ncepGefswave025 = 69 - case knmiHarmonieAromeEurope = 70 - case knmiHarmonieAromeNetherlands = 71 - case dmiHarmonieAromeEurope = 72 - - public static var max: openmeteo_sdk_Model { return .dmiHarmonieAromeEurope } + case knmiSeamless = 70 + case knmiHarmonieAromeEurope = 71 + case knmiHarmonieAromeNetherlands = 72 + case dmiSeamless = 73 + case dmiHarmonieAromeEurope = 74 + case metnoSeamless = 75 + + public static var max: openmeteo_sdk_Model { return .metnoSeamless } public static var min: openmeteo_sdk_Model { return .undefined } } @@ -252,9 +255,8 @@ public enum openmeteo_sdk_Variable: UInt8, Enum, Verifiable { case globalTiltedIrradianceInstant = 107 case oceanCurrentVelocity = 108 case oceanCurrentDirection = 109 - case cloudCover2m = 110 - public static var max: openmeteo_sdk_Variable { return .cloudCover2m } + public static var max: openmeteo_sdk_Variable { return .oceanCurrentDirection } public static var min: openmeteo_sdk_Variable { return .undefined } } diff --git a/ts/model.ts b/ts/model.ts index b71f9a8..3de1d82 100644 --- a/ts/model.ts +++ b/ts/model.ts @@ -73,7 +73,10 @@ export enum Model { ecmwf_wam025_ensemble = 67, ncep_gfswave025 = 68, ncep_gefswave025 = 69, - knmi_harmonie_arome_europe = 70, - knmi_harmonie_arome_netherlands = 71, - dmi_harmonie_arome_europe = 72 + knmi_seamless = 70, + knmi_harmonie_arome_europe = 71, + knmi_harmonie_arome_netherlands = 72, + dmi_seamless = 73, + dmi_harmonie_arome_europe = 74, + metno_seamless = 75 } diff --git a/ts/variable.ts b/ts/variable.ts index e044944..8c7ef7b 100644 --- a/ts/variable.ts +++ b/ts/variable.ts @@ -112,6 +112,5 @@ export enum Variable { global_tilted_irradiance = 106, global_tilted_irradiance_instant = 107, ocean_current_velocity = 108, - ocean_current_direction = 109, - cloud_cover_2m = 110 + ocean_current_direction = 109 }