diff --git a/app/coordinates.py b/app/coordinates.py deleted file mode 100644 index be972c6e..00000000 --- a/app/coordinates.py +++ /dev/null @@ -1,23 +0,0 @@ -"""app.coordinates.py""" - - -class Coordinates: - """ - A position on earth using decimal coordinates (latitude and longitude). - """ - - def __init__(self, latitude, longitude): - self.latitude = latitude - self.longitude = longitude - - def serialize(self): - """ - Serializes the coordinates into a dict. - - :returns: The serialized coordinates. - :rtype: dict - """ - return {"latitude": self.latitude, "longitude": self.longitude} - - def __str__(self): - return "lat: %s, long: %s" % (self.latitude, self.longitude) diff --git a/app/location/__init__.py b/app/location/__init__.py index 1da5e9e5..9ef3bc18 100644 --- a/app/location/__init__.py +++ b/app/location/__init__.py @@ -1,5 +1,5 @@ """app.location""" -from ..coordinates import Coordinates +from ..models import Coordinates from ..utils import countries from ..utils.populations import country_population diff --git a/app/models.py b/app/models.py index 497a4b83..2debbc99 100644 --- a/app/models.py +++ b/app/models.py @@ -90,3 +90,26 @@ class LocationsResponse(BaseModel): latest: Latest locations: List[Location] = [] + + +class Coordinates: + """ + A position on earth using decimal coordinates (latitude and longitude). + """ + + def __init__(self, latitude, longitude): + self.latitude = latitude + self.longitude = longitude + + def serialize(self): + """ + Serializes the coordinates into a dict. + + :returns: The serialized coordinates. + :rtype: dict + """ + return {"latitude": self.latitude, "longitude": self.longitude} + + def __str__(self): + return "lat: %s, long: %s" % (self.latitude, self.longitude) + diff --git a/app/services/location/csbs.py b/app/services/location/csbs.py index 444ebad6..d65a8cd5 100644 --- a/app/services/location/csbs.py +++ b/app/services/location/csbs.py @@ -7,7 +7,7 @@ from cachetools import TTLCache from ...caches import check_cache, load_cache -from ...coordinates import Coordinates +from ...models import Coordinates from ...location.csbs import CSBSLocation from ...utils import httputils from . import LocationService diff --git a/app/services/location/jhu.py b/app/services/location/jhu.py index ebed3960..e4ae69a5 100644 --- a/app/services/location/jhu.py +++ b/app/services/location/jhu.py @@ -9,7 +9,7 @@ from cachetools import TTLCache from ...caches import check_cache, load_cache -from ...coordinates import Coordinates +from ...models import Coordinates from ...location import TimelinedLocation from ...models import Timeline from ...utils import countries diff --git a/app/services/location/nyt.py b/app/services/location/nyt.py index 1f25ec34..ad8c40a8 100644 --- a/app/services/location/nyt.py +++ b/app/services/location/nyt.py @@ -7,7 +7,7 @@ from cachetools import TTLCache from ...caches import check_cache, load_cache -from ...coordinates import Coordinates +from ...models import Coordinates from ...location.nyt import NYTLocation from ...models import Timeline from ...utils import httputils diff --git a/tests/test_coordinates.py b/tests/test_coordinates.py index 2ec0290a..c16d1c7c 100644 --- a/tests/test_coordinates.py +++ b/tests/test_coordinates.py @@ -2,12 +2,12 @@ import pytest -from app import coordinates +from app import models @pytest.mark.parametrize("latitude, longitude", [("1", "2"), (100, "2"), (-3, 0), (-10, -10000000)]) def test_coordinates_class(latitude, longitude): - coord_obj = coordinates.Coordinates(latitude=latitude, longitude=longitude) + coord_obj = models.Coordinates(latitude=latitude, longitude=longitude) # validate serialize check_obj = {"latitude": latitude, "longitude": longitude} diff --git a/tests/test_location.py b/tests/test_location.py index 36abeeab..b1d4d6cd 100644 --- a/tests/test_location.py +++ b/tests/test_location.py @@ -3,7 +3,7 @@ import pytest -from app import coordinates, location, models +from app import models, location, models def mocked_timeline(*args, **kwargs): @@ -36,7 +36,7 @@ def test_location_class( recovered_latest, ): # id, country, province, coordinates, confirmed, deaths, recovered - coords = coordinates.Coordinates(latitude=latitude, longitude=longitude) + coords = models.Coordinates(latitude=latitude, longitude=longitude) # Timelines confirmed = models.Timeline(confirmed_latest)