Skip to content

Commit

Permalink
Reduce code.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jeffrey-Vervoort-KNMI
Jeffrey-Vervoort-KNMI committed Sep 22, 2023
1 parent 68bbb6a commit 9e1dff8
Showing 1 changed file with 29 additions and 40 deletions.
69 changes: 29 additions & 40 deletions integration-test/test_knmi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
from google.protobuf.timestamp_pb2 import Timestamp


def _strip_empty_parameters(**kwargs):
return {k: v for k, v in kwargs.items() if v}
NUMBER_OF_PARAMETERS = 44


@pytest.fixture(scope="session")
Expand Down Expand Up @@ -41,7 +40,7 @@ def test_find_series_single_station_all_parameters(grpc_stub):
)
response = grpc_stub.FindTimeSeries(request)

assert len(response.tseries) == 44
assert len(response.tseries) == NUMBER_OF_PARAMETERS


def test_get_values_single_station_single_parameters(grpc_stub):
Expand Down Expand Up @@ -73,86 +72,76 @@ def test_get_values_single_station_single_parameters(grpc_stub):
# Multiple stations within
((52.15, 4.90), (52.15, 5.37), (51.66, 5.37), (51.66, 4.90)),
None,
{"number_of_timeseries": 132, "number_of_stations": 3, "station_ids": ["06260", "06348", "06356"]},
["06260", "06348", "06356"],
),
(
# Multiple stations with a single parameter
((52.15, 4.90), (52.15, 5.37), (51.66, 5.37), (51.66, 4.90)),
["rh"],
{"number_of_timeseries": 3, "number_of_stations": 3, "station_ids": ["06260", "06348", "06356"]},
["06260", "06348", "06356"],
),
(
# Multiple stations with multiple parameters
((52.15, 4.90), (52.15, 5.37), (51.66, 5.37), (51.66, 4.90)),
["dd", "rh", "tx"],
{"number_of_timeseries": 9, "number_of_stations": 3, "station_ids": ["06260", "06348", "06356"]},
["06260", "06348", "06356"],
),
(
# One station within
((52.11, 5.15), (52.11, 5.204), (52.08, 5.204), (52.08, 5.15)),
None,
{"number_of_timeseries": 44, "number_of_stations": 1, "station_ids": ["06260"]},
["06260"],
),
(
# Nothing within
((51.82, 5.07), (51.82, 5.41), (51.73, 5.41), (51.73, 5.07)),
None,
{"number_of_timeseries": 0, "number_of_stations": 0, "station_ids": []},
[],
),
(
# Middle top
((52.0989, 4.17), (52.0989, 6.18), (52.09, 6.18), (52.09, 4.17)),
None,
{"number_of_timeseries": 44, "number_of_stations": 1, "station_ids": ["06260"]},
["06260"],
),
(
# Middle bottom, should fall outside since polygon is curved because the earth is round (postgres geography).
((52.1, 4.17), (52.1, 6.18), (52.0989, 6.18), (52.0989, 4.17)),
None,
{"number_of_timeseries": 0, "number_of_stations": 0, "station_ids": []},
[],
),
(
# Complex polygon
((51.45, 3.47), (51.39, 3.67), (51.39, 4.28), (51.52, 4.96), (51.89, 5.46), (52.18, 5.30), (51.75, 3.68)),
None,
{
"number_of_timeseries": 352,
"number_of_stations": 8,
"station_ids": ["06260", "06310", "06323", "06340", "06343", "06348", "06350", "06356"],
},
["06260", "06310", "06323", "06340", "06343", "06348", "06350", "06356"],
),
(
# All stations in the Netherlands
((56.00, 2.85), (56.00, 7.22), (50.75, 7.22), (50.75, 2.85)),
None,
{
"number_of_timeseries": 2288,
"number_of_stations": 52,
# fmt: off
"station_ids": [
"06201", "06203", "06204", "06205", "06207", "06208", "06211", "06214", "06215", "06225", "06229",
"06235", "06239", "06240", "06242", "06248", "06249", "06251", "06252", "06257", "06258", "06260",
"06267", "06269", "06270", "06273", "06275", "06277", "06278", "06279", "06280", "06283", "06286",
"06290", "06310", "06317", "06319", "06320", "06321", "06323", "06330", "06340", "06343", "06344",
"06348", "06350", "06356", "06370", "06375", "06377", "06380", "06391"
],
# fmt: on
},
# fmt: off
[
"06201", "06203", "06204", "06205", "06207", "06208", "06211", "06214", "06215", "06225", "06229",
"06235", "06239", "06240", "06242", "06248", "06249", "06251", "06252", "06257", "06258", "06260",
"06267", "06269", "06270", "06273", "06275", "06277", "06278", "06279", "06280", "06283", "06286",
"06290", "06310", "06317", "06319", "06320", "06321", "06323", "06330", "06340", "06343", "06344",
"06348", "06350", "06356", "06370", "06375", "06377", "06380", "06391"
],
# fmt: on
),
]


@pytest.mark.parametrize("coords,param_ids,expected", input_params_polygon)
def test_get_observations_with_polygon(grpc_stub, coords, param_ids, expected):
inside = None
if coords:
inside = dstore.Polygon(points=[dstore.Point(lat=lat, lon=lon) for lat, lon in coords])

kwargs = _strip_empty_parameters(inside=inside, param_ids=param_ids)
ts_request = dstore.FindTSRequest(**kwargs)
@pytest.mark.parametrize("coords,param_ids,expected_station_ids", input_params_polygon)
def test_get_observations_with_polygon(grpc_stub, coords, param_ids, expected_station_ids):
ts_request = dstore.FindTSRequest(
inside=dstore.Polygon(points=[dstore.Point(lat=lat, lon=lon) for lat, lon in coords]), param_ids=param_ids
)
ts_response = grpc_stub.FindTimeSeries(ts_request)

assert len(ts_response.tseries) == expected["number_of_timeseries"] # parameters * number_of_stations
stations = sorted({ts.metadata.station_id for ts in ts_response.tseries})
assert len(stations) == expected["number_of_stations"]
assert stations == expected["station_ids"]
actual_station_ids = sorted({ts.metadata.station_id for ts in ts_response.tseries})
assert actual_station_ids == expected_station_ids
number_of_parameters = len(param_ids) if param_ids else NUMBER_OF_PARAMETERS
expected_number_of_timeseries = number_of_parameters * len(expected_station_ids)
assert len(ts_response.tseries) == expected_number_of_timeseries

0 comments on commit 9e1dff8

Please sign in to comment.