aggregated coordinates.py into models.py

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
 

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)
+

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

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

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

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}

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)