Merge pull request #132 from ExpDev07/csbs-location-own-file

moved CSBSLocation to own file

Author: ExpDev07

app/location/__init__.py

@@ -92,35 +92,5 @@ def serialize(self, timelines = False):
                 key: value.serialize() for (key, value) in self.timelines.items()
             }})
 
-        # Return the serialized location.
-        return serialized
-
-class CSBSLocation(Location):
-    """
-    A CSBS (county) location.
-    """
-    def __init__(self, id, state, county, coordinates, last_updated, confirmed, deaths):
-        super().__init__(
-            id, 'US', county, coordinates, last_updated, confirmed, deaths, recovered=0
-        )
-
-        self.state = state
-        self.county = county
-    
-    def serialize(self, timelines=False):
-        """
-        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

app/location/csbs.py

@@ -0,0 +1,37 @@
+from . import Location
+
+class CSBSLocation(Location):
+    """
+    A CSBS (county) location.
+    """
+    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):
+        """
+        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

app/services/location/csbs.py

@@ -1,6 +1,6 @@
 from . import LocationService
-from ...location import CSBSLocation
 from ...coordinates import Coordinates
+from ...location.csbs import CSBSLocation
 
 class CSBSLocationService(LocationService):
     """