merge location package into a single module

Author: Kilo59

app/location/__init__.py app/location.pyapp/location/__init__.py renamed to app/location.py

@@ -1,7 +1,7 @@
 """app.location"""
-from ..coordinates import Coordinates
-from ..utils import countries
-from ..utils.populations import country_population
+from .coordinates import Coordinates
+from .utils import countries
+from .utils.populations import country_population
 
 
 # pylint: disable=redefined-builtin,invalid-name
@@ -122,3 +122,72 @@ def serialize(self, timelines=False):
 
         # Return the serialized location.
         return serialized
+
+
+class CSBSLocation(Location):
+    """
+    A CSBS (county) location.
+    """
+
+    # pylint: disable=too-many-arguments,redefined-builtin
+    def __init__(self, id, state, county, coordinates, last_updated, confirmed, deaths):
+        super().__init__(
+            # General info.
+            id,
+            "US",
+            state,
+            coordinates,
+            last_updated,
+            # Statistics.
+            confirmed=confirmed,
+            deaths=deaths,
+            recovered=0,
+        )
+
+        self.state = state
+        self.county = county
+
+    def serialize(self, timelines=False):  # pylint: disable=arguments-differ,unused-argument
+        """
+        Serializes the location into a dict.
+        :returns: The serialized location.
+        :rtype: dict
+        """
+        serialized = super().serialize()
+
+        # Update with new fields.
+        serialized.update(
+            {"state": self.state, "county": self.county,}
+        )
+
+        # Return the serialized location.
+        return serialized
+
+
+class NYTLocation(TimelinedLocation):
+    """
+    A NYT (county) Timelinedlocation.
+    """
+
+    # pylint: disable=too-many-arguments,redefined-builtin
+    def __init__(self, id, state, county, coordinates, last_updated, timelines):
+        super().__init__(id, "US", state, coordinates, last_updated, timelines)
+
+        self.state = state
+        self.county = county
+
+    def serialize(self, timelines=False):  # pylint: disable=arguments-differ,unused-argument
+        """
+        Serializes the location into a dict.
+        :returns: The serialized location.
+        :rtype: dict
+        """
+        serialized = super().serialize(timelines)
+
+        # Update with new fields.
+        serialized.update(
+            {"state": self.state, "county": self.county,}
+        )
+
+        # Return the serialized location.
+        return serialized

app/location/csbs.py

@@ -2,13 +2,14 @@
 import csv
 import logging
 from datetime import datetime
+from pprint import pformat as pf
 
 from asyncache import cached
 from cachetools import TTLCache
 
 from ...caches import check_cache, load_cache
 from ...coordinates import Coordinates
-from ...location.csbs import CSBSLocation
+from ...location import CSBSLocation
 from ...utils import httputils
 from . import LocationService
 
@@ -97,6 +98,6 @@ async def get_locations():
             await load_cache(data_id, locations)
         except TypeError as type_err:
             LOGGER.error(type_err)
-            
+
     # Return the locations.
     return locations

app/location/nyt.py

@@ -8,7 +8,7 @@
 
 from ...caches import check_cache, load_cache
 from ...coordinates import Coordinates
-from ...location.nyt import NYTLocation
+from ...location import NYTLocation
 from ...timeline import Timeline
 from ...utils import httputils
 from . import LocationService

app/services/location/csbs.py

@@ -3,8 +3,7 @@
 
 import pytest
 
-from app.location import TimelinedLocation
-from app.location.nyt import NYTLocation
+from app.location import NYTLocation, TimelinedLocation
 from app.services.location import nyt
 from tests.conftest import mocked_strptime_isoformat