app/location/ aggregate1

Author: KevinSuh6433

app/location/__init__.py

@@ -74,14 +74,14 @@ def serialize(self):
         }
 
 
-class TimelinedLocation(Location):
+class TimelinedLocation:
     """
     A location with timelines.
     """
 
     # pylint: disable=too-many-arguments
-    def __init__(self, id, country, province, coordinates, last_updated, timelines):
-        super().__init__(
+    def __init__(self, id, country, province, coordinates, last_updated, timelines, location):
+        Location.__init__(
             # General info.
             id,
             country,
@@ -96,6 +96,7 @@ def __init__(self, id, country, province, coordinates, last_updated, timelines):
 
         # Set timelines.
         self.timelines = timelines
+        self.location  = Location
 
     # pylint: disable=arguments-differ
     def serialize(self, timelines=False):

app/location/csbs.py

@@ -2,14 +2,14 @@
 from . import Location
 
 
-class CSBSLocation(Location):
+class CSBSLocation:
     """
     A CSBS (county) location.
     """
 
     # pylint: disable=too-many-arguments,redefined-builtin
-    def __init__(self, id, state, county, coordinates, last_updated, confirmed, deaths):
-        super().__init__(
+    def __init__(self, id, state, county, coordinates, last_updated, confirmed, deaths, location):
+        Location.__init__(
             # General info.
             id,
             "US",
@@ -24,6 +24,8 @@ def __init__(self, id, state, county, coordinates, last_updated, confirmed, deat
 
         self.state = state
         self.county = county
+        self.location = Location
+
 
     def serialize(self, timelines=False):  # pylint: disable=arguments-differ,unused-argument
         """

app/location/nyt.py

@@ -2,17 +2,18 @@
 from . import TimelinedLocation
 
 
-class NYTLocation(TimelinedLocation):
+class NYTLocation:
     """
     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)
+    def __init__(self, id, state, county, coordinates, last_updated, timelines, timelinedLocation):
+        TimelinedLocation.__init__(id, "US", state, coordinates, last_updated, timelines)
 
         self.state = state
         self.county = county
+        self.timelinedLocation = TimelinedLocation
 
     def serialize(self, timelines=False):  # pylint: disable=arguments-differ,unused-argument
         """