diff --git a/CHANGELOG.rst b/CHANGELOG.rst index cb9a2ad63..531a66e01 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,11 @@ Changelog Development *********** +- DWD Road: Use correct 15 minute resolution + +0.96.0 (05.10.2024) +******************* + - Bump polars to `>=1.0.0` - Change `DWDMosmixValues` and `DWDDmoValues` to follow the core `_collect_station_parameter` method - Allow only single issue retrieving with `DWDMosmixRequest` and `DWDDmoRequest` diff --git a/docs/data/coverage/dwd/road.rst b/docs/data/coverage/dwd/road.rst index e0f982f89..5253e6386 100644 --- a/docs/data/coverage/dwd/road.rst +++ b/docs/data/coverage/dwd/road.rst @@ -5,7 +5,7 @@ Overview ******** - weather data from German highway "road" stations. -- 10 minute resolution +- 15 minute resolution - historical period Structure @@ -14,4 +14,4 @@ Structure .. toctree:: :maxdepth: 1 - road/minute_10 \ No newline at end of file + road/minute_15 \ No newline at end of file diff --git a/docs/data/coverage/dwd/road/minute_10.rst b/docs/data/coverage/dwd/road/minute_15.rst similarity index 98% rename from docs/data/coverage/dwd/road/minute_10.rst rename to docs/data/coverage/dwd/road/minute_15.rst index 877be219f..040816ec4 100644 --- a/docs/data/coverage/dwd/road/minute_10.rst +++ b/docs/data/coverage/dwd/road/minute_15.rst @@ -1,4 +1,4 @@ -Minute_10 +Minute_15 ######### Metadata @@ -9,14 +9,14 @@ Metadata :stub-columns: 1 * - original name - - 10_minutes + - 15_minutes * - url - `here `_ Datasets ******** -Minute_10 +Minute_15 ========= Metadata @@ -27,13 +27,13 @@ Metadata :stub-columns: 1 * - original name - - minute_10 + - minute_15 * - url - `here `_ * - description file - missing * - description - - 10 minute road weather data from DWD + - 15 minute road weather data from DWD Parameters ---------- diff --git a/wetterdienst/provider/dwd/road/api.py b/wetterdienst/provider/dwd/road/api.py index 9f3488e09..0ec90a863 100644 --- a/wetterdienst/provider/dwd/road/api.py +++ b/wetterdienst/provider/dwd/road/api.py @@ -45,8 +45,8 @@ class DwdRoadParameter(DatasetTreeCore): measured by dwd road weather stations """ - class MINUTE_10(DatasetTreeCore): - class MINUTE_10(Enum): + class MINUTE_15(DatasetTreeCore): + class MINUTE_15(Enum): # class ROAD_WEATHER(Enum): HUMIDITY = "relativeHumidity" PRECIPITATION_FORM = "precipitationType" @@ -64,21 +64,21 @@ class MINUTE_10(Enum): WIND_SPEED = "windSpeed" # INTENSITY_OF_PHENOMENA = "intensityOfPhenomena" # noqa: ERA001 - HUMIDITY = MINUTE_10.HUMIDITY - PRECIPITATION_FORM = MINUTE_10.PRECIPITATION_FORM - PRECIPITATION_HEIGHT = MINUTE_10.PRECIPITATION_HEIGHT - PRECIPITATION_INTENSITY = MINUTE_10.PRECIPITATION_INTENSITY - ROAD_SURFACE_CONDITION = MINUTE_10.ROAD_SURFACE_CONDITION - TEMPERATURE_AIR_MEAN_2M = MINUTE_10.TEMPERATURE_AIR_MEAN_2M - TEMPERATURE_DEW_POINT_MEAN_2M = MINUTE_10.TEMPERATURE_DEW_POINT_MEAN_2M - TEMPERATURE_SURFACE_MEAN = MINUTE_10.TEMPERATURE_SURFACE_MEAN - VISIBILITY_RANGE = MINUTE_10.VISIBILITY_RANGE - WATER_FILM_THICKNESS = MINUTE_10.WATER_FILM_THICKNESS - WIND_DIRECTION = MINUTE_10.WIND_DIRECTION - WIND_DIRECTION_GUST_MAX = MINUTE_10.WIND_DIRECTION_GUST_MAX - WIND_GUST_MAX = MINUTE_10.WIND_GUST_MAX - WIND_SPEED = MINUTE_10.WIND_SPEED - # INTENSITY_OF_PHENOMENA = MINUTE_10.INTENSITY_OF_PHENOMENA # noqa: ERA001 + HUMIDITY = MINUTE_15.HUMIDITY + PRECIPITATION_FORM = MINUTE_15.PRECIPITATION_FORM + PRECIPITATION_HEIGHT = MINUTE_15.PRECIPITATION_HEIGHT + PRECIPITATION_INTENSITY = MINUTE_15.PRECIPITATION_INTENSITY + ROAD_SURFACE_CONDITION = MINUTE_15.ROAD_SURFACE_CONDITION + TEMPERATURE_AIR_MEAN_2M = MINUTE_15.TEMPERATURE_AIR_MEAN_2M + TEMPERATURE_DEW_POINT_MEAN_2M = MINUTE_15.TEMPERATURE_DEW_POINT_MEAN_2M + TEMPERATURE_SURFACE_MEAN = MINUTE_15.TEMPERATURE_SURFACE_MEAN + VISIBILITY_RANGE = MINUTE_15.VISIBILITY_RANGE + WATER_FILM_THICKNESS = MINUTE_15.WATER_FILM_THICKNESS + WIND_DIRECTION = MINUTE_15.WIND_DIRECTION + WIND_DIRECTION_GUST_MAX = MINUTE_15.WIND_DIRECTION_GUST_MAX + WIND_GUST_MAX = MINUTE_15.WIND_GUST_MAX + WIND_SPEED = MINUTE_15.WIND_SPEED + # INTENSITY_OF_PHENOMENA = MINUTE_15.INTENSITY_OF_PHENOMENA # noqa: ERA001 class DwdRoadUnit(DatasetTreeCore): @@ -87,8 +87,8 @@ class DwdRoadUnit(DatasetTreeCore): measured by dwd road weather stations """ - class MINUTE_10(DatasetTreeCore): - class MINUTE_10(UnitEnum): + class MINUTE_15(DatasetTreeCore): + class MINUTE_15(UnitEnum): HUMIDITY = OriginUnit.PERCENT.value, SIUnit.PERCENT.value PRECIPITATION_FORM = OriginUnit.DIMENSIONLESS.value, OriginUnit.DIMENSIONLESS.value PRECIPITATION_HEIGHT = OriginUnit.MILLIMETER.value, SIUnit.KILOGRAM_PER_SQUARE_METER.value @@ -107,7 +107,7 @@ class MINUTE_10(UnitEnum): class DwdRoadResolution(Enum): - MINUTE_10 = Resolution.MINUTE_10.value + MINUTE_15 = Resolution.MINUTE_15.value class DwdRoadPeriod(Enum): @@ -115,7 +115,7 @@ class DwdRoadPeriod(Enum): class DwdRoadDataset(Enum): - MINUTE_10 = Resolution.MINUTE_10.value + MINUTE_15 = Resolution.MINUTE_15.value class DwdRoadStationGroup(Enum): @@ -181,7 +181,7 @@ def _collect_station_parameter(self, station_id: str, parameter: Enum, dataset: ) station_group = DwdRoadStationGroup(station_group) if parameter == dataset: - parameters = [par.value for par in DwdRoadParameter.MINUTE_10 if hasattr(par, "name")] + parameters = [par.value for par in DwdRoadParameter.MINUTE_15 if hasattr(par, "name")] else: parameters = [parameter.value] try: @@ -423,7 +423,7 @@ def __init__( ): super().__init__( parameter=parameter, - resolution=Resolution.MINUTE_10, + resolution=Resolution.MINUTE_15, period=Period.HISTORICAL, start_date=start_date, end_date=end_date,