[Breaking] Use start_date and end_date instead of from_date and to_date

earthobservations · Nov 8, 2023 · 5ca8463 · 5ca8463
1 parent 036fc99
commit 5ca8463
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/README.rst b/README.rst
@@ -373,17 +373,17 @@ Library
     ... ).filter_by_station_id(station_id=(1048, 4411))
     >>> stations = request.df
     >>> stations.head()
-    ┌────────────┬──────────────┬──────────────┬────────┬──────────┬───────────┬─────────────┬─────────┐
-    │ station_id ┆ start_date    ┆ end_date      ┆ height ┆ latitude ┆ longitude ┆ name        ┆ state   │
-    │ ---        ┆ ---          ┆ ---          ┆ ---    ┆ ---      ┆ ---       ┆ ---         ┆ ---     │
-    │ str        ┆ datetime[μs, ┆ datetime[μs, ┆ f64    ┆ f64      ┆ f64       ┆ str         ┆ str     │
-    │            ┆ UTC]         ┆ UTC]         ┆        ┆          ┆           ┆             ┆         │
-    ╞════════════╪══════════════╪══════════════╪════════╪══════════╪═══════════╪═════════════╪═════════╡
-    │ 01048      ┆ 1934-01-01   ┆ ...          ┆ 228.0  ┆ 51.1278  ┆ 13.7543   ┆ Dresden-Klo ┆ Sachsen │
-    │            ┆ 00:00:00 UTC ┆ 00:00:00 UTC ┆        ┆          ┆           ┆ tzsche      ┆         │
-    │ 04411      ┆ 1979-12-01   ┆ ...          ┆ 155.0  ┆ 49.9195  ┆ 8.9672    ┆ Schaafheim- ┆ Hessen  │
-    │            ┆ 00:00:00 UTC ┆ 00:00:00 UTC ┆        ┆          ┆           ┆ Schlierbach ┆         │
-    └────────────┴──────────────┴──────────────┴────────┴──────────┴───────────┴─────────────┴─────────┘
+    ┌────────────┬──────────────┬──────────────┬──────────┬───────────┬────────┬─────────────┬─────────┐
+    │ station_id ┆ start_date   ┆ end_date     ┆ latitude ┆ longitude ┆ height ┆ name        ┆ state   │
+    │ ---        ┆ ---          ┆ ---          ┆ ---      ┆ ---       ┆ ---    ┆ ---         ┆ ---     │
+    │ str        ┆ datetime[μs, ┆ datetime[μs, ┆ f64      ┆ f64       ┆ f64    ┆ str         ┆ str     │
+    │            ┆ UTC]         ┆ UTC]         ┆          ┆           ┆        ┆             ┆         │
+    ╞════════════╪══════════════╪══════════════╪══════════╪═══════════╪════════╪═════════════╪═════════╡
+    │ 01048      ┆ 1934-01-01   ┆ 2023-11-07   ┆ 51.1278  ┆ 13.7543   ┆ 228.0  ┆ Dresden-Klo ┆ Sachsen │
+    │            ┆ 00:00:00 UTC ┆ 00:00:00 UTC ┆          ┆           ┆        ┆ tzsche      ┆         │
+    │ 04411      ┆ 1979-12-01   ┆ 2023-11-07   ┆ 49.9195  ┆ 8.9672    ┆ 155.0  ┆ Schaafheim- ┆ Hessen  │
+    │            ┆ 00:00:00 UTC ┆ 00:00:00 UTC ┆          ┆           ┆        ┆ Schlierbach ┆         │
+    └────────────┴──────────────┴──────────────┴──────────┴───────────┴────────┴─────────────┴─────────┘
     >>> values = request.values.all().df
     >>> values.head()
     ┌────────────┬─────────────────┬───────────────────┬─────────────────────────┬───────┬─────────┐

