From e67114e7f146bad4ffb087c5f92dc50a49e217a9 Mon Sep 17 00:00:00 2001 From: awarde96 Date: Thu, 6 Feb 2025 15:29:17 +0000 Subject: [PATCH 1/3] Fix 2d traj for climate --- covjsonkit/encoder/Path.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/covjsonkit/encoder/Path.py b/covjsonkit/encoder/Path.py index 2182851..5170ab9 100644 --- a/covjsonkit/encoder/Path.py +++ b/covjsonkit/encoder/Path.py @@ -92,9 +92,16 @@ def from_polytope(self, result): self.walk_tree(result, fields, coords, mars_metadata, range_dict) + print("The values returned from walking tree: ", range_dict) + print("The coordinates returned from walking tree: ", coords) + print("The fields: ", fields) + if len(fields["l"]) == 0: fields["l"] = [0] + if len(fields["s"]) == 0: + fields["s"] = [0] + logging.debug("The values returned from walking tree: %s", range_dict) # noqa: E501 logging.debug("The coordinates returned from walking tree: %s", coords) # noqa: E501 logging.debug("The fields: %s", fields) @@ -123,6 +130,8 @@ def from_polytope(self, result): start = end logging.debug("The coordinates returned from walking tree: %s", coords) # noqa: E501 + print(coords) + combined_dict = {} for date in fields["dates"]: @@ -152,6 +161,8 @@ def from_polytope(self, result): logging.debug("The values returned from combined dicts: %s", combined_dict) # noqa: E501 + print(combined_dict) + if fields["param"] == 0: raise ValueError("No parameters were returned, date requested may be out of range") for para in fields["param"]: From 89914d4268efb58359bab133bce50c9e28979305 Mon Sep 17 00:00:00 2001 From: awarde96 Date: Mon, 10 Feb 2025 13:37:57 +0000 Subject: [PATCH 2/3] test if datetime required --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f04636d..0167005 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ pandas orjson -datetime +#datetime #numpy=1.26.4 xarray pandas~=2.2.0 From a01df9ec28d2f8a498606b31e8d47635e39da6cd Mon Sep 17 00:00:00 2001 From: awarde96 Date: Mon, 10 Feb 2025 14:17:31 +0000 Subject: [PATCH 3/3] Remove print statements --- covjsonkit/encoder/Path.py | 8 -------- covjsonkit/version.py | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/covjsonkit/encoder/Path.py b/covjsonkit/encoder/Path.py index 5170ab9..68d29dc 100644 --- a/covjsonkit/encoder/Path.py +++ b/covjsonkit/encoder/Path.py @@ -92,10 +92,6 @@ def from_polytope(self, result): self.walk_tree(result, fields, coords, mars_metadata, range_dict) - print("The values returned from walking tree: ", range_dict) - print("The coordinates returned from walking tree: ", coords) - print("The fields: ", fields) - if len(fields["l"]) == 0: fields["l"] = [0] @@ -130,8 +126,6 @@ def from_polytope(self, result): start = end logging.debug("The coordinates returned from walking tree: %s", coords) # noqa: E501 - print(coords) - combined_dict = {} for date in fields["dates"]: @@ -161,8 +155,6 @@ def from_polytope(self, result): logging.debug("The values returned from combined dicts: %s", combined_dict) # noqa: E501 - print(combined_dict) - if fields["param"] == 0: raise ValueError("No parameters were returned, date requested may be out of range") for para in fields["param"]: diff --git a/covjsonkit/version.py b/covjsonkit/version.py index ae73625..bbab024 100644 --- a/covjsonkit/version.py +++ b/covjsonkit/version.py @@ -1 +1 @@ -__version__ = "0.1.3" +__version__ = "0.1.4"