Skip to content

Avoid scientific notation in point query parameters #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arpitjain099 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Avoid scientific notation in point query parameters #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion cmr/queries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

from abc import abstractmethod
from collections import defaultdict
from decimal import Decimal
from datetime import date, datetime, timezone
from inspect import getmembers, ismethod
from re import search
Expand Down Expand Up @@ -625,7 +626,17 @@ def point(self, lon: FloatLike, lat: FloatLike) -> Self:
if "point" not in self.params:
self.params["point"] = []

self.params["point"].append(f"{lon},{lat}")
# CMR rejects scientific notation in point query parameters.
lon_as_str = format(Decimal(str(lon)), "f")
lat_as_str = format(Decimal(str(lat)), "f")

if "." not in lon_as_str:
lon_as_str += ".0"

if "." not in lat_as_str:
lat_as_str += ".0"

self.params["point"].append(f"{lon_as_str},{lat_as_str}")

return self

Expand Down
6 changes: 6 additions & 0 deletions tests/test_granule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,12 @@ def test_valid_parameters(self):
self.assertEqual(query.params["version"], "003")
self.assertEqual(query.params["point"], ["-100.0,42.0"])

def test_point_avoids_scientific_notation(self):
query = GranuleQuery().short_name("FOO").point(42, 0.00001)

self.assertEqual(query.params["point"], ["42.0,0.00001"])
self.assertIn("point[]=42.0,0.00001", query._build_url())

def test_invalid_parameters(self):
query = GranuleQuery()

Expand Down