diff --git a/tests/core/timeseries/test_request.py b/tests/core/timeseries/test_request.py
@@ -23,29 +23,29 @@ def expected_stations_df():
             (
                 "02480",
                 dt.datetime(2004, 9, 1, tzinfo=ZoneInfo("UTC")),
-                108.0,
                 50.0643,
                 8.993,
+                108.0,
                 "Kahl/Main",
                 "Bayern",
                 9.759384982994229,
             ),
             (
                 "04411",
                 dt.datetime(2002, 1, 24, tzinfo=ZoneInfo("UTC")),
-                155.0,
                 49.9195,
                 8.9672,
+                155.0,
                 "Schaafheim-Schlierbach",
                 "Hessen",
                 10.160326,
             ),
             (
                 "07341",
                 dt.datetime(2005, 7, 16, tzinfo=ZoneInfo("UTC")),
-                119.0,
                 50.0900,
                 8.7862,
+                119.0,
                 "Offenbach-Wetterpark",
                 "Hessen",
                 12.891318342515483,
@@ -54,9 +54,9 @@ def expected_stations_df():
         schema={
             "station_id": pl.Utf8,
             "start_date": pl.Datetime(time_zone="UTC"),
-            "height": pl.Float64,
             "latitude": pl.Float64,
             "longitude": pl.Float64,
+            "height": pl.Float64,
             "name": pl.Utf8,
             "state": pl.Utf8,
             "distance": pl.Float64,
@@ -296,7 +296,7 @@ def test_dwd_observation_stations_filter_by_rank_single(default_request, expecte
     given_df = request.df.drop(columns="end_date")
     assert_frame_equal(given_df[0, :], expected_stations_df[0, :])
     values = request.values.all()
-    assert_frame_equal(values.df_stations[0, :].drop(columns="end_date"), expected_stations_df[0, :])
+    assert_frame_equal(values.df_stations.head(1).drop(columns="end_date"), expected_stations_df.head(1))
 
 
 @pytest.mark.remote

diff --git a/tests/provider/dwd/observation/test_api_stations.py b/tests/provider/dwd/observation/test_api_stations.py
@@ -23,9 +23,9 @@ def expected_df():
             "station_id": ["00001"],
             "start_date": [dt.datetime(1937, 1, 1, tzinfo=ZoneInfo("UTC"))],
             "end_date": [dt.datetime(1986, 6, 30, tzinfo=ZoneInfo("UTC"))],
-            "height": [478.0],
             "latitude": [47.8413],
             "longitude": [8.8493],
+            "height": [478.0],
             "name": ["Aach"],
             "state": ["Baden-Württemberg"],
         }
@@ -110,9 +110,9 @@ def test_dwd_observations_stations_minute_1(default_settings):
             "station_id": "00003",
             "start_date": dt.datetime(1891, 1, 1, tzinfo=ZoneInfo("UTC")),
             "end_date": dt.datetime(2012, 4, 6, tzinfo=ZoneInfo("UTC")),
-            "height": 202.0,
             "latitude": 50.7827,
             "longitude": 6.0941,
+            "height": 202.0,
             "name": "Aachen",
             "state": "Nordrhein-Westfalen",
         }

diff --git a/wetterdienst/core/timeseries/request.py b/wetterdienst/core/timeseries/request.py
@@ -183,9 +183,9 @@ def _values(self):
         Columns.STATION_ID.value,
         Columns.START_DATE.value,
         Columns.END_DATE.value,
-        Columns.HEIGHT.value,
         Columns.LATITUDE.value,
         Columns.LONGITUDE.value,
+        Columns.HEIGHT.value,
         Columns.NAME.value,
         Columns.STATE.value,
     )

diff --git a/wetterdienst/provider/dwd/dmo/api.py b/wetterdienst/provider/dwd/dmo/api.py
@@ -1339,9 +1339,9 @@ def _setup_resolution_filter(cls, resolution):
         Columns.ICAO_ID.value,
         Columns.START_DATE.value,
         Columns.END_DATE.value,
-        Columns.HEIGHT.value,
         Columns.LATITUDE.value,
         Columns.LONGITUDE.value,
+        Columns.HEIGHT.value,
         Columns.NAME.value,
         Columns.STATE.value,
     ]